diff --git a/dumux/multidomain/common/multidomainconvergencewriter.hh b/dumux/multidomain/common/multidomainconvergencewriter.hh
index 75cf4673563e786edcc590530bed011b15a79ba9..805b81d1fb43852fcbe0ab96fe34674c3e0ca859 100644
--- a/dumux/multidomain/common/multidomainconvergencewriter.hh
+++ b/dumux/multidomain/common/multidomainconvergencewriter.hh
@@ -27,8 +27,8 @@
 #include <dumux/io/vtkmultiwriter.hh>
 #include <dune/grid/multidomaingrid.hh>
 
-#include "coupledcommon.hh"
-#include "couplednewtoncontroller.hh"
+#include "splitandmerge.hh"
+#include "multidomainnewtoncontroller.hh"
 
 /*!
  * \file
diff --git a/dumux/multidomain/common/multidomainlocaloperator.hh b/dumux/multidomain/common/multidomainlocaloperator.hh
index 3662e08082d62ba5b361b25f4133c3ea31b163fb..b7046f80288dec94039087d25c108988344b41ef 100644
--- a/dumux/multidomain/common/multidomainlocaloperator.hh
+++ b/dumux/multidomain/common/multidomainlocaloperator.hh
@@ -16,8 +16,8 @@
  *   You should have received a copy of the GNU General Public License       *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
-#ifndef DUMUX_MULTIDOMAIN_BOX_LOCAL_OPERATOR_HH
-#define DUMUX_MULTIDOMAIN_BOX_LOCAL_OPERATOR_HH
+#ifndef DUMUX_MULTIDOMAIN_LOCAL_OPERATOR_HH
+#define DUMUX_MULTIDOMAIN_LOCAL_OPERATOR_HH
 
 #include<dune/pdelab/localoperator/pattern.hh>
 #include<dune/pdelab/localoperator/flags.hh>
@@ -29,13 +29,13 @@ namespace Dumux {
 namespace PDELab {
 
 template<class TypeTag>
-class MultiDomainBoxLocalOperator
+class MultiDomainLocalOperator
 :
 public Dune::PDELab::FullVolumePattern,
 public Dune::PDELab::LocalOperatorDefaultFlags
 {
 	// copying the local operator for PDELab is not a good idea
-	MultiDomainBoxLocalOperator(const MultiDomainBoxLocalOperator &);
+	MultiDomainLocalOperator(const MultiDomainLocalOperator &);
 
 	typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
 	typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
@@ -50,7 +50,7 @@ public:
 	// residual assembly flags
 	enum { doAlphaVolume = true };
 
-	MultiDomainBoxLocalOperator(Model &model)
+	MultiDomainLocalOperator(Model &model)
 	: model_(model)
 	{}
 
diff --git a/dumux/multidomain/common/multidomainmodel.hh b/dumux/multidomain/common/multidomainmodel.hh
index ad1124dee9e731fe800d70938f2eba660b800f49..7ef477143eebd925c3db517f8d0c2c40f28fd109 100644
--- a/dumux/multidomain/common/multidomainmodel.hh
+++ b/dumux/multidomain/common/multidomainmodel.hh
@@ -19,10 +19,10 @@
 #ifndef DUMUX_COUPLED_MODEL_HH
 #define DUMUX_COUPLED_MODEL_HH
 
-#include "coupledproperties.hh"
-#include "coupledpropertydefaults.hh"
-#include "coupledproblem.hh"
-#include "couplednewtoncontroller.hh"
+#include "multidomainproperties.hh"
+#include "multidomainpropertydefaults.hh"
+#include "multidomainproblem.hh"
+#include "multidomainnewtoncontroller.hh"
 //#include "coupledjacobianassembler.hh"
 
 namespace Dumux
diff --git a/dumux/multidomain/common/multidomainnewtoncontroller.hh b/dumux/multidomain/common/multidomainnewtoncontroller.hh
index d9639d630577a0c185e4167bd237da16f31b1d44..f6cc2f0a6b78aa1a305bc21441ab28ae7964c35a 100644
--- a/dumux/multidomain/common/multidomainnewtoncontroller.hh
+++ b/dumux/multidomain/common/multidomainnewtoncontroller.hh
@@ -24,7 +24,6 @@
 #define DUMUX_COUPLED_NEWTON_CONTROLLER_HH
 
 #include <dumux/common/exceptions.hh>
-
 #include <dumux/linear/linearsolverproperties.hh>
 #include <dumux/linear/boxlinearsolver.hh>
 
@@ -41,7 +40,7 @@
 
 #include <dune/pdelab/backend/istlsolverbackend.hh>
 
-#include "couplednewtonconvergencewriter.hh"
+#include "multidomainconvergencewriter.hh"
 
 /*!
  * \file
diff --git a/dumux/multidomain/common/multidomainproblem.hh b/dumux/multidomain/common/multidomainproblem.hh
index 424796aec22f0b8cf1ece0c68d22c0fea1a8d4fa..128721376e844b575906ef528e5b3019c57110f9 100644
--- a/dumux/multidomain/common/multidomainproblem.hh
+++ b/dumux/multidomain/common/multidomainproblem.hh
@@ -23,8 +23,8 @@
 #ifndef DUMUX_COUPLED_PROBLEM_HH
 #define DUMUX_COUPLED_PROBLEM_HH
 
-#include "coupledmodel.hh"
-#include "couplednewtoncontroller.hh"
+#include "multidomainmodel.hh"
+#include "multidomainnewtoncontroller.hh"
 
 namespace Dumux
 {
diff --git a/dumux/multidomain/common/multidomainpropertydefaults.hh b/dumux/multidomain/common/multidomainpropertydefaults.hh
index 15ea99f7794972acf568c2db33e389d500c932bd..8991141eaa3786cbc90b52418c10192261a57e86 100644
--- a/dumux/multidomain/common/multidomainpropertydefaults.hh
+++ b/dumux/multidomain/common/multidomainpropertydefaults.hh
@@ -19,10 +19,9 @@
 #ifndef DUMUX_COUPLED_PROPERTY_DEFAULTS_HH
 #define DUMUX_COUPLED_PROPERTY_DEFAULTS_HH
 
-#include "coupledcommon.hh"
-#include "couplednewtoncontroller.hh"
-
-#include "coupledproperties.hh"
+#include "splitandmerge.hh"
+#include "multidomainnewtoncontroller.hh"
+#include "multidomainproperties.hh"
 
 namespace Dumux
 {
diff --git a/dumux/multidomain/common/splitandmerge.hh b/dumux/multidomain/common/splitandmerge.hh
index 80529da88be142cd4415109356ffc884e6af3886..44736a9d6093b96d0561a3df915a7e958ca0efaf 100644
--- a/dumux/multidomain/common/splitandmerge.hh
+++ b/dumux/multidomain/common/splitandmerge.hh
@@ -23,7 +23,7 @@
 #ifndef DUMUX_SPLIT_AND_MERGE_HH
 #define DUMUX_SPLIT_AND_MERGE_HH
 
-#include "coupledproperties.hh"
+#include "multidomainproperties.hh"
 #include <dumux/common/valgrind.hh>
 
 namespace Dumux
diff --git a/dumux/multidomain/common/subdomainpropertydefaults.hh b/dumux/multidomain/common/subdomainpropertydefaults.hh
index 80037ba46ab4c8d0d75f17210aae330bed25bc8e..8ba7b2c08c4894600c69ecabbbbac99c121ce6ad 100644
--- a/dumux/multidomain/common/subdomainpropertydefaults.hh
+++ b/dumux/multidomain/common/subdomainpropertydefaults.hh
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   See the file COPYING for full copying permissions.                      *
  *                                                                           *
@@ -18,10 +20,10 @@
 #define DUMUX_SUBDOMAIN_PROPERTY_DEFAULTS_HH
 
 #include <dune/grid/multidomaingrid.hh>
-#include <dumux/implicit/pdelab/pdelabadapter.hh>
+//#include <dumux/implicit/pdelab/pdelabadapter.hh>
 #include <dumux/implicit/common/boxcouplinglocalresidual.hh>
-#include <dumux/modelcoupling/common/multidomainboxlocaloperator.hh>
-#include "coupledproperties.hh"
+#include "multidomainlocaloperator.hh"
+#include "multidomainproperties.hh"
 
 /*!
  * \file