diff --git a/test/heatequation/heatequation_dg.ufl b/test/heatequation/heatequation_dg.ufl
index 21496b69afe311614ec53312c1be5eb032e03133..7a558b204e7c7426129cf3d5985ab42b22cbe7fc 100644
--- a/test/heatequation/heatequation_dg.ufl
+++ b/test/heatequation/heatequation_dg.ufl
@@ -12,7 +12,7 @@ n = FacetNormal(cell)('+')
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 poisson = inner(grad(u), grad(v))*dx \
diff --git a/test/laplace/laplace_dg.ufl b/test/laplace/laplace_dg.ufl
index dcf0bf880e008ea7a074a92ad8f8fc586d2b2a87..1a30bcea2f224b8e7a81ec1bf1a60eb39f58ae16 100644
--- a/test/laplace/laplace_dg.ufl
+++ b/test/laplace/laplace_dg.ufl
@@ -9,7 +9,7 @@ n = FacetNormal(cell)('+')
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = inner(grad(u), grad(v))*dx \
diff --git a/test/nonlinear/nonlinear_dg.ufl b/test/nonlinear/nonlinear_dg.ufl
index 5117affe172ede7492071d50010e4f9d3523e7e8..28d9990ff1fa2e535a07dd312098c4342cf2b4b4 100644
--- a/test/nonlinear/nonlinear_dg.ufl
+++ b/test/nonlinear/nonlinear_dg.ufl
@@ -15,7 +15,7 @@ def q(u):
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = inner(grad(u), grad(v))*dx \
diff --git a/test/poisson/dimension-grid-variations/poisson_1d_dg_interval.ufl b/test/poisson/dimension-grid-variations/poisson_1d_dg_interval.ufl
index 8996c05b350dbe908e7e485bf177a611dad914bc..27b51cc41c49eefdfcc104767b7edc22e884f4e4 100644
--- a/test/poisson/dimension-grid-variations/poisson_1d_dg_interval.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_1d_dg_interval.ufl
@@ -15,7 +15,7 @@ n = FacetNormal(cell)('+')
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = inner(grad(u), grad(v))*dx \
diff --git a/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.ufl b/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.ufl
index 1c2d1300d831e0b66d2ecf954833bc505027edc4..2ed2a867dbd34fe3e5d9dff0e8befe86536c6e8e 100644
--- a/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.ufl
@@ -15,7 +15,7 @@ n = FacetNormal(cell)('+')
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = inner(grad(u), grad(v))*dx \
diff --git a/test/poisson/dimension-grid-variations/poisson_2d_dg_triangle.ufl b/test/poisson/dimension-grid-variations/poisson_2d_dg_triangle.ufl
index 3996aa933ada77afc3c71ba45446af3742d0f96f..58be5d1138590d6e561648d18c9ea487b052e911 100644
--- a/test/poisson/dimension-grid-variations/poisson_2d_dg_triangle.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_2d_dg_triangle.ufl
@@ -14,7 +14,7 @@ n = FacetNormal(cell)('+')
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = inner(grad(u), grad(v))*dx \
diff --git a/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.ufl b/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.ufl
index d7b02396e81f38d079ba2eaae055ca050645c6ed..59b1d023c036c7e083cd0b24bfde9101247eeabc 100644
--- a/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.ufl
@@ -15,7 +15,7 @@ n = FacetNormal(cell)('+')
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = inner(grad(u), grad(v))*dx \
diff --git a/test/poisson/dimension-grid-variations/poisson_3d_dg_tetrahedron.ufl b/test/poisson/dimension-grid-variations/poisson_3d_dg_tetrahedron.ufl
index 86db1e20250595f3fd4219b53bd3e7d87589572e..9c4b4540c8d9154466342ad14d10dd9d2af74c86 100644
--- a/test/poisson/dimension-grid-variations/poisson_3d_dg_tetrahedron.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_3d_dg_tetrahedron.ufl
@@ -14,7 +14,7 @@ n = FacetNormal(cell)('+')
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = inner(grad(u), grad(v))*dx \
diff --git a/test/poisson/opcount_poisson_dg.ufl b/test/poisson/opcount_poisson_dg.ufl
index 647ee2568a76e6bf731de5b22100070e43dc56a7..3ced1b8263f75d01feeb90acae9a64ae1bcba482 100644
--- a/test/poisson/opcount_poisson_dg.ufl
+++ b/test/poisson/opcount_poisson_dg.ufl
@@ -13,7 +13,7 @@ n = FacetNormal(cell)('+')
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = inner(grad(u), grad(v))*dx \
diff --git a/test/poisson/poisson_dg.ufl b/test/poisson/poisson_dg.ufl
index aa63dea8fd851d794b4df43eeaeaa0004dd87f5a..daf2793ee5c327dd389d05fffda0c7c8dc9dd244 100644
--- a/test/poisson/poisson_dg.ufl
+++ b/test/poisson/poisson_dg.ufl
@@ -15,7 +15,7 @@ n = FacetNormal(cell)('+')
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = inner(grad(u), grad(v))*dx \
diff --git a/test/poisson/poisson_dg_neumann.ufl b/test/poisson/poisson_dg_neumann.ufl
index 42fadd64670634bfc1022a551d48c58918024aee..1dd15d4f39c18d2b07567c3d8d4afe46dbd72a18 100644
--- a/test/poisson/poisson_dg_neumann.ufl
+++ b/test/poisson/poisson_dg_neumann.ufl
@@ -20,7 +20,7 @@ ds = ds(subdomain_data=bctype)
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = inner(grad(u), grad(v))*dx \
diff --git a/test/poisson/poisson_dg_quadrilateral.ufl b/test/poisson/poisson_dg_quadrilateral.ufl
index c11e5b2b19e68f317a51d41046004137af3d8af1..995bf1382a8e648c0fd59a2dfafdb458ff33de4f 100644
--- a/test/poisson/poisson_dg_quadrilateral.ufl
+++ b/test/poisson/poisson_dg_quadrilateral.ufl
@@ -15,7 +15,7 @@ n = FacetNormal(cell)('+')
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = inner(grad(u), grad(v))*dx \
diff --git a/test/poisson/poisson_dg_tensor.ufl b/test/poisson/poisson_dg_tensor.ufl
index 973c2db628ece1c4fea516e0132eda32c8814016..d84cebf6d1420b8ec3fd35086d40833937e55f60 100644
--- a/test/poisson/poisson_dg_tensor.ufl
+++ b/test/poisson/poisson_dg_tensor.ufl
@@ -18,7 +18,7 @@ n = FacetNormal(cell)('+')
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = (inner(A*grad(u), grad(v)) + c*u*v)*dx \
diff --git a/test/sumfact/poisson/poisson_dg_2d.ufl b/test/sumfact/poisson/poisson_dg_2d.ufl
index 19ac68ee0a4b1b8e2ae7b93908aef3208e7acdc2..fe5c1821d89814fa1cfa90ca9099a8c4023caff6 100644
--- a/test/sumfact/poisson/poisson_dg_2d.ufl
+++ b/test/sumfact/poisson/poisson_dg_2d.ufl
@@ -15,7 +15,7 @@ n = FacetNormal(cell)('+')
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = inner(grad(u), grad(v))*dx \
diff --git a/test/sumfact/poisson/poisson_dg_3d.ufl b/test/sumfact/poisson/poisson_dg_3d.ufl
index 00a17a02bea0b104f8332de62ffc9432285c3c62..3efc5e3bcacf4427d253ba882bce84c90243d2aa 100644
--- a/test/sumfact/poisson/poisson_dg_3d.ufl
+++ b/test/sumfact/poisson/poisson_dg_3d.ufl
@@ -15,7 +15,7 @@ n = FacetNormal(cell)('+')
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = inner(grad(u), grad(v))*dx \
diff --git a/test/sumfact/poisson/poisson_dg_tensor.ufl b/test/sumfact/poisson/poisson_dg_tensor.ufl
index 8ef34003fe4bc956299826942a1d98f95fb48562..28bd83d122748ed9519ba412fa0ce0eb2f2d328a 100644
--- a/test/sumfact/poisson/poisson_dg_tensor.ufl
+++ b/test/sumfact/poisson/poisson_dg_tensor.ufl
@@ -18,7 +18,7 @@ n = FacetNormal(cell)('+')
 # penalty factor
 gamma = 1.0
 
-# SSIP: -1.0, IIPG: 0.0, NIPG: 1.0
+# SIPG: -1.0, IIPG: 0.0, NIPG: 1.0
 theta = 1.0
 
 r = (inner(A*grad(u), grad(v)) + c*u*v)*dx \