diff --git a/flow/flow_blackoil_alugrid.cpp b/flow/flow_blackoil_alugrid.cpp
index be1ea686d..560a0df1f 100644
--- a/flow/flow_blackoil_alugrid.cpp
+++ b/flow/flow_blackoil_alugrid.cpp
@@ -41,7 +41,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowProblemAlugrid {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 
diff --git a/flow/flow_blackoil_polyhedralgrid.cpp b/flow/flow_blackoil_polyhedralgrid.cpp
index 9eb77060f..e47eb4194 100644
--- a/flow/flow_blackoil_polyhedralgrid.cpp
+++ b/flow/flow_blackoil_polyhedralgrid.cpp
@@ -39,7 +39,7 @@ namespace Opm {
 namespace Properties {
     namespace TTag {
         struct EclFlowProblemPoly {
-            using InheritsFrom = std::tuple<EclFlowProblem>;
+            using InheritsFrom = std::tuple<FlowProblem>;
         };
     }
 
diff --git a/flow/flow_distribute_z.cpp b/flow/flow_distribute_z.cpp
index b23e4f02b..ce0011ced 100644
--- a/flow/flow_distribute_z.cpp
+++ b/flow/flow_distribute_z.cpp
@@ -61,7 +61,7 @@ std::vector<int> loadBalanceInZOnly(const Dune::CpGrid& grid)
 int main(int argc, char** argv)
 {
     auto mainObject = std::make_unique<Opm::Main>(argc, argv);
-    Opm::EclCpGridVanguard<Opm::Properties::TTag::EclFlowProblem>::setExternalLoadBalancer(loadBalanceInZOnly);
+    Opm::EclCpGridVanguard<Opm::Properties::TTag::FlowProblem>::setExternalLoadBalancer(loadBalanceInZOnly);
     auto ret = mainObject->runDynamic();
     // Destruct mainObject as the destructor calls MPI_Finalize!
     mainObject.reset();
diff --git a/flow/flow_ebos_blackoil.hpp b/flow/flow_ebos_blackoil.hpp
index ed72b72fd..3bfb162db 100644
--- a/flow/flow_ebos_blackoil.hpp
+++ b/flow/flow_ebos_blackoil.hpp
@@ -19,23 +19,15 @@
 
 #include <memory>
 
-namespace Opm {
-    namespace Properties {
-        namespace TTag {
-
-            struct EclFlowProblem;
-
-            struct EclFlowProblemTPFA {
-            using InheritsFrom = std::tuple<EclFlowProblem>;
-            };
-
-        }
-   }
+namespace Opm::Properties::TTag {
+    struct FlowProblem;
+    struct EclFlowProblemTPFA {
+        using InheritsFrom = std::tuple<FlowProblem>;
+    };
 }
 
 namespace Opm {
 
-
 //! \brief Main function used in flow binary.
 int flowEbosBlackoilTpfaMain(int argc, char** argv, bool outputCout, bool outputFiles);
 
diff --git a/flow/flow_ebos_blackoil_legacyassembly.cpp b/flow/flow_ebos_blackoil_legacyassembly.cpp
index 777f889d1..7b62d10c7 100644
--- a/flow/flow_ebos_blackoil_legacyassembly.cpp
+++ b/flow/flow_ebos_blackoil_legacyassembly.cpp
@@ -24,14 +24,14 @@
 
 namespace Opm {
 
-std::unique_ptr<FlowMain<Properties::TTag::EclFlowProblem>>
+std::unique_ptr<FlowMain<Properties::TTag::FlowProblem>>
 flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles)
 {
     // we always want to use the default locale, and thus spare us the trouble
     // with incorrect locale settings.
     resetLocale();
 
-    return std::make_unique<FlowMain<Properties::TTag::EclFlowProblem>>(
+    return std::make_unique<FlowMain<Properties::TTag::FlowProblem>>(
         argc, argv, outputCout, outputFiles);
 }
 
@@ -44,7 +44,7 @@ int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFile
 
 int flowEbosBlackoilMainStandalone(int argc, char** argv)
 {
-    using TypeTag = Properties::TTag::EclFlowProblem;
+    using TypeTag = Properties::TTag::FlowProblem;
     auto mainObject = std::make_unique<Opm::Main>(argc, argv);
     auto ret = mainObject->runStatic<TypeTag>();
     // Destruct mainObject as the destructor calls MPI_Finalize!
diff --git a/flow/flow_ebos_blackoil_legacyassembly.hpp b/flow/flow_ebos_blackoil_legacyassembly.hpp
index ed5180413..db2c19175 100644
--- a/flow/flow_ebos_blackoil_legacyassembly.hpp
+++ b/flow/flow_ebos_blackoil_legacyassembly.hpp
@@ -26,13 +26,13 @@ template<class TypeTag> class FlowMain;
 namespace Action {
 class State;
 }
-namespace Properties { namespace TTag { struct EclFlowProblem; } }
+namespace Properties { namespace TTag { struct FlowProblem; } }
 
 //! \brief Main function used in flow binary.
 int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles);
 
 //! \brief Initialization function used in flow binary and python simulator.
-std::unique_ptr<FlowMain<Properties::TTag::EclFlowProblem>>
+std::unique_ptr<FlowMain<Properties::TTag::FlowProblem>>
     flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles);
 
 //! \brief Main function used in flow_blackoil binary.
diff --git a/flow/flow_ebos_brine.cpp b/flow/flow_ebos_brine.cpp
index 9fba35d51..f28c42387 100644
--- a/flow/flow_ebos_brine.cpp
+++ b/flow/flow_ebos_brine.cpp
@@ -27,7 +27,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowBrineProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
diff --git a/flow/flow_ebos_brine_energy.cpp b/flow/flow_ebos_brine_energy.cpp
index df420484d..6067faaf0 100644
--- a/flow/flow_ebos_brine_energy.cpp
+++ b/flow/flow_ebos_brine_energy.cpp
@@ -21,7 +21,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowBrineProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
diff --git a/flow/flow_ebos_brine_precsalt_vapwat.cpp b/flow/flow_ebos_brine_precsalt_vapwat.cpp
index 919a64597..68a481c41 100644
--- a/flow/flow_ebos_brine_precsalt_vapwat.cpp
+++ b/flow/flow_ebos_brine_precsalt_vapwat.cpp
@@ -27,7 +27,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowBrinePrecsaltVapwatProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
diff --git a/flow/flow_ebos_brine_saltprecipitation.cpp b/flow/flow_ebos_brine_saltprecipitation.cpp
index 11d4cd872..e7c8f3214 100644
--- a/flow/flow_ebos_brine_saltprecipitation.cpp
+++ b/flow/flow_ebos_brine_saltprecipitation.cpp
@@ -27,7 +27,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowBrineSaltPrecipitationProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
diff --git a/flow/flow_ebos_energy.cpp b/flow/flow_ebos_energy.cpp
index da0b347f9..9d6c5cdf4 100644
--- a/flow/flow_ebos_energy.cpp
+++ b/flow/flow_ebos_energy.cpp
@@ -27,7 +27,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowEnergyProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 
diff --git a/flow/flow_ebos_extbo.cpp b/flow/flow_ebos_extbo.cpp
index 40f84250e..43f9903d9 100644
--- a/flow/flow_ebos_extbo.cpp
+++ b/flow/flow_ebos_extbo.cpp
@@ -27,7 +27,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowExtboProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
diff --git a/flow/flow_ebos_foam.cpp b/flow/flow_ebos_foam.cpp
index 85ddaad2c..81510af73 100644
--- a/flow/flow_ebos_foam.cpp
+++ b/flow/flow_ebos_foam.cpp
@@ -27,7 +27,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowFoamProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
diff --git a/flow/flow_ebos_gasoil.cpp b/flow/flow_ebos_gasoil.cpp
index 21fd652b9..4d78c4e93 100644
--- a/flow/flow_ebos_gasoil.cpp
+++ b/flow/flow_ebos_gasoil.cpp
@@ -32,7 +32,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowGasOilProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 
@@ -53,7 +53,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_gasoil_energy.cpp b/flow/flow_ebos_gasoil_energy.cpp
index a1b7ed130..417e5134e 100644
--- a/flow/flow_ebos_gasoil_energy.cpp
+++ b/flow/flow_ebos_gasoil_energy.cpp
@@ -31,7 +31,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowGasOilEnergyProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 
@@ -43,7 +43,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_gasoildiffuse.cpp b/flow/flow_ebos_gasoildiffuse.cpp
index f5610c4f5..29273d4f0 100644
--- a/flow/flow_ebos_gasoildiffuse.cpp
+++ b/flow/flow_ebos_gasoildiffuse.cpp
@@ -31,7 +31,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowGasOilDiffuseProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 
@@ -55,7 +55,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_gaswater.cpp b/flow/flow_ebos_gaswater.cpp
index 3d1cce3a9..dcd6ddecd 100644
--- a/flow/flow_ebos_gaswater.cpp
+++ b/flow/flow_ebos_gaswater.cpp
@@ -35,7 +35,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowGasWaterProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 
@@ -56,7 +56,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_gaswater_brine.cpp b/flow/flow_ebos_gaswater_brine.cpp
index 26adb5ac2..13db6b88a 100644
--- a/flow/flow_ebos_gaswater_brine.cpp
+++ b/flow/flow_ebos_gaswater_brine.cpp
@@ -29,7 +29,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowGasWaterBrineProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
@@ -52,7 +52,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_gaswater_dissolution.cpp b/flow/flow_ebos_gaswater_dissolution.cpp
index 82f539e60..994cb1e15 100644
--- a/flow/flow_ebos_gaswater_dissolution.cpp
+++ b/flow/flow_ebos_gaswater_dissolution.cpp
@@ -35,7 +35,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowGasWaterDissolutionProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 
@@ -66,7 +66,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_gaswater_dissolution_diffuse.cpp b/flow/flow_ebos_gaswater_dissolution_diffuse.cpp
index c1363fb87..7189df84d 100644
--- a/flow/flow_ebos_gaswater_dissolution_diffuse.cpp
+++ b/flow/flow_ebos_gaswater_dissolution_diffuse.cpp
@@ -35,7 +35,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowGasWaterDissolutionDiffuseProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 
@@ -69,7 +69,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_gaswater_energy.cpp b/flow/flow_ebos_gaswater_energy.cpp
index 6fea8324a..574b01b45 100644
--- a/flow/flow_ebos_gaswater_energy.cpp
+++ b/flow/flow_ebos_gaswater_energy.cpp
@@ -35,7 +35,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowGasWaterEnergyProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 
@@ -74,7 +74,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_gaswater_saltprec_energy.cpp b/flow/flow_ebos_gaswater_saltprec_energy.cpp
index da5260281..485f9abad 100644
--- a/flow/flow_ebos_gaswater_saltprec_energy.cpp
+++ b/flow/flow_ebos_gaswater_saltprec_energy.cpp
@@ -29,7 +29,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowGasWaterSaltprecEnergyProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
@@ -65,7 +65,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_gaswater_saltprec_vapwat.cpp b/flow/flow_ebos_gaswater_saltprec_vapwat.cpp
index 327dacf65..b124eaee6 100644
--- a/flow/flow_ebos_gaswater_saltprec_vapwat.cpp
+++ b/flow/flow_ebos_gaswater_saltprec_vapwat.cpp
@@ -29,7 +29,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowGasWaterSaltprecVapwatProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
@@ -60,7 +60,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_gaswater_solvent.cpp b/flow/flow_ebos_gaswater_solvent.cpp
index 1a3947d1b..b09ac283a 100644
--- a/flow/flow_ebos_gaswater_solvent.cpp
+++ b/flow/flow_ebos_gaswater_solvent.cpp
@@ -32,7 +32,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowGasWaterSolventProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 
@@ -49,7 +49,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_micp.cpp b/flow/flow_ebos_micp.cpp
index 35879582b..149dd8acd 100644
--- a/flow/flow_ebos_micp.cpp
+++ b/flow/flow_ebos_micp.cpp
@@ -29,7 +29,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowMICPProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
@@ -44,7 +44,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_oilwater.cpp b/flow/flow_ebos_oilwater.cpp
index 554967589..431f793ae 100644
--- a/flow/flow_ebos_oilwater.cpp
+++ b/flow/flow_ebos_oilwater.cpp
@@ -32,7 +32,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowOilWaterProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 
@@ -56,7 +56,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_oilwater_brine.cpp b/flow/flow_ebos_oilwater_brine.cpp
index bd007db5a..185865f15 100644
--- a/flow/flow_ebos_oilwater_brine.cpp
+++ b/flow/flow_ebos_oilwater_brine.cpp
@@ -29,7 +29,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowOilWaterBrineProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
@@ -44,7 +44,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_oilwater_polymer.cpp b/flow/flow_ebos_oilwater_polymer.cpp
index 48bda281e..cc58eb705 100644
--- a/flow/flow_ebos_oilwater_polymer.cpp
+++ b/flow/flow_ebos_oilwater_polymer.cpp
@@ -29,7 +29,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowOilWaterPolymerProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
@@ -44,7 +44,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_oilwater_polymer_injectivity.cpp b/flow/flow_ebos_oilwater_polymer_injectivity.cpp
index b18e8e02e..feadcc3ec 100644
--- a/flow/flow_ebos_oilwater_polymer_injectivity.cpp
+++ b/flow/flow_ebos_oilwater_polymer_injectivity.cpp
@@ -29,7 +29,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowOilWaterPolymerInjectivityProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
@@ -50,7 +50,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_onephase.cpp b/flow/flow_ebos_onephase.cpp
index aa78c78ea..c345cbbe9 100644
--- a/flow/flow_ebos_onephase.cpp
+++ b/flow/flow_ebos_onephase.cpp
@@ -30,7 +30,7 @@ namespace Properties {
 
 namespace TTag {
 struct EclFlowProblemWaterOnly {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 
@@ -51,7 +51,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_onephase_energy.cpp b/flow/flow_ebos_onephase_energy.cpp
index 1904b97c3..f0f3dbe34 100644
--- a/flow/flow_ebos_onephase_energy.cpp
+++ b/flow/flow_ebos_onephase_energy.cpp
@@ -31,7 +31,7 @@ namespace Properties {
 
 namespace TTag {
 struct EclFlowProblemWaterOnlyEnergy {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
@@ -46,7 +46,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    using BaseTypeTag = TTag::EclFlowProblem;
+    using BaseTypeTag = TTag::FlowProblem;
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
diff --git a/flow/flow_ebos_polymer.cpp b/flow/flow_ebos_polymer.cpp
index 66715e1ec..6b13aa8d6 100644
--- a/flow/flow_ebos_polymer.cpp
+++ b/flow/flow_ebos_polymer.cpp
@@ -27,7 +27,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowPolymerProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
diff --git a/flow/flow_ebos_solvent.cpp b/flow/flow_ebos_solvent.cpp
index 041cbd187..727ef578b 100644
--- a/flow/flow_ebos_solvent.cpp
+++ b/flow/flow_ebos_solvent.cpp
@@ -27,7 +27,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowSolventProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
diff --git a/flow/flow_ebos_solvent_foam.cpp b/flow/flow_ebos_solvent_foam.cpp
index 5ffd56f66..6839f7ec9 100644
--- a/flow/flow_ebos_solvent_foam.cpp
+++ b/flow/flow_ebos_solvent_foam.cpp
@@ -27,7 +27,7 @@ namespace Opm {
 namespace Properties {
 namespace TTag {
 struct EclFlowSolventFoamProblem {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 template<class TypeTag>
diff --git a/opm/simulators/flow/BlackoilModel.hpp b/opm/simulators/flow/BlackoilModel.hpp
index 417e14394..3d5623bc7 100644
--- a/opm/simulators/flow/BlackoilModel.hpp
+++ b/opm/simulators/flow/BlackoilModel.hpp
@@ -74,79 +74,79 @@
 namespace Opm::Properties {
 
 namespace TTag {
-struct EclFlowProblem {
+struct FlowProblem {
     using InheritsFrom = std::tuple<FlowTimeSteppingParameters, FlowModelParameters,
                                     FlowNonLinearSolver, EclBaseProblem, BlackOilModel>;
 };
 }
 template<class TypeTag>
-struct OutputDir<TypeTag, TTag::EclFlowProblem> {
+struct OutputDir<TypeTag, TTag::FlowProblem> {
     static constexpr auto value = "";
 };
 template<class TypeTag>
-struct EnableDebuggingChecks<TypeTag, TTag::EclFlowProblem> {
+struct EnableDebuggingChecks<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = false;
 };
 // default in flow is to formulate the equations in surface volumes
 template<class TypeTag>
-struct BlackoilConserveSurfaceVolume<TypeTag, TTag::EclFlowProblem> {
+struct BlackoilConserveSurfaceVolume<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = true;
 };
 template<class TypeTag>
-struct UseVolumetricResidual<TypeTag, TTag::EclFlowProblem> {
+struct UseVolumetricResidual<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = false;
 };
 
 template<class TypeTag>
-struct EclAquiferModel<TypeTag, TTag::EclFlowProblem> {
+struct EclAquiferModel<TypeTag, TTag::FlowProblem> {
     using type = BlackoilAquiferModel<TypeTag>;
 };
 
 // disable all extensions supported by black oil model. this should not really be
 // necessary but it makes things a bit more explicit
 template<class TypeTag>
-struct EnablePolymer<TypeTag, TTag::EclFlowProblem> {
+struct EnablePolymer<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = false;
 };
 template<class TypeTag>
-struct EnableSolvent<TypeTag, TTag::EclFlowProblem> {
+struct EnableSolvent<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = false;
 };
 template<class TypeTag>
-struct EnableTemperature<TypeTag, TTag::EclFlowProblem> {
+struct EnableTemperature<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = true;
 };
 template<class TypeTag>
-struct EnableEnergy<TypeTag, TTag::EclFlowProblem> {
+struct EnableEnergy<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = false;
 };
 template<class TypeTag>
-struct EnableFoam<TypeTag, TTag::EclFlowProblem> {
+struct EnableFoam<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = false;
 };
 template<class TypeTag>
-struct EnableBrine<TypeTag, TTag::EclFlowProblem> {
+struct EnableBrine<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = false;
 };
 template<class TypeTag>
-struct EnableSaltPrecipitation<TypeTag, TTag::EclFlowProblem> {
+struct EnableSaltPrecipitation<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = false;
 };
 template<class TypeTag>
-struct EnableMICP<TypeTag, TTag::EclFlowProblem> {
+struct EnableMICP<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = false;
 };
 template<class TypeTag>
-struct EnableDispersion<TypeTag, TTag::EclFlowProblem> {
+struct EnableDispersion<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = false;
 };
 
 template<class TypeTag>
-struct EclWellModel<TypeTag, TTag::EclFlowProblem> {
+struct EclWellModel<TypeTag, TTag::FlowProblem> {
     using type = BlackoilWellModel<TypeTag>;
 };
 template<class TypeTag>
-struct LinearSolverSplice<TypeTag, TTag::EclFlowProblem> {
+struct LinearSolverSplice<TypeTag, TTag::FlowProblem> {
     using type = TTag::FlowIstlSolver;
 };
 
diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp
index 8eb42385d..6aa050c57 100644
--- a/opm/simulators/flow/FlowMain.hpp
+++ b/opm/simulators/flow/FlowMain.hpp
@@ -58,16 +58,16 @@ struct EnableLoggingFalloutWarning {
 
 // TODO: enumeration parameters. we use strings for now.
 template<class TypeTag>
-struct EnableDryRun<TypeTag, TTag::EclFlowProblem> {
+struct EnableDryRun<TypeTag, TTag::FlowProblem> {
     static constexpr auto value = "auto";
 };
 // Do not merge parallel output files or warn about them
 template<class TypeTag>
-struct EnableLoggingFalloutWarning<TypeTag, TTag::EclFlowProblem> {
+struct EnableLoggingFalloutWarning<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = false;
 };
 template<class TypeTag>
-struct OutputInterval<TypeTag, TTag::EclFlowProblem> {
+struct OutputInterval<TypeTag, TTag::FlowProblem> {
     static constexpr int value = 1;
 };
 
diff --git a/opm/simulators/flow/Main.hpp b/opm/simulators/flow/Main.hpp
index 4d1f93502..742b497f4 100644
--- a/opm/simulators/flow/Main.hpp
+++ b/opm/simulators/flow/Main.hpp
@@ -93,7 +93,7 @@ namespace Opm::Properties {
 // simulator.
 namespace TTag {
 struct FlowEarlyBird {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
+    using InheritsFrom = std::tuple<FlowProblem>;
 };
 }
 
diff --git a/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp b/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
index a9142a1a3..f85f8feba 100644
--- a/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
+++ b/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
@@ -95,40 +95,40 @@ struct LoadFile
 };
 
 template<class TypeTag>
-struct EnableTerminalOutput<TypeTag, TTag::EclFlowProblem> {
+struct EnableTerminalOutput<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = true;
 };
 template<class TypeTag>
-struct EnableAdaptiveTimeStepping<TypeTag, TTag::EclFlowProblem> {
+struct EnableAdaptiveTimeStepping<TypeTag, TTag::FlowProblem> {
     static constexpr bool value = true;
 };
 
 template <class TypeTag>
-struct OutputExtraConvergenceInfo<TypeTag, TTag::EclFlowProblem>
+struct OutputExtraConvergenceInfo<TypeTag, TTag::FlowProblem>
 {
     static constexpr auto* value = "none";
 };
 
 template <class TypeTag>
-struct SaveStep<TypeTag, TTag::EclFlowProblem>
+struct SaveStep<TypeTag, TTag::FlowProblem>
 {
     static constexpr auto* value = "";
 };
 
 template <class TypeTag>
-struct SaveFile<TypeTag, TTag::EclFlowProblem>
+struct SaveFile<TypeTag, TTag::FlowProblem>
 {
     static constexpr auto* value = "";
 };
 
 template <class TypeTag>
-struct LoadFile<TypeTag, TTag::EclFlowProblem>
+struct LoadFile<TypeTag, TTag::FlowProblem>
 {
     static constexpr auto* value = "";
 };
 
 template <class TypeTag>
-struct LoadStep<TypeTag, TTag::EclFlowProblem>
+struct LoadStep<TypeTag, TTag::FlowProblem>
 {
     static constexpr int value = -1;
 };
diff --git a/tests/test_glift1.cpp b/tests/test_glift1.cpp
index 63d2c725c..7fd77ef80 100644
--- a/tests/test_glift1.cpp
+++ b/tests/test_glift1.cpp
@@ -107,7 +107,7 @@ struct GliftFixture {
     Dune::MPIHelper::instance(argc, argv);
 #endif
         Opm::EclGenericVanguard::setCommunication(std::make_unique<Opm::Parallel::Communication>());
-        using TypeTag = Opm::Properties::TTag::EclFlowProblem;
+        using TypeTag = Opm::Properties::TTag::FlowProblem;
         Opm::registerAllParameters_<TypeTag>();
     }
 };
@@ -118,7 +118,7 @@ BOOST_GLOBAL_FIXTURE(GliftFixture);
 
 BOOST_AUTO_TEST_CASE(G1)
 {
-    //using TypeTag = Opm::Properties::TTag::EclFlowProblem;
+    //using TypeTag = Opm::Properties::TTag::FlowProblem;
     using TypeTag = Opm::Properties::TTag::TestGliftTypeTag;
     //using EclProblem = Opm::EclProblem<TypeTag>;
     //using EclWellModel = typename EclProblem::EclWellModel;
diff --git a/tests/test_wellmodel.cpp b/tests/test_wellmodel.cpp
index 3eca28e94..261d06afc 100644
--- a/tests/test_wellmodel.cpp
+++ b/tests/test_wellmodel.cpp
@@ -58,7 +58,7 @@
 
 
 
-using StandardWell = Opm::StandardWell<Opm::Properties::TTag::EclFlowProblem>;
+using StandardWell = Opm::StandardWell<Opm::Properties::TTag::FlowProblem>;
 
 struct SetupTest {
 
@@ -101,7 +101,7 @@ struct GlobalFixture {
         Dune::MPIHelper::instance(argcDummy, argvDummy);
 #endif
 
-        Opm::FlowMain<Opm::Properties::TTag::EclFlowProblem>::setupParameters_(argcDummy, argvDummy, Dune::MPIHelper::getCommunication());
+        Opm::FlowMain<Opm::Properties::TTag::FlowProblem>::setupParameters_(argcDummy, argvDummy, Dune::MPIHelper::getCommunication());
     }
 };
 
@@ -112,7 +112,7 @@ BOOST_AUTO_TEST_CASE(TestStandardWellInput) {
     const auto& wells_ecl = setup_test.schedule->getWells(setup_test.current_timestep);
     BOOST_CHECK_EQUAL( wells_ecl.size(), 2);
     const Opm::Well& well = wells_ecl[1];
-    const Opm::BlackoilModelParameters<Opm::Properties::TTag::EclFlowProblem> param;
+    const Opm::BlackoilModelParameters<Opm::Properties::TTag::FlowProblem> param;
 
     // For the conversion between the surface volume rate and resrevoir voidage rate
     typedef Opm::BlackOilFluidSystem<double> FluidSystem;
@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(TestBehavoir) {
 
     {
         const int nw = wells_ecl.size();
-        const Opm::BlackoilModelParameters<Opm::Properties::TTag::EclFlowProblem> param;
+        const Opm::BlackoilModelParameters<Opm::Properties::TTag::FlowProblem> param;
 
         for (int w = 0; w < nw; ++w) {
             // For the conversion between the surface volume rate and resrevoir voidage rate