diff --git a/opm/autodiff/BlackoilModelBase.hpp b/opm/autodiff/BlackoilModelBase.hpp
index 76259d327..5fa46ff25 100644
--- a/opm/autodiff/BlackoilModelBase.hpp
+++ b/opm/autodiff/BlackoilModelBase.hpp
@@ -133,9 +133,9 @@ namespace Opm {
             SimulatorData(int num_phases);
 
             enum FipId {
-                FIP_AQUA = Opm::Phases::Water,
-                FIP_LIQUID = Opm::Phases::Oil,
-                FIP_VAPOUR = Opm::Phases::Gas,
+                FIP_AQUA = Opm::Water,
+                FIP_LIQUID = Opm::Oil,
+                FIP_VAPOUR = Opm::Gas,
                 FIP_DISSOLVED_GAS = 3,
                 FIP_VAPORIZED_OIL = 4,
                 FIP_PV = 5,                    //< Pore volume
diff --git a/opm/autodiff/BlackoilModelEnums.hpp b/opm/autodiff/BlackoilModelEnums.hpp
index 65ad4f62c..97bc359ed 100644
--- a/opm/autodiff/BlackoilModelEnums.hpp
+++ b/opm/autodiff/BlackoilModelEnums.hpp
@@ -26,12 +26,10 @@
 namespace Opm
 {
 
-    enum Phases {
-        Water        = BlackoilPropsAdInterface::Water,
-        Oil          = BlackoilPropsAdInterface::Oil  ,
-        Gas          = BlackoilPropsAdInterface::Gas  ,
-        MaxNumPhases = BlackoilPropsAdInterface::MaxNumPhases
-    };
+    constexpr const auto Water        = BlackoilPropsAdInterface::Water;
+    constexpr const auto Oil          = BlackoilPropsAdInterface::Oil;
+    constexpr const auto Gas          = BlackoilPropsAdInterface::Gas;
+    constexpr const auto MaxNumPhases = BlackoilPropsAdInterface::MaxNumPhases;
 
     enum PrimalVariables {
         Sg = 0,