diff --git a/test/boxmodels/1p/1ptestproblem.hh b/test/boxmodels/1p/1ptestproblem.hh
index 1bddd4934140445ab5f0598d9c3c109e6e661f57..1bee0686915e0a265e051bdef92c2f11d846f609 100644
--- a/test/boxmodels/1p/1ptestproblem.hh
+++ b/test/boxmodels/1p/1ptestproblem.hh
@@ -83,7 +83,7 @@ SET_INT_PROP(OnePTestProblem, PreconditionerIterations, 1);
 SET_SCALAR_PROP(OnePTestProblem, PreconditionerRelaxation, 1.0);
 
 // Enable gravity
-SET_BOOL_PROP(OnePTestProblem, EnableGravity, true);
+SET_BOOL_PROP(OnePTestProblem, ProblemEnableGravity, true);
 }
 
 /*!
diff --git a/test/boxmodels/1p2c/1p2coutflowproblem.hh b/test/boxmodels/1p2c/1p2coutflowproblem.hh
index 160a5e178cdc5c024255a44b0b76fc4eb57e1778..31ed4452633a0ae98916240b85c13ec2b0f93fac 100644
--- a/test/boxmodels/1p2c/1p2coutflowproblem.hh
+++ b/test/boxmodels/1p2c/1p2coutflowproblem.hh
@@ -80,7 +80,7 @@ SET_TYPE_PROP(OnePTwoCOutflowProblem,
 SET_BOOL_PROP(OnePTwoCOutflowProblem, UseMoles, false);
 
 // Disable gravity
-SET_BOOL_PROP(OnePTwoCOutflowProblem, EnableGravity, false);
+SET_BOOL_PROP(OnePTwoCOutflowProblem, ProblemEnableGravity, false);
 }
 
 
diff --git a/test/boxmodels/2p/lensproblem.hh b/test/boxmodels/2p/lensproblem.hh
index 1936357f8410d0c4939d9c32e330c07eabb425ad..927c8402bf69e3ae7b4ce37a8ebbc9348dce2665 100644
--- a/test/boxmodels/2p/lensproblem.hh
+++ b/test/boxmodels/2p/lensproblem.hh
@@ -108,7 +108,7 @@ SET_INT_PROP(LensProblem, PreconditionerIterations, 1);
 SET_SCALAR_PROP(LensProblem, PreconditionerRelaxation, 1.0);
 
 // Enable gravity
-SET_BOOL_PROP(LensProblem, EnableGravity, true);
+SET_BOOL_PROP(LensProblem, ProblemEnableGravity, true);
 }
 
 /*!
diff --git a/test/boxmodels/2p2c/injectionproblem.hh b/test/boxmodels/2p2c/injectionproblem.hh
index f7200e91896d2b2de3bf991097f44fb162c281ff..eaad9605f2ea286e03ca7cf8aa5d36c39ed495a6 100644
--- a/test/boxmodels/2p2c/injectionproblem.hh
+++ b/test/boxmodels/2p2c/injectionproblem.hh
@@ -64,7 +64,7 @@ SET_PROP(InjectionProblem, FluidSystem)
 };
 
 // Enable gravity
-SET_BOOL_PROP(InjectionProblem, EnableGravity, true);
+SET_BOOL_PROP(InjectionProblem, ProblemEnableGravity, true);
 
 SET_BOOL_PROP(InjectionProblem, EnableJacobianRecycling, true);
 SET_BOOL_PROP(InjectionProblem, VtkAddVelocity, false);
diff --git a/test/boxmodels/2p2cni/waterairproblem.hh b/test/boxmodels/2p2cni/waterairproblem.hh
index 4627b2330d152259105ea098bffc11b081448df3..5259b53674ae2fd977cf6e786c108f393773167f 100644
--- a/test/boxmodels/2p2cni/waterairproblem.hh
+++ b/test/boxmodels/2p2cni/waterairproblem.hh
@@ -63,7 +63,7 @@ SET_PROP(WaterAirProblem, Problem)
 SET_TYPE_PROP(WaterAirProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
 
 // Enable gravity
-SET_BOOL_PROP(WaterAirProblem, EnableGravity, true);
+SET_BOOL_PROP(WaterAirProblem, ProblemEnableGravity, true);
 
 // Use forward differences instead of central differences
 SET_INT_PROP(WaterAirProblem, NumericDifferenceMethod, +1);
diff --git a/test/boxmodels/2pni/injectionproblem2pni.hh b/test/boxmodels/2pni/injectionproblem2pni.hh
index 1b702e31ae8a94f11f6ff292e904cfe536333af9..66435714ccffc07864e12b6f48b4b5bf33c86521 100644
--- a/test/boxmodels/2pni/injectionproblem2pni.hh
+++ b/test/boxmodels/2pni/injectionproblem2pni.hh
@@ -108,7 +108,7 @@ public:
 #endif
 
 // Enable gravity
-SET_BOOL_PROP(InjectionProblem2PNI, EnableGravity, true);
+SET_BOOL_PROP(InjectionProblem2PNI, ProblemEnableGravity, true);
 
 // write convergence behaviour to disk?
 SET_BOOL_PROP(InjectionProblem2PNI, NewtonWriteConvergence, true);
diff --git a/test/boxmodels/3p3c/infiltrationproblem.hh b/test/boxmodels/3p3c/infiltrationproblem.hh
index 9672d303a811c792fb6c5732e1c3b0a3729a4fde..51688c7a0966da4095175155fb55e0a31af66c2c 100644
--- a/test/boxmodels/3p3c/infiltrationproblem.hh
+++ b/test/boxmodels/3p3c/infiltrationproblem.hh
@@ -57,7 +57,7 @@ SET_TYPE_PROP(InfiltrationProblem,
               Dumux::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
 // Enable gravity?
-SET_BOOL_PROP(InfiltrationProblem, EnableGravity, true);
+SET_BOOL_PROP(InfiltrationProblem, ProblemEnableGravity, true);
 
 // Write newton convergence?
 SET_BOOL_PROP(InfiltrationProblem, NewtonWriteConvergence, false);
diff --git a/test/boxmodels/3p3cni/columnxylolproblem.hh b/test/boxmodels/3p3cni/columnxylolproblem.hh
index 6b93730b79bb66e36f21a448cd1df813862ec049..dfe5754f6245975167494a15c9d68946ce7bbe42 100644
--- a/test/boxmodels/3p3cni/columnxylolproblem.hh
+++ b/test/boxmodels/3p3cni/columnxylolproblem.hh
@@ -66,7 +66,7 @@ SET_TYPE_PROP(ColumnProblem,
               Dumux::FluidSystems::H2OAirXylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
 // Enable gravity
-SET_BOOL_PROP(ColumnProblem, EnableGravity, true);
+SET_BOOL_PROP(ColumnProblem, ProblemEnableGravity, true);
 
 // Use forward differences instead of central differences
 SET_INT_PROP(ColumnProblem, NumericDifferenceMethod, 0);
diff --git a/test/boxmodels/3p3cni/kuevetteproblem.hh b/test/boxmodels/3p3cni/kuevetteproblem.hh
index 068fdc8514aa752a2950eddb8f6d12f9843690aa..03f07649ee7d67420217f89d0bcc1143ef9f92ba 100644
--- a/test/boxmodels/3p3cni/kuevetteproblem.hh
+++ b/test/boxmodels/3p3cni/kuevetteproblem.hh
@@ -67,7 +67,7 @@ SET_TYPE_PROP(KuevetteProblem,
               Dumux::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
 // Enable gravity
-SET_BOOL_PROP(KuevetteProblem, EnableGravity, true);
+SET_BOOL_PROP(KuevetteProblem, ProblemEnableGravity, true);
 
 // Use central differences (backward -1, forward +1)
 SET_INT_PROP(KuevetteProblem, NumericDifferenceMethod, 0);
diff --git a/test/boxmodels/co2/heterogeneousproblem.hh b/test/boxmodels/co2/heterogeneousproblem.hh
index 1a64f551eb6d5a051327f3e80a5f82c2db64d30c..a7dfdad6b3befbbedee83709220c5933f6f49584 100644
--- a/test/boxmodels/co2/heterogeneousproblem.hh
+++ b/test/boxmodels/co2/heterogeneousproblem.hh
@@ -92,7 +92,7 @@ SET_TYPE_PROP(HeterogeneousProblem, Model, CO2Model<TypeTag>);
 SET_TYPE_PROP(HeterogeneousProblem, VolumeVariables, CO2VolumeVariables<TypeTag>);
 
 // Enable gravity
-SET_BOOL_PROP(HeterogeneousProblem, EnableGravity, true);
+SET_BOOL_PROP(HeterogeneousProblem, ProblemEnableGravity, true);
 
 SET_BOOL_PROP(HeterogeneousProblem, EnableJacobianRecycling, false);
 SET_BOOL_PROP(HeterogeneousProblem, EnableVelocityOutput, false);
diff --git a/test/boxmodels/co2ni/heterogeneousproblemni.hh b/test/boxmodels/co2ni/heterogeneousproblemni.hh
index 909b8b2b09245c2360e0ef055f86784b5a025282..f5e5ce015df5087a344ed873da147d454261934a 100644
--- a/test/boxmodels/co2ni/heterogeneousproblemni.hh
+++ b/test/boxmodels/co2ni/heterogeneousproblemni.hh
@@ -83,7 +83,7 @@ SET_TYPE_PROP(HeterogeneousProblem, Model, CO2NIModel<TypeTag>);
 SET_TYPE_PROP(HeterogeneousProblem, VolumeVariables, CO2NIVolumeVariables<TypeTag>);
 
 // Enable gravity
-SET_BOOL_PROP(HeterogeneousProblem, EnableGravity, true);
+SET_BOOL_PROP(HeterogeneousProblem, ProblemEnableGravity, true);
 
 SET_BOOL_PROP(HeterogeneousProblem, EnableJacobianRecycling, false);
 SET_BOOL_PROP(HeterogeneousProblem, EnableVelocityOutput, false);
diff --git a/test/boxmodels/mpnc/forchheimer1pproblem.hh b/test/boxmodels/mpnc/forchheimer1pproblem.hh
index c808d7a74314408bb55041cbb28cfc4e68727d8b..3557e658703239c2649ef4bd880c2f5fc43c26f3 100644
--- a/test/boxmodels/mpnc/forchheimer1pproblem.hh
+++ b/test/boxmodels/mpnc/forchheimer1pproblem.hh
@@ -77,7 +77,7 @@ SET_BOOL_PROP(Forchheimer1pProblem, EnableDiffusion, false);
 SET_BOOL_PROP(Forchheimer1pProblem, NewtonEnableChop, true);
 
 // Enable gravity
-SET_BOOL_PROP(Forchheimer1pProblem, EnableGravity, false);
+SET_BOOL_PROP(Forchheimer1pProblem, ProblemEnableGravity, false);
 
 // Write Newton convergence to disk?
 SET_BOOL_PROP(Forchheimer1pProblem, NewtonWriteConvergence, false);
diff --git a/test/boxmodels/mpnc/forchheimer2pproblem.hh b/test/boxmodels/mpnc/forchheimer2pproblem.hh
index 1d79bff3b3b119e70fcd31c264252f9116f8b43c..a0ed2792736d1b298f56239d819644753cc1450a 100644
--- a/test/boxmodels/mpnc/forchheimer2pproblem.hh
+++ b/test/boxmodels/mpnc/forchheimer2pproblem.hh
@@ -77,7 +77,7 @@ SET_BOOL_PROP(Forchheimer2pProblem, EnableDiffusion, false);
 SET_BOOL_PROP(Forchheimer2pProblem, NewtonEnableChop, true);
 
 // Enable gravity
-SET_BOOL_PROP(Forchheimer2pProblem, EnableGravity, true);
+SET_BOOL_PROP(Forchheimer2pProblem, ProblemEnableGravity, true);
 
 // Write Newton convergence to disk?
 SET_BOOL_PROP(Forchheimer2pProblem, NewtonWriteConvergence, false);
diff --git a/test/boxmodels/mpnc/obstacleproblem.hh b/test/boxmodels/mpnc/obstacleproblem.hh
index 9ff2af01d7532fba51a51c65c43277992243b8f9..4e6de8ce5a723278aa900dc19482e8f21c92799a 100644
--- a/test/boxmodels/mpnc/obstacleproblem.hh
+++ b/test/boxmodels/mpnc/obstacleproblem.hh
@@ -76,7 +76,7 @@ SET_BOOL_PROP(ObstacleProblem, EnableDiffusion, false);
 SET_BOOL_PROP(ObstacleProblem, NewtonEnableChop, true);
 
 // Enable gravity
-SET_BOOL_PROP(ObstacleProblem, EnableGravity, true);
+SET_BOOL_PROP(ObstacleProblem, ProblemEnableGravity, true);
 
 // Write Newton convergence to disk?
 SET_BOOL_PROP(ObstacleProblem, NewtonWriteConvergence, false);
diff --git a/test/boxmodels/richards/richardslensproblem.hh b/test/boxmodels/richards/richardslensproblem.hh
index 56335e0300e702a5ba44abdb815de722273fda5f..728356a93b13a7434732b3c2049c3bede26f7d8e 100644
--- a/test/boxmodels/richards/richardslensproblem.hh
+++ b/test/boxmodels/richards/richardslensproblem.hh
@@ -64,7 +64,7 @@ public:
 };
 
 // Enable gravity
-SET_BOOL_PROP(RichardsLensProblem, EnableGravity, true);
+SET_BOOL_PROP(RichardsLensProblem, ProblemEnableGravity, true);
 
 // Enable partial reassembly of the Jacobian matrix
 SET_BOOL_PROP(RichardsLensProblem, EnablePartialReassemble, true);
diff --git a/test/common/generalproblem/generallensproblem.hh b/test/common/generalproblem/generallensproblem.hh
index 6d65dcc5ef4de061a40a3a24454fe6b142660dde..8cacd5231071f6bd890a72a279ffa1de7b869007 100644
--- a/test/common/generalproblem/generallensproblem.hh
+++ b/test/common/generalproblem/generallensproblem.hh
@@ -98,7 +98,7 @@ public:
 };
 
 // Enable gravity
-SET_BOOL_PROP(GeneralLensProblem, EnableGravity, true);
+SET_BOOL_PROP(GeneralLensProblem, ProblemEnableGravity, true);
 
 ///////////////////////////////////////////////////
 // Box model TypeTag
diff --git a/test/decoupled/1p/test_1pproblem.hh b/test/decoupled/1p/test_1pproblem.hh
index 9fb12ba4acdaaa2185e7ba5adc1660df6e357658..4613002be4952f6617956aed4baa47c4d6664b35 100644
--- a/test/decoupled/1p/test_1pproblem.hh
+++ b/test/decoupled/1p/test_1pproblem.hh
@@ -77,7 +77,7 @@ public:
 SET_TYPE_PROP(TestProblemOneP, SpatialParams, Dumux::TestOnePSpatialParams<TypeTag>);
 
 // Enable gravity
-SET_BOOL_PROP(TestProblemOneP, EnableGravity, false);
+SET_BOOL_PROP(TestProblemOneP, ProblemEnableGravity, false);
 
 //Set the problem
 SET_TYPE_PROP(TestProblemOneP, Problem, Dumux::TestProblemOneP<TypeTag>);
diff --git a/test/decoupled/1p/test_diffusionproblem.hh b/test/decoupled/1p/test_diffusionproblem.hh
index 934f6ed7786bdf6b4e0d0a0b2d05a9c14914d47b..c5481a4ff5e7693b7d37a18c1570770356861b34 100644
--- a/test/decoupled/1p/test_diffusionproblem.hh
+++ b/test/decoupled/1p/test_diffusionproblem.hh
@@ -85,7 +85,7 @@ public:
 };
 
 // Enable gravity
-SET_BOOL_PROP(FVVelocity2PTestProblem, EnableGravity, false);
+SET_BOOL_PROP(FVVelocity2PTestProblem, ProblemEnableGravity, false);
 
 
 // set the types for the MPFA-O FV method
@@ -122,7 +122,7 @@ public:
 };
 
 // Enable gravity
-SET_BOOL_PROP(FVMPFAOVelocity2PTestProblem, EnableGravity, false);
+SET_BOOL_PROP(FVMPFAOVelocity2PTestProblem, ProblemEnableGravity, false);
 
 // set the types for the mimetic FD method
 NEW_TYPE_TAG(MimeticPressure2PTestProblem, INHERITS_FROM(MimeticPressureTwoP, TestDiffusionSpatialParams));
@@ -156,7 +156,7 @@ public:
 };
 
 // Enable gravity
-SET_BOOL_PROP(MimeticPressure2PTestProblem, EnableGravity, false);
+SET_BOOL_PROP(MimeticPressure2PTestProblem, ProblemEnableGravity, false);
 
 }
 
diff --git a/test/decoupled/2p/test_impesadaptiveproblem.hh b/test/decoupled/2p/test_impesadaptiveproblem.hh
index 03b97e1f93c9437a6a151714c7c3a97b004e6073..46aed6949045e6ded3bdbe6154c36538c08cba3d 100644
--- a/test/decoupled/2p/test_impesadaptiveproblem.hh
+++ b/test/decoupled/2p/test_impesadaptiveproblem.hh
@@ -85,7 +85,7 @@ public:
 };
 
 // Enable gravity
-SET_BOOL_PROP(TestIMPESAdaptiveProblem, EnableGravity, false);
+SET_BOOL_PROP(TestIMPESAdaptiveProblem, ProblemEnableGravity, false);
 
 //SET_BOOL_PROP(TestIMPESAdaptiveProblem, EnableCompressibility, true);
 
diff --git a/test/decoupled/2p/test_impesproblem.hh b/test/decoupled/2p/test_impesproblem.hh
index fe0c9e62f22de36371b95b2af845f10900ca1004..aa50691a638d226f7b7f332c40ddb167e4b30fb1 100644
--- a/test/decoupled/2p/test_impesproblem.hh
+++ b/test/decoupled/2p/test_impesproblem.hh
@@ -120,7 +120,7 @@ public:
 };
 
 // Enable gravity
-SET_BOOL_PROP(IMPESTestProblem, EnableGravity, false);
+SET_BOOL_PROP(IMPESTestProblem, ProblemEnableGravity, false);
 
 SET_TYPE_PROP(IMPESTestProblem, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>);
 
diff --git a/test/decoupled/2p/test_transportproblem.hh b/test/decoupled/2p/test_transportproblem.hh
index 0b89335776eeb3c0cace77ddb8dcf8fce27d8b2c..52a62ac05bd4d7609cac4028131a1e3e63b8210a 100644
--- a/test/decoupled/2p/test_transportproblem.hh
+++ b/test/decoupled/2p/test_transportproblem.hh
@@ -83,7 +83,7 @@ SET_INT_PROP(TransportTestProblem, VelocityFormulation,
         DecoupledTwoPCommonIndices::velocityTotal);
 
 // Disable gravity
-SET_BOOL_PROP(TransportTestProblem, EnableGravity, false);
+SET_BOOL_PROP(TransportTestProblem, ProblemEnableGravity, false);
 
 SET_SCALAR_PROP(TransportTestProblem, CFLFactor, 1.0);
 }
diff --git a/test/decoupled/2p2c/test_adaptive2p2cproblem.hh b/test/decoupled/2p2c/test_adaptive2p2cproblem.hh
index 7ecb42b354e53d79ec8cfefed6d359ec98d705b4..1c1125397fc6a79ad5cfaf8223de96cd9bb8dc79 100644
--- a/test/decoupled/2p2c/test_adaptive2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_adaptive2p2cproblem.hh
@@ -90,7 +90,7 @@ SET_PROP(Adaptive2p2c, Components) : public GET_PROP(TypeTag, DefaultComponents)
 SET_TYPE_PROP(Adaptive2p2c, AdaptionIndicator, GridAdaptionIndicator2P<TypeTag>);
 
 // Enable gravity
-SET_BOOL_PROP(Adaptive2p2c, EnableGravity, true);
+SET_BOOL_PROP(Adaptive2p2c, ProblemEnableGravity, true);
 SET_INT_PROP(Adaptive2p2c,
         BoundaryMobility,
         GET_PROP_TYPE(TypeTag, Indices)::permDependent);
diff --git a/test/decoupled/2p2c/test_dec2p2cproblem.hh b/test/decoupled/2p2c/test_dec2p2cproblem.hh
index c4e51c70600d7a1e2a01af54173cdb66e8d45760..f48038ac47e1a97499375985b545322c4813d817 100644
--- a/test/decoupled/2p2c/test_dec2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_dec2p2cproblem.hh
@@ -103,7 +103,7 @@ SET_PROP(TestDecTwoPTwoCProblem, Components) : public GET_PROP(TypeTag, DefaultC
 //SET_TYPE_PROP(TestDecTwoPTwoCProblem, LinearSolver, IMPETBiCGStabILU0Solver<TypeTag> );
 
 // Enable gravity
-SET_BOOL_PROP(TestDecTwoPTwoCProblem, EnableGravity, true);
+SET_BOOL_PROP(TestDecTwoPTwoCProblem, ProblemEnableGravity, true);
 SET_BOOL_PROP(TestDecTwoPTwoCProblem, EnableCapillarity, true);
 SET_INT_PROP(TestDecTwoPTwoCProblem,
         BoundaryMobility,
diff --git a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
index de1d7656c1af91c18340b401032b581b3aa56209..0eb6cf51b3da8355eaaaf3f9c39bcd6a6778f6b2 100644
--- a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
@@ -105,7 +105,7 @@ SET_PROP(TestMultTwoPTwoCProblem, Components) : public GET_PROP(TypeTag, Default
 };
 
 // Enable gravity
-SET_BOOL_PROP(TestMultTwoPTwoCProblem, EnableGravity, true);
+SET_BOOL_PROP(TestMultTwoPTwoCProblem, ProblemEnableGravity, true);
 SET_BOOL_PROP(TestMultTwoPTwoCProblem, EnableCapillarity, true);
 SET_INT_PROP(TestMultTwoPTwoCProblem,
              BoundaryMobility,
diff --git a/test/freeflow/navierstokes/navierstokestestproblem.hh b/test/freeflow/navierstokes/navierstokestestproblem.hh
index b27f87872137365dcc3748d484d9434e1811d395..1e00c860ffb01af2199e071e1c98766197e42bb4 100644
--- a/test/freeflow/navierstokes/navierstokestestproblem.hh
+++ b/test/freeflow/navierstokes/navierstokestestproblem.hh
@@ -80,7 +80,7 @@ namespace Dumux
     SET_TYPE_PROP(BoxStokes, Scalar, double);
 
     // Disable gravity
-    SET_BOOL_PROP(NavierStokesTestProblem, EnableGravity, false);
+    SET_BOOL_PROP(NavierStokesTestProblem, ProblemEnableGravity, false);
   }
 
   /*!
diff --git a/test/freeflow/stokes/stokestestproblem.hh b/test/freeflow/stokes/stokestestproblem.hh
index b355f6a5af2711630ff2bd8925f8b09022bc8b34..f34157687fcf9fe35224d2d31ebb3f2aa27ab508 100644
--- a/test/freeflow/stokes/stokestestproblem.hh
+++ b/test/freeflow/stokes/stokestestproblem.hh
@@ -68,7 +68,7 @@ SET_TYPE_PROP(BoxStokes, Scalar, double);
 SET_SCALAR_PROP(StokesTestProblem, StokesStabilizationAlpha, -1.0);
 
 // Enable gravity
-SET_BOOL_PROP(StokesTestProblem, EnableGravity, false);
+SET_BOOL_PROP(StokesTestProblem, ProblemEnableGravity, false);
 }
 
 /*!
diff --git a/test/freeflow/stokes2c/stokes2ctestproblem.hh b/test/freeflow/stokes2c/stokes2ctestproblem.hh
index 7d5e85829f7f52bdc522243e6441c3e7bfa5d05c..1302a047b643f726a096fb72ae6257394f2f8202 100644
--- a/test/freeflow/stokes2c/stokes2ctestproblem.hh
+++ b/test/freeflow/stokes2c/stokes2ctestproblem.hh
@@ -66,7 +66,7 @@ SET_PROP(BoxStokes2c, FluidSystem)
 SET_SCALAR_PROP(BoxStokes2c, StokesStabilizationAlpha, -1.0);
 
 // Enable gravity
-SET_BOOL_PROP(Stokes2cTestProblem, EnableGravity, false);
+SET_BOOL_PROP(Stokes2cTestProblem, ProblemEnableGravity, false);
 }
 
 /*!
diff --git a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
index 45903827ec4ea7c3a17d2045b931a8d78a407a03..7a2824243fce6fa5d57351f1301de5d4ec0ebfe9 100644
--- a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
+++ b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
@@ -65,7 +65,7 @@ SET_PROP(BoxStokes2cni, FluidSystem)
 SET_SCALAR_PROP(BoxStokes2cni, StokesStabilizationAlpha, -1.0);
 
 // Enable gravity
-SET_BOOL_PROP(Stokes2cniTestProblem, EnableGravity, true);
+SET_BOOL_PROP(Stokes2cniTestProblem, ProblemEnableGravity, true);
 }
 
 /*!