diff --git a/ebos/ebos_altidx.cc b/ebos/ebos_altidx.cc
index 54aa92001..c38f0fb05 100644
--- a/ebos/ebos_altidx.cc
+++ b/ebos/ebos_altidx.cc
@@ -68,6 +68,6 @@ public:
 
 int main(int argc, char **argv)
 {
-    typedef TTAG(EbosAltIdxTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::EbosAltIdxTypeTag;
     return Opm::startEbos<ProblemTypeTag>(argc, argv);
 }
diff --git a/ebos/ebos_blackoil.cc b/ebos/ebos_blackoil.cc
index dc4d81c97..a657c47aa 100644
--- a/ebos/ebos_blackoil.cc
+++ b/ebos/ebos_blackoil.cc
@@ -34,7 +34,7 @@ namespace Opm {
 
 bool ebosBlackOilDeckFileNameIsSet(int argc, char** argv)
 {
-    typedef TTAG(EbosTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosTypeTag;
 
     // use the ewoms parameter machinery and the blackoil vanguard to handle the grunt of
     // the work
@@ -52,7 +52,7 @@ bool ebosBlackOilDeckFileNameIsSet(int argc, char** argv)
 
 std::string ebosBlackOilGetDeckFileName(int argc, char** argv)
 {
-    typedef TTAG(EbosTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosTypeTag;
     typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
 
     // use the ewoms parameter machinery and the blackoil vanguard to handle the grunt of
@@ -72,7 +72,7 @@ std::string ebosBlackOilGetDeckFileName(int argc, char** argv)
 
 std::unique_ptr<Opm::ParseContext> ebosBlackOilCreateParseContext(int argc, char** argv)
 {
-    typedef TTAG(EbosTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosTypeTag;
     typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
 
     // use the ewoms parameter machinery and the blackoil vanguard to handle the grunt of
@@ -94,7 +94,7 @@ void ebosBlackOilSetDeck(Opm::Deck* deck,
                          Opm::ErrorGuard* errorGuard,
                          double externalSetupTime)
 {
-    typedef TTAG(EbosTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosTypeTag;
     typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
@@ -105,7 +105,7 @@ void ebosBlackOilSetDeck(Opm::Deck* deck,
 
 int ebosBlackOilMain(int argc, char **argv)
 {
-    typedef TTAG(EbosTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosTypeTag;
     return Opm::startEbos<ProblemTypeTag>(argc, argv);
 }
 
diff --git a/ebos/ebos_brine.cc b/ebos/ebos_brine.cc
index 2a6177726..3865da0e8 100644
--- a/ebos/ebos_brine.cc
+++ b/ebos/ebos_brine.cc
@@ -46,7 +46,7 @@ void ebosBrineSetDeck(Opm::Deck* deck,
                      Opm::ErrorGuard* errorGuard,
                      double externalSetupTime)
 {
-    typedef TTAG(EbosBrineTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosBrineTypeTag;
     typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
@@ -57,7 +57,7 @@ void ebosBrineSetDeck(Opm::Deck* deck,
 
 int ebosBrineMain(int argc, char **argv)
 {
-    typedef TTAG(EbosBrineTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosBrineTypeTag;
     return Opm::startEbos<ProblemTypeTag>(argc, argv);
 }
 
diff --git a/ebos/ebos_foam.cc b/ebos/ebos_foam.cc
index c19192113..e1367e8a7 100644
--- a/ebos/ebos_foam.cc
+++ b/ebos/ebos_foam.cc
@@ -46,7 +46,7 @@ void ebosFoamSetDeck(Opm::Deck* deck,
                      Opm::ErrorGuard* errorGuard,
                      double externalSetupTime)
 {
-    typedef TTAG(EbosFoamTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosFoamTypeTag;
     typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
@@ -57,7 +57,7 @@ void ebosFoamSetDeck(Opm::Deck* deck,
 
 int ebosFoamMain(int argc, char **argv)
 {
-    typedef TTAG(EbosFoamTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosFoamTypeTag;
     return Opm::startEbos<ProblemTypeTag>(argc, argv);
 }
 
diff --git a/ebos/ebos_gasoil.cc b/ebos/ebos_gasoil.cc
index 9e5423e76..cc5cc6692 100644
--- a/ebos/ebos_gasoil.cc
+++ b/ebos/ebos_gasoil.cc
@@ -41,7 +41,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.
-    typedef typename GET_PROP_TYPE(TTAG(EbosTypeTag), FluidSystem) FluidSystem;
+    typedef typename GET_PROP_TYPE(TTag::EbosTypeTag, FluidSystem) FluidSystem;
 
 public:
     typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@@ -62,7 +62,7 @@ void ebosGasOilSetDeck(Opm::Deck* deck,
                        Opm::ErrorGuard* errorGuard,
                        double externalSetupTime)
 {
-    typedef TTAG(EbosGasOilTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosGasOilTypeTag;
     typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
@@ -73,7 +73,7 @@ void ebosGasOilSetDeck(Opm::Deck* deck,
 
 int ebosGasOilMain(int argc, char **argv)
 {
-    typedef TTAG(EbosGasOilTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosGasOilTypeTag;
     return Opm::startEbos<ProblemTypeTag>(argc, argv);
 }
 
diff --git a/ebos/ebos_oilwater.cc b/ebos/ebos_oilwater.cc
index 18df22cb2..7a01a3555 100644
--- a/ebos/ebos_oilwater.cc
+++ b/ebos/ebos_oilwater.cc
@@ -41,7 +41,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.
-    typedef typename GET_PROP_TYPE(TTAG(EbosTypeTag), FluidSystem) FluidSystem;
+    typedef typename GET_PROP_TYPE(TTag::EbosTypeTag, FluidSystem) FluidSystem;
 
 public:
     typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@@ -62,7 +62,7 @@ void ebosOilWaterSetDeck(Opm::Deck* deck,
                          Opm::ErrorGuard* errorGuard,
                          double externalSetupTime)
 {
-    typedef TTAG(EbosOilWaterTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosOilWaterTypeTag;
     typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
@@ -73,7 +73,7 @@ void ebosOilWaterSetDeck(Opm::Deck* deck,
 
 int ebosOilWaterMain(int argc, char **argv)
 {
-    typedef TTAG(EbosOilWaterTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosOilWaterTypeTag;
     return Opm::startEbos<ProblemTypeTag>(argc, argv);
 }
 
diff --git a/ebos/ebos_oilwaterpolymer.cc b/ebos/ebos_oilwaterpolymer.cc
index 2e71e5ae2..4b0265fb2 100644
--- a/ebos/ebos_oilwaterpolymer.cc
+++ b/ebos/ebos_oilwaterpolymer.cc
@@ -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.
-    typedef typename GET_PROP_TYPE(TTAG(EbosTypeTag), FluidSystem) FluidSystem;
+    typedef typename GET_PROP_TYPE(TTag::EbosTypeTag, FluidSystem) FluidSystem;
 
 public:
     typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@@ -64,7 +64,7 @@ void ebosOilWaterPolymerSetDeck(Opm::Deck* deck,
                                 Opm::ErrorGuard* errorGuard,
                                 double externalSetupTime)
 {
-    typedef TTAG(EbosOilWaterPolymerTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosOilWaterPolymerTypeTag;
     typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
@@ -75,7 +75,7 @@ void ebosOilWaterPolymerSetDeck(Opm::Deck* deck,
 
 int ebosOilWaterPolymerMain(int argc, char **argv)
 {
-    typedef TTAG(EbosOilWaterPolymerTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosOilWaterPolymerTypeTag;
     return Opm::startEbos<ProblemTypeTag>(argc, argv);
 }
 
diff --git a/ebos/ebos_plain.cc b/ebos/ebos_plain.cc
index ab16342d8..815afd2b3 100644
--- a/ebos/ebos_plain.cc
+++ b/ebos/ebos_plain.cc
@@ -39,6 +39,6 @@ NEW_TYPE_TAG(EbosPlainTypeTag, INHERITS_FROM(BlackOilModel, EclBaseProblem));
 
 int main(int argc, char **argv)
 {
-    typedef TTAG(EbosPlainTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::EbosPlainTypeTag;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }
diff --git a/ebos/ebos_polymer.cc b/ebos/ebos_polymer.cc
index e447c704b..f58691b02 100644
--- a/ebos/ebos_polymer.cc
+++ b/ebos/ebos_polymer.cc
@@ -46,7 +46,7 @@ void ebosPolymerSetDeck(Opm::Deck* deck,
                         Opm::ErrorGuard* errorGuard,
                         double externalSetupTime)
 {
-    typedef TTAG(EbosPolymerTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosPolymerTypeTag;
     typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
@@ -57,7 +57,7 @@ void ebosPolymerSetDeck(Opm::Deck* deck,
 
 int ebosPolymerMain(int argc, char **argv)
 {
-    typedef TTAG(EbosPolymerTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosPolymerTypeTag;
     return Opm::startEbos<ProblemTypeTag>(argc, argv);
 }
 
diff --git a/ebos/ebos_solvent.cc b/ebos/ebos_solvent.cc
index 77557a036..7e44d504c 100644
--- a/ebos/ebos_solvent.cc
+++ b/ebos/ebos_solvent.cc
@@ -46,7 +46,7 @@ void ebosSolventSetDeck(Opm::Deck* deck,
                         Opm::ErrorGuard* errorGuard,
                         double externalSetupTime)
 {
-    typedef TTAG(EbosSolventTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosSolventTypeTag;
     typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
@@ -57,7 +57,7 @@ void ebosSolventSetDeck(Opm::Deck* deck,
 
 int ebosSolventMain(int argc, char **argv)
 {
-    typedef TTAG(EbosSolventTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosSolventTypeTag;
     return Opm::startEbos<ProblemTypeTag>(argc, argv);
 }
 
diff --git a/ebos/ebos_thermal.cc b/ebos/ebos_thermal.cc
index f936a9dd7..9b2ca0158 100644
--- a/ebos/ebos_thermal.cc
+++ b/ebos/ebos_thermal.cc
@@ -46,7 +46,7 @@ void ebosThermalSetDeck(Opm::Deck* deck,
                         Opm::ErrorGuard* errorGuard,
                         double externalSetupTime)
 {
-    typedef TTAG(EbosThermalTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosThermalTypeTag;
     typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
@@ -57,7 +57,7 @@ void ebosThermalSetDeck(Opm::Deck* deck,
 
 int ebosThermalMain(int argc, char **argv)
 {
-    typedef TTAG(EbosThermalTypeTag) ProblemTypeTag;
+    using ProblemTypeTag = Properties::TTag::EbosThermalTypeTag;
     return Opm::startEbos<ProblemTypeTag>(argc, argv);
 }
 
diff --git a/flow/flow_blackoil_dunecpr.cpp b/flow/flow_blackoil_dunecpr.cpp
index 7940a3aeb..231e3349a 100644
--- a/flow/flow_blackoil_dunecpr.cpp
+++ b/flow/flow_blackoil_dunecpr.cpp
@@ -70,7 +70,7 @@ namespace Opm {
 
 int main(int argc, char** argv)
 {
-    using TypeTag = TTAG(EclFlowProblemSimple);
+    using TypeTag = Opm::Properties::TTag::EclFlowProblemSimple;
     auto mainObject = Opm::Main(argc, argv);
     return mainObject.runStatic<TypeTag>();
 }
diff --git a/flow/flow_ebos_blackoil.cpp b/flow/flow_ebos_blackoil.cpp
index c12b18eb3..63f9d97d2 100644
--- a/flow/flow_ebos_blackoil.cpp
+++ b/flow/flow_ebos_blackoil.cpp
@@ -36,7 +36,7 @@ namespace Opm {
 
 void flowEbosBlackoilSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
-    typedef TTAG(EclFlowProblem) TypeTag;
+    using TypeTag = Properties::TTag::EclFlowProblem;
     typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(setupTime);
@@ -46,7 +46,7 @@ void flowEbosBlackoilSetDeck(double setupTime, Deck *deck, EclipseState& eclStat
     Vanguard::setExternalSummaryConfig(&summaryConfig);
 }
 
-std::unique_ptr<Opm::FlowMainEbos<TTAG(EclFlowProblem)>>
+std::unique_ptr<Opm::FlowMainEbos<Properties::TTag::EclFlowProblem>>
 flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles)
 {
     // we always want to use the default locale, and thus spare us the trouble
@@ -59,7 +59,7 @@ flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFile
     Dune::MPIHelper::instance(argc, argv);
 #endif
 
-    return std::make_unique<Opm::FlowMainEbos<TTAG(EclFlowProblem)>>(
+    return std::make_unique<Opm::FlowMainEbos<Properties::TTag::EclFlowProblem>>(
         argc, argv, outputCout, outputFiles);
 }
 
diff --git a/flow/flow_ebos_blackoil.hpp b/flow/flow_ebos_blackoil.hpp
index 3ca378919..16bc33794 100644
--- a/flow/flow_ebos_blackoil.hpp
+++ b/flow/flow_ebos_blackoil.hpp
@@ -28,7 +28,7 @@ void flowEbosBlackoilSetDeck(double setupTime, Deck *deck, EclipseState& eclStat
 
 int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles);
 
-std::unique_ptr<Opm::FlowMainEbos<TTAG(EclFlowProblem)>>
+std::unique_ptr<Opm::FlowMainEbos<Properties::TTag::EclFlowProblem>>
     flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles);
 }
 
diff --git a/flow/flow_ebos_brine.cpp b/flow/flow_ebos_brine.cpp
index 5c6c0d13c..59422e2fd 100644
--- a/flow/flow_ebos_brine.cpp
+++ b/flow/flow_ebos_brine.cpp
@@ -38,7 +38,7 @@ SET_BOOL_PROP(EclFlowBrineProblem, EnableBrine, true);
 namespace Opm {
 void flowEbosBrineSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
-    typedef TTAG(EclFlowBrineProblem) TypeTag;
+    using TypeTag = Properties::TTag::EclFlowBrineProblem;
     typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(setupTime);
@@ -63,7 +63,7 @@ int flowEbosBrineMain(int argc, char** argv, bool outputCout, bool outputFiles)
     Dune::MPIHelper::instance(argc, argv).rank();
 #endif
 
-    Opm::FlowMainEbos<TTAG(EclFlowBrineProblem)>
+    Opm::FlowMainEbos<Properties::TTag::EclFlowBrineProblem>
         mainfunc {argc, argv, outputCout, outputFiles};
     return mainfunc.execute();
 }
diff --git a/flow/flow_ebos_energy.cpp b/flow/flow_ebos_energy.cpp
index 5d82791ee..82f2147fb 100644
--- a/flow/flow_ebos_energy.cpp
+++ b/flow/flow_ebos_energy.cpp
@@ -38,7 +38,7 @@ SET_BOOL_PROP(EclFlowEnergyProblem, EnableEnergy, true);
 namespace Opm {
 void flowEbosEnergySetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
-    typedef TTAG(EclFlowEnergyProblem) TypeTag;
+    using TypeTag = Properties::TTag::EclFlowEnergyProblem;
     typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(setupTime);
@@ -62,7 +62,7 @@ int flowEbosEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles)
     Dune::MPIHelper::instance(argc, argv).rank();
 #endif
 
-    Opm::FlowMainEbos<TTAG(EclFlowEnergyProblem)>
+    Opm::FlowMainEbos<Properties::TTag::EclFlowEnergyProblem>
         mainfunc {argc, argv, outputCout, outputFiles};
     return mainfunc.execute();
 }
diff --git a/flow/flow_ebos_foam.cpp b/flow/flow_ebos_foam.cpp
index be9a4da60..d22e70fb6 100644
--- a/flow/flow_ebos_foam.cpp
+++ b/flow/flow_ebos_foam.cpp
@@ -38,7 +38,7 @@ SET_BOOL_PROP(EclFlowFoamProblem, EnableFoam, true);
 namespace Opm {
 void flowEbosFoamSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
-    typedef TTAG(EclFlowFoamProblem) TypeTag;
+    using TypeTag = Properties::TTag::EclFlowFoamProblem;
     typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(setupTime);
@@ -63,7 +63,7 @@ int flowEbosFoamMain(int argc, char** argv, bool outputCout, bool outputFiles)
     Dune::MPIHelper::instance(argc, argv).rank();
 #endif
 
-    Opm::FlowMainEbos<TTAG(EclFlowFoamProblem)>
+    Opm::FlowMainEbos<Properties::TTag::EclFlowFoamProblem>
         mainfunc {argc, argv, outputCout, outputFiles};
     return mainfunc.execute();
 }
diff --git a/flow/flow_ebos_gasoil.cpp b/flow/flow_ebos_gasoil.cpp
index c17395239..8e6f09315 100644
--- a/flow/flow_ebos_gasoil.cpp
+++ b/flow/flow_ebos_gasoil.cpp
@@ -45,7 +45,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.
-    typedef TTAG(EclFlowProblem) BaseTypeTag;
+    using BaseTypeTag = TTag::EclFlowProblem;
     typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
 
 public:
@@ -62,7 +62,7 @@ public:
 namespace Opm {
 void flowEbosGasOilSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
-    typedef TTAG(EclFlowGasOilProblem) TypeTag;
+    using TypeTag = Properties::TTag::EclFlowGasOilProblem;
     typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(setupTime);
@@ -86,7 +86,7 @@ int flowEbosGasOilMain(int argc, char** argv, bool outputCout, bool outputFiles)
     Dune::MPIHelper::instance(argc, argv);
 #endif
 
-    Opm::FlowMainEbos<TTAG(EclFlowGasOilProblem)>
+    Opm::FlowMainEbos<Properties::TTag::EclFlowGasOilProblem>
         mainfunc {argc, argv, outputCout, outputFiles} ;
     return mainfunc.execute();
 }
diff --git a/flow/flow_ebos_oilwater.cpp b/flow/flow_ebos_oilwater.cpp
index d1b9a6d6c..f3235a67b 100644
--- a/flow/flow_ebos_oilwater.cpp
+++ b/flow/flow_ebos_oilwater.cpp
@@ -45,7 +45,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.
-    typedef TTAG(EclFlowProblem) BaseTypeTag;
+    using BaseTypeTag = TTag::EclFlowProblem;
     typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
 
 public:
@@ -62,7 +62,7 @@ public:
 namespace Opm {
 void flowEbosOilWaterSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
-    typedef TTAG(EclFlowOilWaterProblem) TypeTag;
+    using TypeTag = Properties::TTag::EclFlowOilWaterProblem;
     typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(setupTime);
@@ -85,7 +85,7 @@ int flowEbosOilWaterMain(int argc, char** argv, bool outputCout, bool outputFile
     Dune::MPIHelper::instance(argc, argv);
 #endif
 
-    Opm::FlowMainEbos<TTAG(EclFlowOilWaterProblem)>
+    Opm::FlowMainEbos<Properties::TTag::EclFlowOilWaterProblem>
         mainfunc {argc, argv, outputCout, outputFiles};
     return mainfunc.execute();
 }
diff --git a/flow/flow_ebos_oilwater_brine.cpp b/flow/flow_ebos_oilwater_brine.cpp
index 33f8becbb..1b6bb5b23 100644
--- a/flow/flow_ebos_oilwater_brine.cpp
+++ b/flow/flow_ebos_oilwater_brine.cpp
@@ -45,7 +45,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.
-    typedef TTAG(EclFlowProblem) BaseTypeTag;
+    using BaseTypeTag = TTag::EclFlowProblem;
     typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
 
 public:
@@ -62,7 +62,7 @@ public:
 namespace Opm {
 void flowEbosOilWaterBrineSetDeck(double setupTime, Deck* deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
-    typedef TTAG(EclFlowOilWaterBrineProblem) TypeTag;
+    using TypeTag = Properties::TTag::EclFlowOilWaterBrineProblem;
     typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(setupTime);
@@ -85,7 +85,7 @@ int flowEbosOilWaterBrineMain(int argc, char** argv, bool outputCout, bool outpu
     Dune::MPIHelper::instance(argc, argv);
 #endif
 
-    Opm::FlowMainEbos<TTAG(EclFlowOilWaterBrineProblem)>
+    Opm::FlowMainEbos<Properties::TTag::EclFlowOilWaterBrineProblem>
         mainfunc {argc, argv, outputCout, outputFiles};
     return mainfunc.execute();
 }
diff --git a/flow/flow_ebos_oilwater_polymer.cpp b/flow/flow_ebos_oilwater_polymer.cpp
index 251385d16..4e82a8772 100644
--- a/flow/flow_ebos_oilwater_polymer.cpp
+++ b/flow/flow_ebos_oilwater_polymer.cpp
@@ -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.
-    typedef TTAG(EclFlowProblem) BaseTypeTag;
+    using BaseTypeTag = TTag::EclFlowProblem;
     typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
 
 public:
@@ -63,7 +63,7 @@ public:
 namespace Opm {
 void flowEbosOilWaterPolymerSetDeck(double setupTime, Deck* deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
-    typedef TTAG(EclFlowOilWaterPolymerProblem) TypeTag;
+    using TypeTag = Properties::TTag::EclFlowOilWaterPolymerProblem;
     typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(setupTime);
@@ -86,7 +86,7 @@ int flowEbosOilWaterPolymerMain(int argc, char** argv, bool outputCout, bool out
     Dune::MPIHelper::instance(argc, argv);
 #endif
 
-    Opm::FlowMainEbos<TTAG(EclFlowOilWaterPolymerProblem)>
+    Opm::FlowMainEbos<Properties::TTag::EclFlowOilWaterPolymerProblem>
         mainfunc {argc, argv, outputCout, outputFiles};
     return mainfunc.execute();
 }
diff --git a/flow/flow_ebos_oilwater_polymer_injectivity.cpp b/flow/flow_ebos_oilwater_polymer_injectivity.cpp
index dc2dadb71..8795790ed 100644
--- a/flow/flow_ebos_oilwater_polymer_injectivity.cpp
+++ b/flow/flow_ebos_oilwater_polymer_injectivity.cpp
@@ -48,7 +48,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.
-    typedef TTAG(EclFlowProblem) BaseTypeTag;
+    using BaseTypeTag = TTag::EclFlowProblem;
     typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
 
 public:
@@ -65,7 +65,7 @@ public:
 namespace Opm {
 /* void flowEbosOilWaterPolymerInjectivitySetDeck(Deck& deck, EclipseState& eclState)
 {
-    typedef TTAG(EclFlowOilWaterPolymerInjectivityProblem) TypeTag;
+    using TypeTag = Properties::TTag::EclFlowOilWaterPolymerInjectivityProblem;
     typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalDeck(&deck, &eclState);
@@ -84,7 +84,7 @@ int flowEbosOilWaterPolymerInjectivityMain(int argc, char** argv, bool outputCou
     Dune::MPIHelper::instance(argc, argv);
 #endif
 
-    Opm::FlowMainEbos<TTAG(EclFlowOilWaterPolymerInjectivityProblem)>
+    Opm::FlowMainEbos<Properties::TTag::EclFlowOilWaterPolymerInjectivityProblem>
         mainfunc {argc, argv, outputCout, outputFiles};
     return mainfunc.execute();
 }
diff --git a/flow/flow_ebos_polymer.cpp b/flow/flow_ebos_polymer.cpp
index 157e75b1a..54ac962a7 100644
--- a/flow/flow_ebos_polymer.cpp
+++ b/flow/flow_ebos_polymer.cpp
@@ -38,7 +38,7 @@ SET_BOOL_PROP(EclFlowPolymerProblem, EnablePolymer, true);
 namespace Opm {
 void flowEbosPolymerSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
-    typedef TTAG(EclFlowPolymerProblem) TypeTag;
+    using TypeTag = Properties::TTag::EclFlowPolymerProblem;
     typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(setupTime);
@@ -62,7 +62,7 @@ int flowEbosPolymerMain(int argc, char** argv, bool outputCout, bool outputFiles
     Dune::MPIHelper::instance(argc, argv).rank();
 #endif
 
-    Opm::FlowMainEbos<TTAG(EclFlowPolymerProblem)>
+    Opm::FlowMainEbos<Properties::TTag::EclFlowPolymerProblem>
         mainfunc {argc, argv, outputCout, outputFiles};
     return mainfunc.execute();
 }
diff --git a/flow/flow_ebos_solvent.cpp b/flow/flow_ebos_solvent.cpp
index 65c008fe1..582bced8f 100644
--- a/flow/flow_ebos_solvent.cpp
+++ b/flow/flow_ebos_solvent.cpp
@@ -38,7 +38,7 @@ SET_BOOL_PROP(EclFlowSolventProblem, EnableSolvent, true);
 namespace Opm {
 void flowEbosSolventSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
-    typedef TTAG(EclFlowSolventProblem) TypeTag;
+    using TypeTag = Properties::TTag::EclFlowSolventProblem;
     typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
 
     Vanguard::setExternalSetupTime(setupTime);
@@ -63,7 +63,7 @@ int flowEbosSolventMain(int argc, char** argv, bool outputCout, bool outputFiles
     Dune::MPIHelper::instance(argc, argv).rank();
 #endif
 
-    Opm::FlowMainEbos<TTAG(EclFlowSolventProblem)>
+    Opm::FlowMainEbos<Properties::TTag::EclFlowSolventProblem>
         mainfunc {argc, argv, outputCout, outputFiles};
     return mainfunc.execute();
 }
diff --git a/flow/flow_onephase.cpp b/flow/flow_onephase.cpp
index dd92d613a..49e11c191 100644
--- a/flow/flow_onephase.cpp
+++ b/flow/flow_onephase.cpp
@@ -33,7 +33,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.
-    typedef TTAG(EclFlowProblem) BaseTypeTag;
+    using BaseTypeTag = TTag::EclFlowProblem;
     typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
 
 public:
@@ -51,7 +51,7 @@ public:
 
 int main(int argc, char** argv)
 {
-    using TypeTag = TTAG(EclFlowProblemSimple);
+    using TypeTag = Opm::Properties::TTag::EclFlowProblemSimple;
     auto mainObject = Opm::Main(argc, argv);
     return mainObject.runStatic<TypeTag>();
 }
diff --git a/flow/flow_onephase_energy.cpp b/flow/flow_onephase_energy.cpp
index 772fd4cd7..e945d4784 100644
--- a/flow/flow_onephase_energy.cpp
+++ b/flow/flow_onephase_energy.cpp
@@ -33,7 +33,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.
-    typedef TTAG(EclFlowProblem) BaseTypeTag;
+    using BaseTypeTag = TTag::EclFlowProblem;
     typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
 
 public:
@@ -51,7 +51,7 @@ public:
 
 int main(int argc, char** argv)
 {
-    using TypeTag = TTAG(EclFlowProblemSimple);
+    using TypeTag = Opm::Properties::TTag::EclFlowProblemSimple;
     auto mainObject = Opm::Main(argc, argv);
     return mainObject.runStatic<TypeTag>();
 }
diff --git a/opm/simulators/flow/Main.hpp b/opm/simulators/flow/Main.hpp
index 93009318f..031428805 100644
--- a/opm/simulators/flow/Main.hpp
+++ b/opm/simulators/flow/Main.hpp
@@ -118,7 +118,7 @@ namespace Opm
     class Main
     {
     private:
-        using FlowMainEbosType = Opm::FlowMainEbos<TTAG(EclFlowProblem)>;
+        using FlowMainEbosType = Opm::FlowMainEbos<Opm::Properties::TTag::EclFlowProblem>;
 
         enum class FileOutputMode {
             //! \brief No output to files.
@@ -159,7 +159,7 @@ namespace Opm
         int runDynamic()
         {
             int exitCode = EXIT_SUCCESS;
-            if (initialize_<TTAG(FlowEarlyBird)>(exitCode)) {
+            if (initialize_<Properties::TTag::FlowEarlyBird>(exitCode)) {
                 return dispatchDynamic_();
             } else {
                 return exitCode;
@@ -184,7 +184,7 @@ namespace Opm
         std::unique_ptr<FlowMainEbosType> initFlowEbosBlackoil(int& exitCode)
         {
             exitCode = EXIT_SUCCESS;
-            if (initialize_<TTAG(FlowEarlyBird)>(exitCode)) {
+            if (initialize_<Properties::TTag::FlowEarlyBird>(exitCode)) {
                 // TODO: check that this deck really represents a blackoil
                 // case. E.g. check that number of phases == 3
                 Opm::flowEbosBlackoilSetDeck(
diff --git a/tests/test_ecl_output.cc b/tests/test_ecl_output.cc
index 5273d58db..91f94fee4 100644
--- a/tests/test_ecl_output.cc
+++ b/tests/test_ecl_output.cc
@@ -125,7 +125,7 @@ initSimulator(const char *filename)
 
 void test_summary()
 {
-    typedef typename TTAG(TestEclOutputTypeTag) TypeTag;
+    using TypeTag = Opm::Properties::TTag::TestEclOutputTypeTag;
     const std::string filename = "SUMMARY_DECK_NON_CONSTANT_POROSITY.DATA";
     const std::string casename = "SUMMARY_DECK_NON_CONSTANT_POROSITY";
 
@@ -270,7 +270,7 @@ int main(int argc, char** argv)
     Dune::MPIHelper::instance(argc, argv);
 #endif
 
-    typedef TTAG(TestEclOutputTypeTag) TypeTag;
+    using TypeTag = Opm::Properties::TTag::TestEclOutputTypeTag;
     Opm::registerAllParameters_<TypeTag>();
     test_summary();
     test_readWriteWells();
diff --git a/tests/test_equil.cc b/tests/test_equil.cc
index 42e36f1a4..e3d839486 100644
--- a/tests/test_equil.cc
+++ b/tests/test_equil.cc
@@ -179,7 +179,7 @@ void test_PhasePressure()
 {
     const auto record = mkEquilRecord( 0, 1e5, 5, 0, 0, 0 );
 
-    using TypeTag     = TTAG(TestEquilTypeTag);
+    using TypeTag     = Opm::Properties::TTag::TestEquilTypeTag;
     using FluidSystem = GET_PROP_TYPE(TypeTag, FluidSystem);
 
     using TabulatedFunction = Opm::Tabulated1DFunction<double>;
@@ -228,7 +228,7 @@ void test_CellSubset()
 {
     using PVal        = std::vector<double>;
     using PPress      = std::vector<PVal>;
-    using TypeTag     = TTAG(TestEquilTypeTag);
+    using TypeTag     = Opm::Properties::TTag::TestEquilTypeTag;
     using FluidSystem = GET_PROP_TYPE(TypeTag, FluidSystem);
 
     auto simulator = initSimulator<TypeTag>("equil_base.DATA");
@@ -339,7 +339,7 @@ void test_RegMapping()
 
     using PVal        = std::vector<double>;
     using PPress      = std::vector<PVal>;
-    using TypeTag     = TTAG(TestEquilTypeTag);
+    using TypeTag     = Opm::Properties::TTag::TestEquilTypeTag;
     using FluidSystem = GET_PROP_TYPE(TypeTag, FluidSystem);
 
     auto simulator = initSimulator<TypeTag>("equil_base.DATA");
@@ -439,7 +439,7 @@ void test_RegMapping()
 
 void test_DeckAllDead()
 {
-    typedef TTAG(TestEquilTypeTag) TypeTag;
+    using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
     auto simulator = initSimulator<TypeTag>("equil_deadfluids.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
@@ -465,7 +465,7 @@ void test_DeckAllDead()
 void test_CapillaryInversion()
 {
     // Test setup.
-    typedef typename TTAG(TestEquilTypeTag) TypeTag;
+    using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
     typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
     typedef typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager MaterialLawManager;
@@ -515,7 +515,7 @@ void test_CapillaryInversion()
 
 void test_DeckWithCapillary()
 {
-    typedef typename TTAG(TestEquilTypeTag) TypeTag;
+    using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
     auto simulator = initSimulator<TypeTag>("equil_capillary.DATA");
     auto& eclipseState = simulator->vanguard().eclState();
@@ -553,7 +553,7 @@ void test_DeckWithCapillary()
 
 void test_DeckWithCapillaryOverlap()
 {
-    typedef typename TTAG(TestEquilTypeTag) TypeTag;
+    using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
     auto simulator = initSimulator<TypeTag>("equil_capillary_overlap.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
@@ -611,7 +611,7 @@ void test_DeckWithCapillaryOverlap()
 
 void test_DeckWithLiveOil()
 {
-    typedef typename TTAG(TestEquilTypeTag) TypeTag;
+    using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
     auto simulator = initSimulator<TypeTag>("equil_liveoil.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
@@ -687,7 +687,7 @@ void test_DeckWithLiveOil()
 
 void test_DeckWithLiveGas()
 {
-    typedef typename TTAG(TestEquilTypeTag) TypeTag;
+    using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
     auto simulator = initSimulator<TypeTag>("equil_livegas.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
@@ -765,7 +765,7 @@ void test_DeckWithLiveGas()
 
 void test_DeckWithRSVDAndRVVD()
 {
-    typedef typename TTAG(TestEquilTypeTag) TypeTag;
+    using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
     auto simulator = initSimulator<TypeTag>("equil_rsvd_and_rvvd.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
@@ -863,7 +863,7 @@ void test_DeckWithRSVDAndRVVD()
 
 void test_DeckWithPBVDAndPDVD()
 {
-    typedef typename TTAG(TestEquilTypeTag) TypeTag;
+    using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
     auto simulator = initSimulator<TypeTag>("equil_pbvd_and_pdvd.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
@@ -954,7 +954,7 @@ void test_DeckWithPBVDAndPDVD()
 void test_DeckWithSwatinit()
 {
 #if 0
-    typedef typename TTAG(TestEquilTypeTag) TypeTag;
+    using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
     auto simulator = initSimulator<TypeTag>("equil_capillary_swatinit.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
@@ -1106,7 +1106,7 @@ try {
     Dune::MPIHelper::instance(argc, argv);
 #endif
 
-    typedef TTAG(TestEquilTypeTag) TypeTag;
+    using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
     Opm::registerAllParameters_<TypeTag>();
 
     test_PhasePressure();
diff --git a/tests/test_wellmodel.cpp b/tests/test_wellmodel.cpp
index 62bb981d4..85fac0329 100644
--- a/tests/test_wellmodel.cpp
+++ b/tests/test_wellmodel.cpp
@@ -57,7 +57,7 @@
 
 
 
-using StandardWell = Opm::StandardWell<TTAG(EclFlowProblem)>;
+using StandardWell = Opm::StandardWell<Opm::Properties::TTag::EclFlowProblem>;
 
 struct SetupTest {
 
@@ -100,7 +100,7 @@ struct GlobalFixture {
         Dune::MPIHelper::instance(argcDummy, argvDummy);
 #endif
 
-        Opm::FlowMainEbos<TTAG(EclFlowProblem)>::setupParameters_(argcDummy, argvDummy);
+        Opm::FlowMainEbos<Opm::Properties::TTag::EclFlowProblem>::setupParameters_(argcDummy, argvDummy);
     }
 };
 
@@ -111,7 +111,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::BlackoilModelParametersEbos<TTAG(EclFlowProblem) > param;
+    const Opm::BlackoilModelParametersEbos<Opm::Properties::TTag::EclFlowProblem> param;
 
     // For the conversion between the surface volume rate and resrevoir voidage rate
     typedef Opm::BlackOilFluidSystem<double> FluidSystem;
@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE(TestBehavoir) {
 
     {
         const int nw = wells_ecl.size();
-        const Opm::BlackoilModelParametersEbos<TTAG(EclFlowProblem)> param;
+        const Opm::BlackoilModelParametersEbos<Opm::Properties::TTag::EclFlowProblem> param;
 
         for (int w = 0; w < nw; ++w) {
             // For the conversion between the surface volume rate and resrevoir voidage rate