diff --git a/python/dune/perftool/options.py b/python/dune/perftool/options.py
index 42739f6c23bde42d5a7d8b948486d656da05d74b..7cc16ca9277dbc556e6f8b67c092d33f68698711 100644
--- a/python/dune/perftool/options.py
+++ b/python/dune/perftool/options.py
@@ -63,7 +63,7 @@ class PerftoolOptionsArray(ImmutableRecord):
     vectorization_allow_quadrature_changes = PerftoolOption(default=False, helpstr="whether the vectorization strategy is allowed to alter quadrature point numbers")
     vectorization_list_index = PerftoolOption(default=None, helpstr="Which vectorization to pick from a list (only valid with vectorization_strategy=fromlist).")
     architecture = PerftoolOption(default="haswell", helpstr="The architecture to optimize for. Possible values: haswell|knl|skylake")
-    grid_offset = PerftoolOption(default=False, helpstr="Set to true if you want a yasp grid where the lower left corner is not in the origin.")
+    yaspgrid_offset = PerftoolOption(default=False, helpstr="Set to true if you want a yasp grid where the lower left corner is not in the origin.")
     simplify = PerftoolOption(default=False, helpstr="Whether to simplify expressions using sympy")
     precision_bits = PerftoolOption(default=64, helpstr="The number of bits for the floating point type")
     assure_statement_ordering = PerftoolOption(default=False, helpstr="Whether special care should be taken for a good statement ordering in sumfact kernels, runs into a loopy scheduler performance bug, but is necessary for production.")
diff --git a/python/dune/perftool/pdelab/driver/gridfunctionspace.py b/python/dune/perftool/pdelab/driver/gridfunctionspace.py
index c611f264f397551ed1dbad89cd4a18e9569a02fa..c14a73dd649efa4517b1a069a0722535a71b30f6 100644
--- a/python/dune/perftool/pdelab/driver/gridfunctionspace.py
+++ b/python/dune/perftool/pdelab/driver/gridfunctionspace.py
@@ -52,7 +52,7 @@ def typedef_grid(name):
         set_option('constant_transformation_matrix', True)
 
         range_type = type_range()
-        if get_option("grid_offset"):
+        if get_option("yaspgrid_offset"):
             gridt = "Dune::YaspGrid<{0}, Dune::EquidistantOffsetCoordinates<{1}, {0}>>".format(dim, range_type)
         else:
             gridt = "Dune::YaspGrid<{0}, Dune::EquidistantCoordinates<{1}, {0}>>".format(dim, range_type)
diff --git a/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini b/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini
index e8132ebb4ebefbf2d7eee39039c3c89959ea0aab..5056825841ebf1441852ec9b59095228a780362e 100644
--- a/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini
+++ b/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini
@@ -21,7 +21,7 @@ compare_l2errorsquared = 5e-5
 # Only calculate error for the velocity part
 l2error_tree_path = 1, 1, 0
 explicit_time_stepping = 0
-grid_offset = 1
+yaspgrid_offset = 1
 overlapping = 1
 
 [instat]
diff --git a/test/navier-stokes/navierstokes_3d_dg_quadrilateral.mini b/test/navier-stokes/navierstokes_3d_dg_quadrilateral.mini
index 1d6c6f5ddd3f64165f35398354b39c57882825ae..29ba4c0db5f0c5f9b39333ac7bcdc49ddfb10eba 100644
--- a/test/navier-stokes/navierstokes_3d_dg_quadrilateral.mini
+++ b/test/navier-stokes/navierstokes_3d_dg_quadrilateral.mini
@@ -14,7 +14,7 @@ extension = vtu
 [formcompiler]
 numerical_jacobian = 0, 1 | expand num
 explicit_time_stepping = 0
-grid_offset = 1
+yaspgrid_offset = 1
 compare_l2errorsquared = 5e-4
 # Only calculate error for the velocity part
 l2error_tree_path = 1, 1, 1, 0