diff --git a/dune/gfe/cosseratvtkwriter.hh b/dune/gfe/cosseratvtkwriter.hh
index b126e1f3c9fd8a7446894c6c7e82655af382ca53..d814d73bb8e9552625f38cee5dedcc902719ec48 100644
--- a/dune/gfe/cosseratvtkwriter.hh
+++ b/dune/gfe/cosseratvtkwriter.hh
@@ -17,11 +17,11 @@
 
 
 /** \brief Write the configuration of a Cosserat material in VTK format */
-template <class GridType>
+template <class GridView>
 class CosseratVTKWriter
 {
 
-  static const int dim = GridType::dimension;
+  static const int dim = GridView::dimension;
 
   template <typename Basis1, typename Basis2>
   static void downsample(const Basis1& basis1, const std::vector<Dune::GFE::ProductManifold<RealTuple<double,3>,Rotation<double,3> > >& v1,
@@ -80,7 +80,7 @@ class CosseratVTKWriter
     s << 's' << std::setw(4) << std::setfill('0') << commSize << '-';
     s << 'p' << std::setw(4) << std::setfill('0') << commRank << '-';
     s << name;
-    if(GridType::dimension > 1)
+    if(GridView::dimension > 1)
       s << ".vtu";
     else
       s << ".vtp";
@@ -103,7 +103,7 @@ class CosseratVTKWriter
     }
     s << 's' << std::setw(4) << std::setfill('0') << commSize << '-';
     s << name;
-    if(GridType::dimension > 1)
+    if(GridView::dimension > 1)
       s << ".pvtu";
     else
       s << ".pvtp";
diff --git a/src/cosserat-continuum.cc b/src/cosserat-continuum.cc
index ad1d6bbec404689b8e6668b70d84f94326643d51..6f5615415b5764b79eeed1b9d15c4312a7b5ffd2 100644
--- a/src/cosserat-continuum.cc
+++ b/src/cosserat-continuum.cc
@@ -413,14 +413,14 @@ int main (int argc, char *argv[]) try
 
   // Output initial iterate (of homotopy loop)
   if (dim == 2 && dimworld == 2) {
-    CosseratVTKWriter<GridType>::writeMixed<DeformationFEBasis,OrientationFEBasis>(deformationFEBasis,x[_0],
+    CosseratVTKWriter<GridView>::writeMixed<DeformationFEBasis,OrientationFEBasis>(deformationFEBasis,x[_0],
                                                                                    orientationFEBasis,x[_1],
                                                                                    resultPath + "cosserat_homotopy_0_l" + std::to_string(numLevels));
   } else if (dim == 2 && dimworld == 3) {
 #if MIXED_SPACE
-    CosseratVTKWriter<GridType>::write<DeformationFEBasis>(deformationFEBasis, x[_0], resultPath + "cosserat_homotopy_0_l" + std::to_string(numLevels));
+    CosseratVTKWriter<GridView>::write<DeformationFEBasis>(deformationFEBasis, x[_0], resultPath + "cosserat_homotopy_0_l" + std::to_string(numLevels));
 #else
-    CosseratVTKWriter<GridType>::write<DeformationFEBasis>(deformationFEBasis, x, resultPath + "cosserat_homotopy_0_l" + std::to_string(numLevels));
+    CosseratVTKWriter<GridView>::write<DeformationFEBasis>(deformationFEBasis, x, resultPath + "cosserat_homotopy_0_l" + std::to_string(numLevels));
 #endif
   } else if (dim == 3 && dimworld == 3) {
 
@@ -735,14 +735,14 @@ int main (int argc, char *argv[]) try
     iAsAscii << i+1;
 
     if (dim == 2 && dimworld == 2) {
-      CosseratVTKWriter<GridType>::writeMixed<DeformationFEBasis,OrientationFEBasis>(deformationFEBasis,x[_0],
+      CosseratVTKWriter<GridView>::writeMixed<DeformationFEBasis,OrientationFEBasis>(deformationFEBasis,x[_0],
                                                                                      orientationFEBasis,x[_1],
                                                                                      resultPath + "cosserat_homotopy_" + iAsAscii.str());
     } else if (dim == 2 && dimworld == 3) {
 #if MIXED_SPACE
-      CosseratVTKWriter<GridType>::write<DeformationFEBasis>(deformationFEBasis, x[_0], resultPath + "cosserat_homotopy_" + std::to_string(i+1) + "_l" + std::to_string(numLevels));
+      CosseratVTKWriter<GridView>::write<DeformationFEBasis>(deformationFEBasis, x[_0], resultPath + "cosserat_homotopy_" + std::to_string(i+1) + "_l" + std::to_string(numLevels));
 #else
-      CosseratVTKWriter<GridType>::write<DeformationFEBasis>(deformationFEBasis, x, resultPath + "cosserat_homotopy_" + std::to_string(i+1) + "_l" + std::to_string(numLevels));
+      CosseratVTKWriter<GridView>::write<DeformationFEBasis>(deformationFEBasis, x, resultPath + "cosserat_homotopy_" + std::to_string(i+1) + "_l" + std::to_string(numLevels));
 #endif
     } else if (dim == 3 && dimworld == 3) {
 
diff --git a/src/rod3d.cc b/src/rod3d.cc
index 68cb905fffa2a1aea00f485b2b09cc541223bad9..9e199f71cc1dc1b19e848001528885c3c80bfcb4 100644
--- a/src/rod3d.cc
+++ b/src/rod3d.cc
@@ -294,7 +294,7 @@ int main (int argc, char *argv[]) try
 #else
   std::cout << "Falling back to legacy file writing.  Get dune-vtk for better results" << std::endl;
   // Fall-back solution for users without dune-vtk
-  CosseratVTKWriter<GridType>::write<ScalarBasis>(scalarBasis,x, resultPath + "rod3d-result");
+  CosseratVTKWriter<GridView>::write<ScalarBasis>(scalarBasis,x, resultPath + "rod3d-result");
 #endif
 
 }
diff --git a/test/nonplanarcosseratenergytest.cc b/test/nonplanarcosseratenergytest.cc
index 16733a46a5afd5975ff9d3e865a7a51b88f7e439..9a55a5fce727e4597956120888f43e9e878e211d 100644
--- a/test/nonplanarcosseratenergytest.cc
+++ b/test/nonplanarcosseratenergytest.cc
@@ -114,7 +114,7 @@ double calculateEnergy(const int numLevels, const F1 referenceConfigurationFunct
     solTuple[_0][i] = sol[i][_0];
     solTuple[_1][i] = sol[i][_1];
   }
-  CosseratVTKWriter<GridType>::write<FEBasis>(feBasis, solTuple, "configuration_l" + std::to_string(numLevels));
+  CosseratVTKWriter<decltype(gridView)>::write<FEBasis>(feBasis, solTuple, "configuration_l" + std::to_string(numLevels));
 
   double energy = 0;
   // A view on the FE basis on a single element