diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressureproperties.hh b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressureproperties.hh
index 0066de093ffe6a600f18a7264544431ef0ebfd70..753992fe9ce87946787ff718aa689dc5f77c022d 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressureproperties.hh
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressureproperties.hh
@@ -27,8 +27,8 @@
  * \brief Defines the properties required for finite volume pressure models
  */
 
-#ifndef DUMUX_FVPRESSUREPORPERTIES1P_DECOUPLED_HH
-#define DUMUX_FVPRESSUREPORPERTIES1P_DECOUPLED_HH
+#ifndef DUMUX_FVPRESSUREPORPERTIES1P_SEQUENTIAL_HH
+#define DUMUX_FVPRESSUREPORPERTIES1P_SEQUENTIAL_HH
 
 //Dumux-includes
 #include <dumux/porousmediumflow/1p/sequential/diffusion/properties.hh>
diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh
index 1d50dc14fd63bbd8d0d1429f8ad7e2f53db06d8f..fd08ddce2a5069a457035d68ad5b43e1866e300c 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh
@@ -27,8 +27,8 @@
  * \brief Defines the properties required for finite volume pressure models
  */
 
-#ifndef DUMUX_FVPRESSUREVELOCITYPORPERTIES1P_DECOUPLED_HH
-#define DUMUX_FVPRESSUREVELOCITYPORPERTIES1P_DECOUPLED_HH
+#ifndef DUMUX_FVPRESSUREVELOCITYPORPERTIES1P_SEQUENTIAL_HH
+#define DUMUX_FVPRESSUREVELOCITYPORPERTIES1P_SEQUENTIAL_HH
 
 //Dumux-includes
 #include <dumux/porousmediumflow/1p/sequential/diffusion/properties.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh
index 446fce95e331ae9c9162729a90120f90aba32e9b..97fc8f91731407c4c11cf69cc74cb1cf214773fd 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh
@@ -27,8 +27,8 @@
  * \brief Defines the properties required for finite volume pressure models in a two-phase sequential model.
  */
 
-#ifndef DUMUX_FVPRESSUREPORPERTIES2P_DECOUPLED_HH
-#define DUMUX_FVPRESSUREPORPERTIES2P_DECOUPLED_HH
+#ifndef DUMUX_FVPRESSUREPORPERTIES2P_SEQUENTIAL_HH
+#define DUMUX_FVPRESSUREPORPERTIES2P_SEQUENTIAL_HH
 
 //Dumux-includes
 #include <dumux/porousmediumflow/2p/sequential/diffusion/properties.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurepropertiesadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurepropertiesadaptive.hh
index 486a44c9c407ae3550e23b176e457c278730ebdd..4a0f014824941746bb75401aa89f89f7f1f0322c 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurepropertiesadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurepropertiesadaptive.hh
@@ -27,8 +27,8 @@
  * \brief Defines the properties required for finite volume pressure models in a two-phase sequential model.
  */
 
-#ifndef DUMUX_FVPRESSUREPORPERTIES2P_ADAPTIVE_DECOUPLED_HH
-#define DUMUX_FVPRESSUREPORPERTIES2P_ADAPTIVE_DECOUPLED_HH
+#ifndef DUMUX_FVPRESSUREPORPERTIES2P_ADAPTIVE_SEQUENTIAL_HH
+#define DUMUX_FVPRESSUREPORPERTIES2P_ADAPTIVE_SEQUENTIAL_HH
 
 //Dumux-includes
 #include <dumux/porousmediumflow/2p/sequential/diffusion/properties.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh
index 0ee673447793f0f1b915f71d53148b87f9260d0d..902f553e58b533f54db283207c057253e1ebadb5 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh
@@ -27,8 +27,8 @@
  * \brief Defines the properties required for finite volume pressure models
  */
 
-#ifndef DUMUX_FVPRESSUREVELOCITYPORPERTIES2P_DECOUPLED_HH
-#define DUMUX_FVPRESSUREVELOCITYPORPERTIES2P_DECOUPLED_HH
+#ifndef DUMUX_FVPRESSUREVELOCITYPORPERTIES2P_SEQUENTIAL_HH
+#define DUMUX_FVPRESSUREVELOCITYPORPERTIES2P_SEQUENTIAL_HH
 
 //Dumux-includes
 #include <dumux/porousmediumflow/2p/sequential/diffusion/properties.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureproperties.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureproperties.hh
index 6f1d28f8f1580ed075c595165aa1712c10898811..a081d184fb9b3f65fb137c8f3ba97bc5cc2bf05a 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureproperties.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureproperties.hh
@@ -17,8 +17,8 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 
-#ifndef DUMUX_MIMETICPROPERTIES2P_DECOUPLED_HH
-#define DUMUX_MIMETICPROPERTIES2P_DECOUPLED_HH
+#ifndef DUMUX_MIMETICPROPERTIES2P_SEQUENTIAL_HH
+#define DUMUX_MIMETICPROPERTIES2P_SEQUENTIAL_HH
 
 /*!
  * \ingroup IMPES
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressurepropertiesadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressurepropertiesadaptive.hh
index d1c53f96a8fa790df801e01eb88b072cf35fdc6e..c931dbc9f2da390fc0f3e2ca2e7eb1d87ca24d01 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressurepropertiesadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressurepropertiesadaptive.hh
@@ -18,8 +18,8 @@
  *****************************************************************************/
 
 
-#ifndef DUMUX_MIMETICPROPERTIES2PADAPTIVE_DECOUPLED_HH
-#define DUMUX_MIMETICPROPERTIES2PADAPTIVE_DECOUPLED_HH
+#ifndef DUMUX_MIMETICPROPERTIES2PADAPTIVE_SEQUENTIAL_HH
+#define DUMUX_MIMETICPROPERTIES2PADAPTIVE_SEQUENTIAL_HH
 
 /*!
  * \ingroup IMPES
diff --git a/dumux/porousmediumflow/sequential/mimetic/properties.hh b/dumux/porousmediumflow/sequential/mimetic/properties.hh
index d1169e724cf00f95bfade90c5159893b54267a2b..b3bf876127b4f981412f7be2f4277ebf9f94a5ed 100644
--- a/dumux/porousmediumflow/sequential/mimetic/properties.hh
+++ b/dumux/porousmediumflow/sequential/mimetic/properties.hh
@@ -26,8 +26,8 @@
  * \brief Defines the basic properties required for a mimetic method.
  */
 
-#ifndef DUMUX_MIMETICPROPERTIES_DECOUPLED_HH
-#define DUMUX_MIMETICPROPERTIES_DECOUPLED_HH
+#ifndef DUMUX_MIMETICPROPERTIES_SEQUENTIAL_HH
+#define DUMUX_MIMETICPROPERTIES_SEQUENTIAL_HH
 
 //Dumux-includes
 #include <dumux/porousmediumflow/sequential/properties.hh>