diff --git a/dune/fem-dg/algorithm/base.hh b/dune/fem-dg/algorithm/base.hh
index dae38464b9c298a446da2320d2e7efe153477162..b6bf3bef67d8b00f263c542d8506879e2c2da61d 100644
--- a/dune/fem-dg/algorithm/base.hh
+++ b/dune/fem-dg/algorithm/base.hh
@@ -8,7 +8,7 @@
 // dune-fem includes
 #include <dune/fem/io/file/datawriter.hh>
 #include <dune/fem/solver/timeprovider.hh>
-#include <dune/fem/space/common/adaptmanager.hh>
+#include <dune/fem/space/common/adaptationmanager.hh>
 
 // local includes
 #include <dune/fem-dg/algorithm/monitor.hh>
diff --git a/dune/fem-dg/algorithm/caller/adapt.hh b/dune/fem-dg/algorithm/caller/adapt.hh
index f71eac01f957d8de1ca5e505f01e28bd4cae6f83..48ea4226271e5324694ed51f27d98e87b718309d 100644
--- a/dune/fem-dg/algorithm/caller/adapt.hh
+++ b/dune/fem-dg/algorithm/caller/adapt.hh
@@ -17,7 +17,7 @@
 
 #include <dune/fem-dg/operator/adaptation/adaptation.hh>
 #include <dune/fem-dg/operator/adaptation/utility.hh>
-#include <dune/fem/space/common/adaptmanager.hh>
+#include <dune/fem/space/common/adaptationmanager.hh>
 #include <dune/fem-dg/misc/optional.hh>
 #include <dune/fem-dg/misc/tupleutility.hh>
 #include <dune/fem-dg/misc/integral_constant.hh>
diff --git a/dune/fem-dg/algorithm/caller/sub/adapt.hh b/dune/fem-dg/algorithm/caller/sub/adapt.hh
index 437690bef18bb3f4ce98f37739198c857dfe9784..00fae845c770e6b88ce874a9e9dcdab932960b54 100644
--- a/dune/fem-dg/algorithm/caller/sub/adapt.hh
+++ b/dune/fem-dg/algorithm/caller/sub/adapt.hh
@@ -16,7 +16,7 @@
 
 #include <dune/fem-dg/operator/adaptation/adaptation.hh>
 #include <dune/fem-dg/operator/adaptation/utility.hh>
-#include <dune/fem/space/common/adaptmanager.hh>
+#include <dune/fem/space/common/adaptationmanager.hh>
 #include <dune/fem-dg/misc/optional.hh>
 #include <dune/fem-dg/misc/tupleutility.hh>
 
diff --git a/dune/fem-dg/algorithm/gridinitializer.hh b/dune/fem-dg/algorithm/gridinitializer.hh
index 55e8c6053c47e8fe3ffb090c4b99f1d76dfb9407..161fb3ed3f76f97998cfbee3b04c7fdb39a30166 100644
--- a/dune/fem-dg/algorithm/gridinitializer.hh
+++ b/dune/fem-dg/algorithm/gridinitializer.hh
@@ -8,7 +8,7 @@
 #include <dune/fem/misc/mpimanager.hh>
 #include <dune/fem/misc/femeoc.hh>
 #include <dune/fem/misc/femtimer.hh>
-#include <dune/fem/space/common/adaptmanager.hh>
+#include <dune/fem/space/common/adaptationmanager.hh>
 #include <dune/fem-dg/misc/parameterkey.hh>
 
 #include <dune/fem-dg/operator/adaptation/utility.hh>
diff --git a/dune/fem-dg/examples/stokes/stokesalgorithm.hh b/dune/fem-dg/examples/stokes/stokesalgorithm.hh
index f0273bc132447779e9d15c6683804caa1c39ba37..6b8f6318c4ba4494dadc14121e01bc1cebd3fd5d 100644
--- a/dune/fem-dg/examples/stokes/stokesalgorithm.hh
+++ b/dune/fem-dg/examples/stokes/stokesalgorithm.hh
@@ -78,11 +78,11 @@ namespace Fem
 
     public:
       SigmaEval(const DiscreteFunction &uh,
-          const DiscretePressureFunctionType &ph,
-          const Operator& oper)
+                const DiscretePressureFunctionType &ph,
+                const Operator& oper)
         : SigmaBaseType(uh,oper),
-         ph_(ph),
-         localp_(ph_)
+          ph_(ph),
+          localp_(ph_)
       {}
       SigmaEval(const SigmaEval &other)
       : SigmaBaseType(other), ph_(other.ph_), localp_(ph_)
diff --git a/dune/fem-dg/operator/adaptation/adaptation.hh b/dune/fem-dg/operator/adaptation/adaptation.hh
index 301f276696d91bdf60b719e6010cbbc9ad77bfcb..f7d9948a24d43af04cb31df1d8e2dde213927fd2 100644
--- a/dune/fem-dg/operator/adaptation/adaptation.hh
+++ b/dune/fem-dg/operator/adaptation/adaptation.hh
@@ -16,7 +16,7 @@
 
 #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
 #include <dune/fem/quadrature/cachingquadrature.hh>
-#include <dune/fem/space/common/adaptmanager.hh>
+#include <dune/fem/space/common/adaptationmanager.hh>
 
 #include <dune/fem/io/streams/streams.hh>
 #include <dune/fem/solver/timeprovider.hh>
diff --git a/dune/fem-dg/operator/limiter/limitpass.hh b/dune/fem-dg/operator/limiter/limitpass.hh
index 19c28cd924fe2681e72f7e88541848741d272c29..1a40cedead2337f2a22255f35ed55e33f01a23f5 100644
--- a/dune/fem-dg/operator/limiter/limitpass.hh
+++ b/dune/fem-dg/operator/limiter/limitpass.hh
@@ -19,7 +19,7 @@
 #include <dune/fem/pass/localdg/discretemodel.hh>
 #include <dune/fem/pass/localdg.hh>
 
-#include <dune/fem/space/common/adaptmanager.hh>
+#include <dune/fem/space/common/adaptationmanager.hh>
 #include <dune/fem/space/common/basesetlocalkeystorage.hh>
 
 #include <dune/fem/space/discontinuousgalerkin.hh>