diff --git a/python/dune/perftool/pdelab/driver/gridfunctionspace.py b/python/dune/perftool/pdelab/driver/gridfunctionspace.py
index bf47920a94513d0075b92d3b65bc8357081e371e..d36fad06d0d44ce825d87c475b8b2ab5d3f6d1de 100644
--- a/python/dune/perftool/pdelab/driver/gridfunctionspace.py
+++ b/python/dune/perftool/pdelab/driver/gridfunctionspace.py
@@ -362,9 +362,9 @@ def typedef_vectorbackend(name, element):
     include_file("dune/pdelab/backend/istl.hh", filetag="driver")
     if get_option("fastdg"):
         blocksize = name_blocksize(element)
-        return "using {} = Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::fixed, {}>;".format(name, blocksize)
+        return "using {} = Dune::PDELab::ISTL::VectorBackend<Dune::PDELab::ISTL::Blocking::fixed, {}>;".format(name, blocksize)
     else:
-        return "using {} = Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::none, 1>;".format(name)
+        return "using {} = Dune::PDELab::ISTL::VectorBackend<Dune::PDELab::ISTL::Blocking::none, 1>;".format(name)
 
 
 def type_vectorbackend(element):
diff --git a/python/dune/perftool/pdelab/driver/gridoperator.py b/python/dune/perftool/pdelab/driver/gridoperator.py
index eb6cfd893ddd68c4f987e7dea77c3a501c9c71b6..39071cc8db29d90ff5189808ef4991a2c2794707 100644
--- a/python/dune/perftool/pdelab/driver/gridoperator.py
+++ b/python/dune/perftool/pdelab/driver/gridoperator.py
@@ -134,7 +134,7 @@ def name_dofestimate():
 @preamble
 def typedef_matrixbackend(name):
     include_file("dune/pdelab/backend/istl.hh", filetag="driver")
-    return "using {} = Dune::PDELab::istl::BCRSMatrixBackend<>;".format(name)
+    return "using {} = Dune::PDELab::ISTL::BCRSMatrixBackend<>;".format(name)
 
 
 def type_matrixbackend():
diff --git a/test/heatequation/driver.hh b/test/heatequation/driver.hh
index 1aaf9f171747325885cfebf6a74103e30575d138..4222ca89cea72d35021faabee8344c24a5cc63f0 100644
--- a/test/heatequation/driver.hh
+++ b/test/heatequation/driver.hh
@@ -30,7 +30,7 @@ void driver (const GV& gv, const FEM& fem, Dune::ParameterTree& ptree)
 
   // Make grid function space
   typedef Dune::PDELab::ConformingDirichletConstraints CON;
-  typedef Dune::PDELab::istl::VectorBackend<> VBE;
+  typedef Dune::PDELab::ISTL::VectorBackend<> VBE;
   typedef Dune::PDELab::GridFunctionSpace<GV,FEM,CON,VBE> GFS;
   GFS gfs(gv,fem);
   gfs.name("Vh");
@@ -63,7 +63,7 @@ void driver (const GV& gv, const FEM& fem, Dune::ParameterTree& ptree)
   // LOP lop(ptree, params_poisson);
 
 
-  typedef Dune::PDELab::istl::BCRSMatrixBackend<> MBE;
+  typedef Dune::PDELab::ISTL::BCRSMatrixBackend<> MBE;
   int degree = ptree.get("fem.degree",(int)1);
   MBE mbe((int)pow(1+2*degree,dim));
   typedef Dune::PDELab::GridOperator<GFS,GFS,LOP,MBE,
diff --git a/test/laplace/reference_driver.hh b/test/laplace/reference_driver.hh
index db1b55946833b34ae8e925737c7c127241b57f2a..02791b7dcb785463376e4dca0c15407f496d0c74 100644
--- a/test/laplace/reference_driver.hh
+++ b/test/laplace/reference_driver.hh
@@ -88,7 +88,7 @@ class CDProb
 };
 
 
