diff --git a/src/assemblers_tmpl.cc b/src/assemblers_tmpl.cc
index 6123cd5f89374af053c058e05e35a5e773c15c57..a66a89c912c0545cab3613a22467f6dbfb866bed 100644
--- a/src/assemblers_tmpl.cc
+++ b/src/assemblers_tmpl.cc
@@ -11,7 +11,7 @@ typedef Dune::FieldMatrix<double, 2, 2> SmallMatrix2;
 typedef Dune::BCRSMatrix<SmallMatrix2> OperatorType2;
 typedef Dune::BlockVector<SmallVector2> VectorType2;
 
-typedef Dune::ALUSimplexGrid<2, 2> GridType2;
+typedef Dune::ALUGrid<2, 2, Dune::simplex, Dune::nonconforming> GridType2;
 // typedef Dune::YaspGrid<2> GridType2;
 typedef GridType2::LeafGridView GridView2;
 typedef P1NodalBasis<GridView2, double> P1Basis2;
@@ -43,7 +43,7 @@ typedef Dune::FieldMatrix<double, 3, 3> SmallMatrix3;
 typedef Dune::BCRSMatrix<SmallMatrix3> OperatorType3;
 typedef Dune::BlockVector<SmallVector3> VectorType3;
 
-typedef Dune::ALUSimplexGrid<3, 3> GridType3;
+typedef Dune::ALUGrid<3, 3, Dune::simplex, Dune::nonconforming> GridType3;
 // typedef Dune::YaspGrid<3> GridType3;
 typedef GridType3::LeafGridView GridView3;
 typedef P1NodalBasis<GridView3, double> P1Basis3;
diff --git a/src/mysolver_tmpl.cc b/src/mysolver_tmpl.cc
index a5b7b601165036be7ebbd8b306cbca216d2d4c1b..4bf91b214f324d456b1d1f047e2e03abbb1f5436 100644
--- a/src/mysolver_tmpl.cc
+++ b/src/mysolver_tmpl.cc
@@ -17,7 +17,7 @@ typedef Dune::BCRSMatrix<SmallMatrix2> OperatorType2;
 typedef MyConvexProblem<OperatorType2, VectorType2> MyConvexProblemType2;
 typedef MyBlockProblem<MyConvexProblemType2> MyBlockProblemType2;
 
-typedef Dune::ALUSimplexGrid<2, 2> GridType2;
+typedef Dune::ALUGrid<2, 2, Dune::simplex, Dune::nonconforming> GridType2;
 // typedef Dune::YaspGrid<2> GridType2;
 
 template class MySolver<2, VectorType2, OperatorType2, GridType2,
@@ -33,7 +33,7 @@ typedef Dune::BCRSMatrix<SmallMatrix3> OperatorType3;
 typedef MyConvexProblem<OperatorType3, VectorType3> MyConvexProblemType3;
 typedef MyBlockProblem<MyConvexProblemType3> MyBlockProblemType3;
 
-typedef Dune::ALUSimplexGrid<3, 3> GridType3;
+typedef Dune::ALUGrid<3, 3, Dune::simplex, Dune::nonconforming> GridType3;
 // typedef Dune::YaspGrid<3> GridType3;
 
 template class MySolver<3, VectorType3, OperatorType3, GridType3,
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 9d2f7541cae1d9c8d3fa7d0d06c5c76aa51bad1c..8779d0dff86e30196aa7816a20041451008da180 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -147,7 +147,9 @@ int main(int argc, char *argv[]) {
         verbose ? Solver::FULL : Solver::QUIET;
 
     // {{{ Set up grid
-    typedef Dune::ALUSimplexGrid<dim, dim> GridType;
+
+    typedef Dune::ALUGrid<dim, dim, Dune::simplex, Dune::nonconforming>
+    GridType;
     Dune::FieldVector<typename GridType::ctype, dim> lowerLeft(0);
     Dune::FieldVector<typename GridType::ctype, dim> upperRight(1);
     Dune::array<unsigned int, dim> elements;
diff --git a/src/vtk_tmpl.cc b/src/vtk_tmpl.cc
index 182f51b6d64c9daafd1d5cfebca3c975a7edee4c..73bb323737f2e515847d2c59a68d9786650c2491 100644
--- a/src/vtk_tmpl.cc
+++ b/src/vtk_tmpl.cc
@@ -16,7 +16,7 @@ typedef Dune::FieldVector<double, 2> SmallVector2;
 typedef Dune::FieldMatrix<double, 2, 2> SmallMatrix2;
 typedef Dune::BlockVector<SmallVector2> VectorType2;
 
-typedef Dune::ALUSimplexGrid<2, 2> GridType2;
+typedef Dune::ALUGrid<2, 2, Dune::simplex, Dune::nonconforming> GridType2;
 // typedef Dune::YaspGrid<2> GridType2;
 typedef GridType2::LeafGridView GridView2;
 typedef P1NodalBasis<GridView2, double> P1Basis2;
@@ -35,7 +35,7 @@ typedef Dune::FieldVector<double, 3> SmallVector3;
 typedef Dune::FieldMatrix<double, 3, 3> SmallMatrix3;
 typedef Dune::BlockVector<SmallVector3> VectorType3;
 
-typedef Dune::ALUSimplexGrid<3, 3> GridType3;
+typedef Dune::ALUGrid<3, 3, Dune::simplex, Dune::nonconforming> GridType3;
 // typedef Dune::YaspGrid<3> GridType3;
 typedef GridType3::LeafGridView GridView3;
 typedef P1NodalBasis<GridView3, double> P1Basis3;