diff --git a/opm/parser/eclipse/Units/ConversionFactors.hpp b/opm/parser/eclipse/Units/ConversionFactors.hpp
index 41f244685..8de6451c7 100644
--- a/opm/parser/eclipse/Units/ConversionFactors.hpp
+++ b/opm/parser/eclipse/Units/ConversionFactors.hpp
@@ -52,7 +52,8 @@ namespace Opm {
         const double Mass              = 1.0;
         const double Permeability      = 9.869233e-16;
         const double DissolvedGasRatio = 1.0;
-        const double FlowVolume        = 1.0;
+        const double LiquidVolume      = 1.0;
+        const double GasVolume         = 1.0;
         const double Density           = 1.0;
         const double Viscosity         = 0.001;                // cP -> Pa s
         const double Timestep          = 24*60*60;             // days -> s
@@ -66,7 +67,8 @@ namespace Opm {
          const double Mass              = 0.45359237;
          const double Permeability      = 9.869233e-16;
          const double DissolvedGasRatio = 178.1076;            // Mscf / stb -> m^3/m^3
-         const double FlowVolume        = 0.158987294;         // STB -> m^3
+         const double LiquidVolume      = 0.158987294;         // STB -> m^3
+         const double GasVolume         = 28.316847;           // MCFT -> m^3
          const double Density           = 16.01846;            // lb/ft^3 -> kg / m^3
          const double Viscosity         = 0.001;               // cP -> Pa s
          const double Timestep          = 24*60*60;            // days -> s
diff --git a/opm/parser/eclipse/Units/UnitSystem.cpp b/opm/parser/eclipse/Units/UnitSystem.cpp
index 477e05674..a387a005a 100644
--- a/opm/parser/eclipse/Units/UnitSystem.cpp
+++ b/opm/parser/eclipse/Units/UnitSystem.cpp
@@ -142,7 +142,8 @@ namespace Opm {
         system->addDimension("m"         , Metric::Mass );
         system->addDimension("K"         , Metric::Permeability );
         system->addDimension("Rs"        , Metric::DissolvedGasRatio);
-        system->addDimension("FlowVolume", Metric::FlowVolume );
+        system->addDimension("LiquidVolume", Metric::LiquidVolume );
+        system->addDimension("GasVolume", Metric::GasVolume );
         system->addDimension("Rho"       , Metric::Density );
         system->addDimension("mu"        , Metric::Viscosity);
         system->addDimension("Timestep"  , Metric::Timestep);
@@ -161,7 +162,8 @@ namespace Opm {
         system->addDimension("m"    , Field::Mass);
         system->addDimension("K"    , Field::Permeability );
         system->addDimension("Rs"   , Field::DissolvedGasRatio );
-        system->addDimension("FlowVolume"    , Field::FlowVolume );
+        system->addDimension("LiquidVolume", Field::LiquidVolume );
+        system->addDimension("GasVolume", Field::GasVolume );
         system->addDimension("Rho"  , Field::Density );
         system->addDimension("mu"   , Field::Viscosity);
         system->addDimension("Timestep", Field::Timestep);
diff --git a/opm/parser/share/keywords/C/COMPDAT b/opm/parser/share/keywords/C/COMPDAT
index 8d70afe24..7941aad3b 100644
--- a/opm/parser/share/keywords/C/COMPDAT
+++ b/opm/parser/share/keywords/C/COMPDAT
@@ -6,7 +6,7 @@
     {"name" : "K2" , "value_type" : "INT" },
     {"name" : "STATE" , "value_type" : "STRING" , "default" : "OPEN"},
     {"name" : "SAT_TABLE" , "value_type" : "INT" , "default" : 0},
-    {"name" : "CF"     , "value_type" : "FLOAT", "dimension" : "mu*FlowVolume/t*P"},
+    {"name" : "CF"     , "value_type" : "FLOAT", "dimension" : "mu*LiquidVolume/t*P"},
     {"name" : "DIAMETER" , "value_type" : "FLOAT", "dimension" : "L"},
     {"name" : "Kh" , "value_type" : "FLOAT", "dimension" : "K" , "default" : -1},
     {"name" : "SKIN" , "value_type" : "FLOAT", "dimension" : "1" , "default" : 0},
diff --git a/opm/parser/share/keywords/G/GCONINJE b/opm/parser/share/keywords/G/GCONINJE
index e59818ae9..f49e35075 100644
--- a/opm/parser/share/keywords/G/GCONINJE
+++ b/opm/parser/share/keywords/G/GCONINJE
@@ -2,8 +2,8 @@
     {"name" : "GROUP"    , "value_type" : "STRING" },
     {"name" : "PHASE"  , "value_type" : "STRING"},
     {"name" : "CONTROL_MODE" , "value_type" : "STRING" , "default" : "NONE"},
-    {"name" : "SURFACE_TARGET" , "value_type" : "FLOAT" , "default" : 0 , "dimension" : "FlowVolume/t"},
-    {"name" : "RESV_TARGET" , "value_type" : "FLOAT" , "default" : 0 , "dimension" : "FlowVolume/t"},
+    {"name" : "SURFACE_TARGET" , "value_type" : "FLOAT" , "default" : 0 , "dimension" : "GasVolume/t"},
+    {"name" : "RESV_TARGET" , "value_type" : "FLOAT" , "default" : 0 , "dimension" : "GasVolume/t"},
     {"name" : "REINJ_TARGET" , "value_type" : "FLOAT" , "default" : 0, "dimension":"1"},
     {"name" : "VOIDAGE_TARGET" , "value_type" : "FLOAT" , "default" : 0, "dimension":"1"},
     {"name" : "FREE" , "value_type" : "STRING" , "default" : "YES"},
@@ -11,5 +11,5 @@
     {"name" : "GUIDE_DEF" , "value_type" : "STRING"},
     {"name" : "REINJECT_GROUP" , "value_type" : "STRING"},
     {"name" : "VOIDAGE_GROUP" , "value_type" : "STRING"},
-    {"name" : "WETGAS_TARGET", "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"}
+    {"name" : "WETGAS_TARGET", "value_type" : "FLOAT" , "dimension" : "GasVolume/t"}
 ]}
diff --git a/opm/parser/share/keywords/G/GCONPROD b/opm/parser/share/keywords/G/GCONPROD
index a5871504b..c2264e92c 100644
--- a/opm/parser/share/keywords/G/GCONPROD
+++ b/opm/parser/share/keywords/G/GCONPROD
@@ -1,10 +1,10 @@
 {"name" : "GCONPROD" , "items" : [  
         {"name" : "GROUP" , "value_type" : "STRING" },
         {"name" : "CONTROL_MODE" , "value_type" : "STRING" , "default" : "NONE"},
-        {"name" : "OIL_TARGET" , "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"},
-        {"name" : "WATER_TARGET" , "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"},
-        {"name" : "GAS_TARGET" , "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"},       
-        {"name" : "LIQUID_TARGET" , "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"},
+        {"name" : "OIL_TARGET" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
+        {"name" : "WATER_TARGET" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
+        {"name" : "GAS_TARGET" , "value_type" : "FLOAT" , "dimension" : "GasVolume/t"},       
+        {"name" : "LIQUID_TARGET" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
         {"name" : "EXCEED_PROC" , "value_type" : "STRING" , "default" : "NONE"},
         {"name" : "RESPOND_TO_PARENT" , "value_type" : "STRING" , "default" : "YES"},   
         {"name" : "GUIDE_RATE" , "value_type" : "FLOAT"},
diff --git a/opm/parser/share/keywords/T/TVDP b/opm/parser/share/keywords/T/TVDP
index d192c7ba2..a0767d432 100644
--- a/opm/parser/share/keywords/T/TVDP
+++ b/opm/parser/share/keywords/T/TVDP
@@ -1,2 +1,2 @@
 {"name" : "TVDP*" , "size" : {"keyword":"EQLDIMS" , "item":"NTTRVD"}, "items" : 
-        [ {"name" : "table" , "value_type" : "FLOAT" , "size_type" : "ALL" , "dimension" : ["L" , "1/FlowVolume"]}]}
\ No newline at end of file
+        [ {"name" : "table" , "value_type" : "FLOAT" , "size_type" : "ALL" , "dimension" : ["L" , "1/LiquidVolume"]}]}
\ No newline at end of file
diff --git a/opm/parser/share/keywords/W/WCONHIST b/opm/parser/share/keywords/W/WCONHIST
index 25c616c89..272c20d6d 100644
--- a/opm/parser/share/keywords/W/WCONHIST
+++ b/opm/parser/share/keywords/W/WCONHIST
@@ -2,11 +2,11 @@
       [{"name" : "WELL"         , "value_type" : "STRING"}, 
        {"name" : "STATUS"       , "value_type" : "STRING" , "default" : "OPEN"}, 
        {"name" : "CMODE"        , "value_type" : "STRING"},
-       {"name" : "ORAT"         , "value_type" : "FLOAT",  "default" : 0.0, "dimension" : "FlowVolume/t"},
-       {"name" : "WRAT"         , "value_type" : "FLOAT" , "default" : 0.0, "dimension" : "FlowVolume/t"},
-       {"name" : "GRAT"         , "value_type" : "FLOAT" , "default" : 0.0, "dimension" : "FlowVolume/t"},
+       {"name" : "ORAT"         , "value_type" : "FLOAT",  "default" : 0.0, "dimension" : "LiquidVolume/t"},
+       {"name" : "WRAT"         , "value_type" : "FLOAT" , "default" : 0.0, "dimension" : "LiquidVolume/t"},
+       {"name" : "GRAT"         , "value_type" : "FLOAT" , "default" : 0.0, "dimension" : "GasVolume/t"},
        {"name" : "VFPTable"     , "value_type" : "INT"   , "default" : 0.0 , "comment":"The default is a state variable"},
        {"name" : "Lift"         , "value_type" : "FLOAT" , "default" : 0.0 , "comment":"The default is a state variable"},
        {"name" : "THP"          , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"},
        {"name" : "BHP"          , "value_type" : "FLOAT" , "default" : 0.0 ,"dimension" : "P"},
-       {"name" : "NGLRAT"       , "value_type" : "FLOAT" , "default" : 0.0 ,"dimension" : "FlowVolume/t"}]}
\ No newline at end of file
+       {"name" : "NGLRAT"       , "value_type" : "FLOAT" , "default" : 0.0 ,"dimension" : "LiquidVolume/t"}]}
diff --git a/opm/parser/share/keywords/W/WCONINJE b/opm/parser/share/keywords/W/WCONINJE
index 62cdbf6d3..5ed290079 100644
--- a/opm/parser/share/keywords/W/WCONINJE
+++ b/opm/parser/share/keywords/W/WCONINJE
@@ -3,8 +3,8 @@
     {"name" : "TYPE"         , "value_type" : "STRING" },
     {"name" : "STATUS"       , "value_type" : "STRING" , "default" : "OPEN"},
     {"name" : "CMODE"        , "value_type" : "STRING" },
-    {"name" : "RATE" , "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"},
-    {"name" : "RESV" , "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"},
+    {"name" : "RATE" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
+    {"name" : "RESV" , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
     {"name" : "BHP"  , "value_type" : "FLOAT" , "dimension" : "P" , "default" : 6891},
     {"name" : "THP"  , "value_type" : "FLOAT" , "dimension" : "P"},
     {"name" : "VFP_TABLE" , "value_type" : "INT" , "default" : 0},
diff --git a/opm/parser/share/keywords/W/WCONINJH b/opm/parser/share/keywords/W/WCONINJH
index c95abe2e9..e943d3a71 100644
--- a/opm/parser/share/keywords/W/WCONINJH
+++ b/opm/parser/share/keywords/W/WCONINJH
@@ -2,7 +2,7 @@
     {"name" : "WELL"         , "value_type" : "STRING" },
     {"name" : "TYPE"         , "value_type" : "STRING" },
     {"name" : "STATUS"       , "value_type" : "STRING" , "default" : "OPEN"},
-    {"name" : "RATE"         , "value_type" : "FLOAT" , "dimension" : "FlowVolume/t"},
+    {"name" : "RATE"         , "value_type" : "FLOAT" , "dimension" : "LiquidVolume/t"},
     {"name" : "BHP"          , "value_type" : "FLOAT" , "dimension" : "P"},
     {"name" : "THP"          , "value_type" : "FLOAT" , "dimension" : "P"},
     {"name" : "VFP_TABLE" , "value_type" : "INT" , "default" : 0},
diff --git a/opm/parser/share/keywords/W/WCONPROD b/opm/parser/share/keywords/W/WCONPROD
index 8c284eadd..56f36be14 100644
--- a/opm/parser/share/keywords/W/WCONPROD
+++ b/opm/parser/share/keywords/W/WCONPROD
@@ -2,11 +2,11 @@
       [{"name" : "WELL"         , "value_type" : "STRING"}, 
        {"name" : "STATUS"       , "value_type" : "STRING" , "default" : "OPEN"}, 
        {"name" : "CMODE"        , "value_type" : "STRING"},
-       {"name" : "ORAT"         , "value_type" : "FLOAT",  "default" : 0.0 , "dimension" : "FlowVolume/t"},
-       {"name" : "WRAT"         , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "FlowVolume/t"},
-       {"name" : "GRAT"         , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "FlowVolume/t"},
-       {"name" : "LRAT"         , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "FlowVolume/t"},
-       {"name" : "RESV"         , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "FlowVolume/t"},
+       {"name" : "ORAT"         , "value_type" : "FLOAT",  "default" : 0.0 , "dimension" : "LiquidVolume/t"},
+       {"name" : "WRAT"         , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "LiquidVolume/t"},
+       {"name" : "GRAT"         , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "GasVolume/t"},
+       {"name" : "LRAT"         , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "LiquidVolume/t"},
+       {"name" : "RESV"         , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "LiquidVolume/t"},
        {"name" : "BHP"          , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"},
        {"name" : "THP"          , "value_type" : "FLOAT" , "default" : 0.0 , "dimension" : "P"},
        {"name" : "VFPTable"     , "value_type" : "INT"   , "default" : 0.0 , "comment":"The default is a state variable"},