diff --git a/dune/solvers/test/common.hh b/dune/solvers/test/common.hh
index ba2bcd94f1e23b61f5b9e7b0813c215a1cac2c66..92c6dd5f10e7dc750bfef7b346a1539cc1fda524 100644
--- a/dune/solvers/test/common.hh
+++ b/dune/solvers/test/common.hh
@@ -12,7 +12,7 @@
 
 #include <dune/geometry/quadraturerules.hh>
 
-#include <dune/localfunctions/lagrange/pqkfactory.hh>
+#include <dune/localfunctions/lagrange/lagrangelfecache.hh>
 
 #include <dune/grid/yaspgrid.hh>
 
@@ -38,7 +38,7 @@ void constructPQ1Pattern(const GridView& gridView, Matrix& matrix)
 {
     static const int dim = GridView::Grid::dimension;
 
-    typedef typename Dune::PQkLocalFiniteElementCache<double, double, dim, 1> FiniteElementCache;
+    typedef typename Dune::LagrangeLocalFiniteElementCache<double, double, dim, 1> FiniteElementCache;
     typedef typename FiniteElementCache::FiniteElementType FiniteElement;
 
     const auto& indexSet = gridView.indexSet();
@@ -73,7 +73,7 @@ void assemblePQ1Stiffness(const GridView& gridView, Matrix& matrix)
     static constexpr int dim = GridView::Grid::dimension;
     static constexpr int dimworld = GridView::Grid::dimensionworld;
 
-    typedef typename Dune::PQkLocalFiniteElementCache<double, double, dim, 1> FiniteElementCache;
+    typedef typename Dune::LagrangeLocalFiniteElementCache<double, double, dim, 1> FiniteElementCache;
     typedef typename FiniteElementCache::FiniteElementType FiniteElement;
 
     typedef typename Dune::FieldVector<double, dimworld> GlobalCoordinate;
@@ -143,7 +143,7 @@ void assemblePQ1Mass(const GridView& gridView, Matrix& matrix)
 {
     static const int dim = GridView::Grid::dimension;
 
-    typedef typename Dune::PQkLocalFiniteElementCache<double, double, dim, 1> FiniteElementCache;
+    typedef typename Dune::LagrangeLocalFiniteElementCache<double, double, dim, 1> FiniteElementCache;
     typedef typename FiniteElementCache::FiniteElementType FiniteElement;
 
     typedef typename FiniteElement::Traits::LocalBasisType::Traits::RangeType RangeType;
@@ -205,7 +205,7 @@ void assemblePQ1RHS(const GridView& gridView, Vector& r, const Function& f)
 {
     static const int dim = GridView::Grid::dimension;
 
-    typedef typename Dune::PQkLocalFiniteElementCache<double, double, dim, 1> FiniteElementCache;
+    typedef typename Dune::LagrangeLocalFiniteElementCache<double, double, dim, 1> FiniteElementCache;
     typedef typename FiniteElementCache::FiniteElementType FiniteElement;
 
     typedef typename FiniteElement::Traits::LocalBasisType::Traits::RangeType RangeType;
@@ -283,7 +283,7 @@ void markBoundaryDOFs(const GridView& gridView, BitVector& isBoundary)
     static const int dim = GridView::Grid::dimension;
 
     typedef typename GridView::IndexSet IndexSet;
-    typedef typename Dune::PQkLocalFiniteElementCache<double, double, dim, 1> FiniteElementCache;
+    typedef typename Dune::LagrangeLocalFiniteElementCache<double, double, dim, 1> FiniteElementCache;
     typedef typename FiniteElementCache::FiniteElementType FiniteElement;
 
     const IndexSet& indexSet = gridView.indexSet();
diff --git a/dune/solvers/transferoperators/genericmultigridtransfer.hh b/dune/solvers/transferoperators/genericmultigridtransfer.hh
index 64352907d7f8edab35a3507727e3b5ee78be1a8e..71a61f82853edb631ec500ad3a0f6c35218b07fd 100644
--- a/dune/solvers/transferoperators/genericmultigridtransfer.hh
+++ b/dune/solvers/transferoperators/genericmultigridtransfer.hh
@@ -10,7 +10,7 @@
 
 #include <dune/geometry/referenceelements.hh>
 
-#include <dune/localfunctions/lagrange/pqkfactory.hh>
+#include <dune/localfunctions/lagrange/lagrangelfecache.hh>
 
 #include <dune/matrix-vector/axpy.hh>
 #include <dune/matrix-vector/transformmatrix.hh>
@@ -81,7 +81,7 @@ public:
         int cols = grid.size(cL, dim);
 
         // A factory for the shape functions
-        typedef typename Dune::PQkLocalFiniteElementCache<ctype, field_type, dim, 1> P1FECache;
+        typedef typename Dune::LagrangeLocalFiniteElementCache<ctype, field_type, dim, 1> P1FECache;
         typedef typename P1FECache::FiniteElementType FEType;
         P1FECache p1FECache;
 
@@ -228,7 +228,7 @@ public:
         int cols = gvCoarse.size(dim);
 
         // A factory for the shape functions
-        typedef typename Dune::PQkLocalFiniteElementCache<ctype, field_type, dim, 1> P1FECache;
+        typedef typename Dune::LagrangeLocalFiniteElementCache<ctype, field_type, dim, 1> P1FECache;
         typedef typename P1FECache::FiniteElementType FEType;
         P1FECache p1FECache;