-void driver(int argc, char** argv){  typedef Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::none, 1> VectorBackend;
+void driver(int argc, char** argv){  typedef Dune::PDELab::ISTL::VectorBackend<Dune::PDELab::ISTL::Blocking::none, 1> VectorBackend;
   static const int dim = 2;
   typedef Dune::UGGrid<dim> Grid;
   typedef Grid::LeafGridView GV;
@@ -110,7 +110,7 @@ void driver(int argc, char** argv){  typedef Dune::PDELab::istl::VectorBackend<D
   VTKWriter vtkwriter(gv, sublevel);
   using LOP = Dune::PDELab::ConvectionDiffusionDG<CDProb<GV, R>, DG1_FEM>;
   typedef DG1_DIRICHLET_GFS::ConstraintsContainer<R>::Type DG1_CC;
-  typedef Dune::PDELab::istl::BCRSMatrixBackend<> MatrixBackend;
+  typedef Dune::PDELab::ISTL::BCRSMatrixBackend<> MatrixBackend;
   typedef Dune::PDELab::GridOperator<DG1_DIRICHLET_GFS, DG1_DIRICHLET_GFS, LOP, MatrixBackend, DF, R, R, DG1_CC, DG1_CC> GO;
   typedef GO::Traits::Domain V;
   V x(dg1_dirichlet_gfs);
diff --git a/test/nonlinear/reference_driver.hh b/test/nonlinear/reference_driver.hh
index db0b072f1e0cd3050d2b6a0ac36adffc91f4cf1c..e24b24e1c534fac76d6c82bf12ec45426d9c327c 100644
--- a/test/nonlinear/reference_driver.hh
+++ b/test/nonlinear/reference_driver.hh
@@ -56,7 +56,7 @@ void driver (int argc, char** argv){
   typedef Dune::PDELab::PkLocalFiniteElementMap<GV,DF,double,1> FEM;
   FEM fem(gv);
   typedef Dune::PDELab::ConformingDirichletConstraints CON;
-  typedef Dune::PDELab::istl::VectorBackend<> VBE;
+  typedef Dune::PDELab::ISTL::VectorBackend<> VBE;
   typedef Dune::PDELab::GridFunctionSpace<GV,FEM,CON,VBE> GFS;
   GFS gfs(gv,fem);
   gfs.name("Vh");
@@ -85,7 +85,7 @@ void driver (int argc, char** argv){
   LOP lop(problem);
 
   // Make a global operator
-  typedef Dune::PDELab::istl::BCRSMatrixBackend<> MBE;
+  typedef Dune::PDELab::ISTL::BCRSMatrixBackend<> MBE;
   int degree = initree.get("fem.degree",(int)1);
   MBE mbe((int)pow(1+2*degree,dim));
   typedef Dune::PDELab::GridOperator<
diff --git a/test/poisson/reference_driver.hh b/test/poisson/reference_driver.hh
index 6c3e45f2f2c59e8c7a08554aa288e86d6dac3cba..c12054dfbc81ae1ed2350fc6b1dc91755f07b8cd 100644
--- a/test/poisson/reference_driver.hh
+++ b/test/poisson/reference_driver.hh
@@ -94,7 +94,7 @@ class CDProb
 };
 
 
-void driver(int argc, char** argv){  typedef Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::none, 1> VectorBackend;
+void driver(int argc, char** argv){  typedef Dune::PDELab::ISTL::VectorBackend<Dune::PDELab::ISTL::Blocking::none, 1> VectorBackend;
   static const int dim = 2;
   typedef Dune::UGGrid<dim> Grid;
   typedef Grid::LeafGridView GV;
@@ -116,7 +116,7 @@ void driver(int argc, char** argv){  typedef Dune::PDELab::istl::VectorBackend<D
   VTKWriter vtkwriter(gv, sublevel);
   using LOP = Dune::PDELab::ConvectionDiffusionDG<CDProb<GV, R>, DG1_FEM>;
   typedef DG1_DIRICHLET_GFS::ConstraintsContainer<R>::Type DG1_CC;
-  typedef Dune::PDELab::istl::BCRSMatrixBackend<> MatrixBackend;
+  typedef Dune::PDELab::ISTL::BCRSMatrixBackend<> MatrixBackend;
   typedef Dune::PDELab::GridOperator<DG1_DIRICHLET_GFS, DG1_DIRICHLET_GFS, LOP, MatrixBackend, DF, R, R, DG1_CC, DG1_CC> GO;
   typedef GO::Traits::Domain V;
   V x(dg1_dirichlet_gfs);