diff --git a/flow/flow_ebos_blackoil.cpp b/flow/flow_ebos_blackoil.cpp
index 27a0fa086..a1e04ca47 100644
--- a/flow/flow_ebos_blackoil.cpp
+++ b/flow/flow_ebos_blackoil.cpp
@@ -30,13 +30,13 @@ namespace Opm {
     namespace Properties {
 
         template<class TypeTag>
-        struct Linearizer<TypeTag, TTag::EclFlowProblemTPFA> { using type = TpfaLinearizer<TypeTag>; };
+        struct Linearizer<TypeTag, TTag::FlowProblemTPFA> { using type = TpfaLinearizer<TypeTag>; };
 
         template<class TypeTag>
-        struct LocalResidual<TypeTag, TTag::EclFlowProblemTPFA> { using type = BlackOilLocalResidualTPFA<TypeTag>; };
+        struct LocalResidual<TypeTag, TTag::FlowProblemTPFA> { using type = BlackOilLocalResidualTPFA<TypeTag>; };
 
         template<class TypeTag>
-        struct EnableDiffusion<TypeTag, TTag::EclFlowProblemTPFA> { static constexpr bool value = false; };
+        struct EnableDiffusion<TypeTag, TTag::FlowProblemTPFA> { static constexpr bool value = false; };
 
     }
 }
@@ -44,14 +44,14 @@ namespace Opm {
 
 namespace Opm
 {
-std::unique_ptr<FlowMain<Properties::TTag::EclFlowProblemTPFA>>
+std::unique_ptr<FlowMain<Properties::TTag::FlowProblemTPFA>>
 flowEbosBlackoilTpfaMainInit(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::EclFlowProblemTPFA>>(
+    return std::make_unique<FlowMain<Properties::TTag::FlowProblemTPFA>>(
         argc, argv, outputCout, outputFiles);
 }
 
@@ -62,14 +62,14 @@ int flowEbosBlackoilTpfaMain(int argc, char** argv, bool outputCout, bool output
     // with incorrect locale settings.
     resetLocale();
 
-    FlowMain<Properties::TTag::EclFlowProblemTPFA>
+    FlowMain<Properties::TTag::FlowProblemTPFA>
         mainfunc {argc, argv, outputCout, outputFiles};
     return mainfunc.execute();
 }
 
 int flowEbosBlackoilTpfaMainStandalone(int argc, char** argv)
 {
-    using TypeTag = Properties::TTag::EclFlowProblemTPFA;
+    using TypeTag = Properties::TTag::FlowProblemTPFA;
     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.hpp b/flow/flow_ebos_blackoil.hpp
index 3bfb162db..9c9e3b441 100644
--- a/flow/flow_ebos_blackoil.hpp
+++ b/flow/flow_ebos_blackoil.hpp
@@ -21,7 +21,7 @@
 
 namespace Opm::Properties::TTag {
     struct FlowProblem;
-    struct EclFlowProblemTPFA {
+    struct FlowProblemTPFA {
         using InheritsFrom = std::tuple<FlowProblem>;
     };
 }
@@ -34,7 +34,7 @@ int flowEbosBlackoilTpfaMain(int argc, char** argv, bool outputCout, bool output
 template<class TypeTag> class FlowMain;
 
 //! \brief Initialization function used in flow binary and python simulator.
-std::unique_ptr<FlowMain<Properties::TTag::EclFlowProblemTPFA>>
+std::unique_ptr<FlowMain<Properties::TTag::FlowProblemTPFA>>
     flowEbosBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool outputFiles);
 
 //! \brief Main function used in flow_brine binary.
diff --git a/opm/simulators/flow/Main.hpp b/opm/simulators/flow/Main.hpp
index 742b497f4..ba951807e 100644
--- a/opm/simulators/flow/Main.hpp
+++ b/opm/simulators/flow/Main.hpp
@@ -170,7 +170,7 @@ public:
         return exitCode;
     }
 
-    using FlowMainType = FlowMain<Properties::TTag::EclFlowProblemTPFA>;
+    using FlowMainType = FlowMain<Properties::TTag::FlowProblemTPFA>;
     // To be called from the Python interface code. Only do the
     // initialization and then return a pointer to the FlowEbosMain
     // object that can later be accessed directly from the Python interface
diff --git a/opm/simulators/flow/python/PyBlackOilSimulator.hpp b/opm/simulators/flow/python/PyBlackOilSimulator.hpp
index 57639407c..2f9e793f3 100644
--- a/opm/simulators/flow/python/PyBlackOilSimulator.hpp
+++ b/opm/simulators/flow/python/PyBlackOilSimulator.hpp
@@ -33,7 +33,7 @@ namespace Opm::Pybind {
 class PyBlackOilSimulator
 {
 private:
-    using TypeTag = Opm::Properties::TTag::EclFlowProblemTPFA;
+    using TypeTag = Opm::Properties::TTag::FlowProblemTPFA;
     using Simulator = Opm::GetPropType<TypeTag, Opm::Properties::Simulator>;
 
 public:
diff --git a/python/simulators/PyBlackOilSimulator.cpp b/python/simulators/PyBlackOilSimulator.cpp
index 2389546e9..5b04bf3dd 100644
--- a/python/simulators/PyBlackOilSimulator.cpp
+++ b/python/simulators/PyBlackOilSimulator.cpp
@@ -101,7 +101,7 @@ py::array_t<double> PyBlackOilSimulator::getPorosity()
 int PyBlackOilSimulator::run()
 {
     auto main_object = Opm::Main( this->deck_filename_ );
-    return main_object.runStatic<Opm::Properties::TTag::EclFlowProblemTPFA>();
+    return main_object.runStatic<Opm::Properties::TTag::FlowProblemTPFA>();
 }
 
 void PyBlackOilSimulator::setPorosity( py::array_t<double,