diff --git a/dune/gmsh4/gridcreators/lagrangegridcreator.hh b/dune/gmsh4/gridcreators/lagrangegridcreator.hh
index 1965b7b76109ac00529b4dd066f175969d475951..57e07aaf9728b3bce1869f004f738980ae029a19 100644
--- a/dune/gmsh4/gridcreators/lagrangegridcreator.hh
+++ b/dune/gmsh4/gridcreators/lagrangegridcreator.hh
@@ -304,7 +304,7 @@ namespace Dune
       using LocalCoordinate = typename Grid::template Codim<0>::Entity::Geometry::LocalCoordinate;
       using LocalGeometry = MultiLinearGeometry<ctype,Grid::dimension,Grid::dimension>;
 
-      using LocalFE = LagrangeLocalFiniteElement<VtkLagrangePointSet, Grid::dimension, ctype, ctype>;
+      using LocalFE = LagrangeLocalFiniteElement<Gmsh4::LagrangePointSet, Grid::dimension, ctype, ctype>;
       using LocalBasis = typename LocalFE::Traits::LocalBasisType;
       using LocalBasisTraits = typename LocalBasis::Traits;
 
diff --git a/dune/gmsh4/utility/lagrangepoints.hh b/dune/gmsh4/utility/lagrangepoints.hh
index 8086d4fb4c0eb46ccbd431bc46966efdaff9440e..04c77b559a4570e9f34877ecd6615c4ef43b618e 100644
--- a/dune/gmsh4/utility/lagrangepoints.hh
+++ b/dune/gmsh4/utility/lagrangepoints.hh
@@ -7,9 +7,11 @@
 #include <dune/geometry/type.hh>
 #include <dune/localfunctions/lagrange/equidistantpoints.hh>
 
-namespace Dune {
+namespace Dune
+{
 
-namespace Gmsh4 {
+namespace Gmsh4
+{
 
 namespace Impl {
   // forward declaration
@@ -18,7 +20,7 @@ namespace Impl {
 }
 
 
-/// \brief A set of lagrange points compatible with the numbering of VTK
+/// \brief A set of lagrange points compatible with the numbering of VTK and Gmsh
 /**
  * \tparam K    Field-type for the coordinates
  * \tparam dim  Dimension of the coordinates
diff --git a/src/ALUGridTests.cc b/src/ALUGridTests.cc
index 5712230fe2fa59c16069311ad1f3a18531a3ecbf..1d7e9201d3a947fed7c81b1f441f25065c745a68 100644
--- a/src/ALUGridTests.cc
+++ b/src/ALUGridTests.cc
@@ -10,9 +10,9 @@
 
 #include <dune/grid/utility/structuredgridfactory.hh>
 
-#include <dune/vtk/vtkreader.hh>
+#include <dune/vtk/reader.hh>
 #include <dune/vtk/gridcreators/lagrangegridcreator.hh>
-#include <dune/vtk/writers/vtkunstructuredgridwriter.hh>
+#include <dune/vtk/writers/unstructuredgridwriter.hh>
 #include <dune/vtk/datacollectors/lagrangedatacollector.hh>
 
 #include <dune/gmsh4/reader.hh>
@@ -49,7 +49,7 @@ int main(int argc, char** argv)
 
     CurvedSurfaceGrid curvedGrid(grid, creator, order_c<3>);
 
-    LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 3);
+    Vtk::LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 3);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("AG_test01_triangles_order3_subset_VtkReader.vtu");
   }*/
@@ -60,7 +60,7 @@ int main(int argc, char** argv)
                           "dune-gmsh4/src/meshes/triangles_3d_order3_subset.msh");
     auto& grid = *gridPtr;
 
-    LagrangeDataCollector dataCollector(grid.leafGridView(), 3);
+    Vtk::LagrangeDataCollector dataCollector(grid.leafGridView(), 3);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("AG_test02_triangles_order3_subset_flat.vtu");
   }
@@ -77,7 +77,7 @@ int main(int argc, char** argv)
 
     CurvedSurfaceGrid curvedGrid(grid, creator, order_c<3>);
 
-    LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 3);
+    Vtk::LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 3);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("AG_test03_triangles_order3_subset_curved.vtu");
   }
@@ -91,7 +91,7 @@ int main(int argc, char** argv)
                                        "dune-gmsh4/src/meshes/sphere_order4.msh");
     auto& grid = *gridPtr;
 
-    LagrangeDataCollector dataCollector(grid.leafGridView(), 4);
+    Vtk::LagrangeDataCollector dataCollector(grid.leafGridView(), 4);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("AG_test04_sphere_order4_ascii_flat.vtu");
   }
@@ -108,7 +108,7 @@ int main(int argc, char** argv)
 
     CurvedSurfaceGrid curvedGrid(grid, creator, order_c<4>);
 
-    LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 4);
+    Vtk::LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 4);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("AG_test05_sphere_order4_ascii_curved.vtu");
   }
@@ -132,7 +132,7 @@ int main(int argc, char** argv)
                                 "dune-gmsh4/src/meshes/sphere_order4_binary.msh");
     auto& grid = *gridPtr;
 
-    LagrangeDataCollector dataCollector(grid.leafGridView(), 4);
+    Vtk::LagrangeDataCollector dataCollector(grid.leafGridView(), 4);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("AG_test07_sphere_order4_binary_flat.vtu");
   }
@@ -149,7 +149,7 @@ int main(int argc, char** argv)
 
     CurvedSurfaceGrid curvedGrid(grid, creator, order_c<4>);
 
-    LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 4);
+    Vtk::LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 4);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("AG_test08_sphere_order4_binary_curved.vtu");
   }
@@ -173,7 +173,7 @@ int main(int argc, char** argv)
                               "dune-gmsh4/src/meshes/sphere_order4_quad.msh");
     auto& grid = *gridPtr;
 
-    LagrangeDataCollector dataCollector(grid.leafGridView(), 4);
+    Vtk::LagrangeDataCollector dataCollector(grid.leafGridView(), 4);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("AG_test10_sphere_order4_ascii_quad_flat.vtu");
   }
@@ -190,7 +190,7 @@ int main(int argc, char** argv)
 
     CurvedSurfaceGrid curvedGrid(grid, creator, order_c<4>);
 
-    LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 4);
+    Vtk::LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 4);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("AG_test11_sphere_order4_ascii_quad_curved.vtu");
   }
@@ -214,7 +214,7 @@ int main(int argc, char** argv)
                        "dune-gmsh4/src/meshes/sphere_order4_quad_binary.msh");
     auto& grid = *gridPtr;
 
-    LagrangeDataCollector dataCollector(grid.leafGridView(), 4);
+    Vtk::LagrangeDataCollector dataCollector(grid.leafGridView(), 4);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("AG_test13_sphere_order4_binary_quad_flat.vtu");
   }
@@ -231,7 +231,7 @@ int main(int argc, char** argv)
 
     CurvedSurfaceGrid curvedGrid(grid, creator, order_c<4>);
 
-    LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 4);
+    Vtk::LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 4);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("AG_test14_sphere_order4_binary_quad_curved.vtu");
   }
diff --git a/src/FoamGridTests.cc b/src/FoamGridTests.cc
index 55f2aef82e73ddd129f84a68242f6a84fc765d6c..1841bc03997448481daf90a46576a05dd5cc9b17 100644
--- a/src/FoamGridTests.cc
+++ b/src/FoamGridTests.cc
@@ -10,9 +10,9 @@
 
 #include <dune/grid/utility/structuredgridfactory.hh>
 
-#include <dune/vtk/vtkreader.hh>
+#include <dune/vtk/reader.hh>
 #include <dune/vtk/gridcreators/lagrangegridcreator.hh>
-#include <dune/vtk/writers/vtkunstructuredgridwriter.hh>
+#include <dune/vtk/writers/unstructuredgridwriter.hh>
 #include <dune/vtk/datacollectors/lagrangedatacollector.hh>
 
 #include <dune/gmsh4/reader.hh>
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
 
     CurvedSurfaceGrid curvedGrid(grid, creator, order_c<3>);
 
-    LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 3);
+    Vtk::LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 3);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("FG_test01_triangles_order3_subset_VtkReader.vtu");
   }*/
@@ -59,7 +59,7 @@ int main(int argc, char** argv)
                "dune-gmsh4/src/meshes/triangles_3d_order3_subset.msh");
     auto& grid = *gridPtr;
 
-    LagrangeDataCollector dataCollector(grid.leafGridView(), 3);
+    Vtk::LagrangeDataCollector dataCollector(grid.leafGridView(), 3);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("FG_test02_triangles_order3_subset_flat.vtu");
   }
@@ -76,7 +76,7 @@ int main(int argc, char** argv)
 
     CurvedSurfaceGrid curvedGrid(grid, creator, order_c<3>);
 
-    LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 3);
+    Vtk::LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 3);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("FG_test03_triangles_order3_subset_curved.vtu");
   }
@@ -90,7 +90,7 @@ int main(int argc, char** argv)
                                "dune-gmsh4/src/meshes/sphere_order4.msh");
     auto& grid = *gridPtr;
 
-    LagrangeDataCollector dataCollector(grid.leafGridView(), 4);
+    Vtk::LagrangeDataCollector dataCollector(grid.leafGridView(), 4);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("FG_test04_sphere_order4_ascii_flat.vtu");
   }
@@ -107,7 +107,7 @@ int main(int argc, char** argv)
 
     CurvedSurfaceGrid curvedGrid(grid, creator, order_c<4>);
 
-    LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 4);
+    Vtk::LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 4);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("FG_test05_sphere_order4_ascii_curved.vtu");
   }
@@ -131,7 +131,7 @@ int main(int argc, char** argv)
                         "dune-gmsh4/src/meshes/sphere_order4_binary.msh");
     auto& grid = *gridPtr;
 
-    LagrangeDataCollector dataCollector(grid.leafGridView(), 4);
+    Vtk::LagrangeDataCollector dataCollector(grid.leafGridView(), 4);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("FG_test07_sphere_order4_binary_flat.vtu");
   }
@@ -148,7 +148,7 @@ int main(int argc, char** argv)
 
     CurvedSurfaceGrid curvedGrid(grid, creator, order_c<4>);
 
-    LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 4);
+    Vtk::LagrangeDataCollector dataCollector(curvedGrid.leafGridView(), 4);
     VtkUnstructuredGridWriter vtkWriter(dataCollector, Vtk::ASCII);
     vtkWriter.write("FG_test08_sphere_order4_binary_curved.vtu");
   }