diff --git a/examples/opm_init_check.cpp b/examples/opm_init_check.cpp
index 106bcc1c6..f2563c727 100644
--- a/examples/opm_init_check.cpp
+++ b/examples/opm_init_check.cpp
@@ -209,7 +209,7 @@ public:
 
 void initOPMTrans(TransGraph& opmTrans, DeckConstPtr deck, std::shared_ptr<const EclipseState> eclipseState) {
     std::shared_ptr<GridManager> grid = std::make_shared<GridManager>( eclipseState->getEclipseGrid(),
-            eclipseState->getEclipseProperties().getDoubleGridProperty( "PORV" ).getData() );
+            eclipseState->get3DProperties().getDoubleGridProperty( "PORV" ).getData() );
     const struct UnstructuredGrid * cGrid = grid->c_grid();
     std::shared_ptr<BlackoilPropsAdInterface> props;
 
diff --git a/examples/sim_poly_fi2p_comp_ad.cpp b/examples/sim_poly_fi2p_comp_ad.cpp
index 8ae55f619..f68b6aa97 100644
--- a/examples/sim_poly_fi2p_comp_ad.cpp
+++ b/examples/sim_poly_fi2p_comp_ad.cpp
@@ -166,8 +166,8 @@ try
 
     // Grid init
 
-    if (eclipseState->getEclipseProperties().hasDeckDoubleGridProperty("PORV")) {
-        const auto& porv = eclipseState->getEclipseProperties().getDoubleGridProperty("PORV").getData();
+    if (eclipseState->get3DProperties().hasDeckDoubleGridProperty("PORV")) {
+        const auto& porv = eclipseState->get3DProperties().getDoubleGridProperty("PORV").getData();
         grid.reset(new GridManager(eclipseState->getEclipseGrid(), porv));
     } else {
         grid.reset(new GridManager(eclipseState->getEclipseGrid()));
diff --git a/opm/autodiff/FlowMain.hpp b/opm/autodiff/FlowMain.hpp
index b01b28d0a..bfaef1b7b 100644
--- a/opm/autodiff/FlowMain.hpp
+++ b/opm/autodiff/FlowMain.hpp
@@ -423,7 +423,7 @@ namespace Opm
         {
             // Create grid.
             const std::vector<double>& porv =
-                    eclipse_state_->getEclipseProperties().getDoubleGridProperty("PORV").getData();
+                    eclipse_state_->get3DProperties().getDoubleGridProperty("PORV").getData();
             grid_init_.reset(new GridInit<Grid>(deck_, eclipse_state_, porv));
             const Grid& grid = grid_init_->grid();
 
diff --git a/opm/autodiff/GeoProps.hpp b/opm/autodiff/GeoProps.hpp
index e4b8d65fc..202ccd32d 100644
--- a/opm/autodiff/GeoProps.hpp
+++ b/opm/autodiff/GeoProps.hpp
@@ -95,7 +95,7 @@ namespace Opm
 
             // get the pore volume multipliers from the EclipseState
             std::vector<double> multpv(numCartesianCells, 1.0);
-            const auto& eclProps = eclState->getEclipseProperties();
+            const auto& eclProps = eclState->get3DProperties();
             if (eclProps.hasDeckDoubleGridProperty("MULTPV")) {
                 multpv = eclProps.getDoubleGridProperty("MULTPV").getData();
             }
@@ -278,7 +278,7 @@ namespace Opm
         const int* global_cell = Opm::UgGridHelpers::globalCell(grid);
         const int* cartdims = Opm::UgGridHelpers::cartDims(grid);
         EclipseGridConstPtr eclgrid = eclState->getEclipseGrid();
-        const auto& porv = eclState->getEclipseProperties().getDoubleGridProperty("PORV").getData();
+        const auto& porv = eclState->get3DProperties().getDoubleGridProperty("PORV").getData();
         for (int cellIdx = 0; cellIdx < numCells; ++cellIdx) {
             const int nx = cartdims[0];
             const int ny = cartdims[1];
diff --git a/opm/autodiff/SolventPropsAdFromDeck.cpp b/opm/autodiff/SolventPropsAdFromDeck.cpp
index d0e77c902..c9304e8a6 100644
--- a/opm/autodiff/SolventPropsAdFromDeck.cpp
+++ b/opm/autodiff/SolventPropsAdFromDeck.cpp
@@ -277,7 +277,7 @@ SolventPropsAdFromDeck::SolventPropsAdFromDeck(DeckConstPtr deck,
             }
 
             if (deck->hasKeyword("TLPMIXPA")) {
-                const TableContainer& tlpmixparTables = tables->getTlpmixpaTables();
+                const TableContainer& tlpmixparTables = tables.getTlpmixpaTables();
                 if (!tlpmixparTables.empty()) {
 
                     int numRegions = tlpmixparTables.size();
@@ -497,7 +497,7 @@ void SolventPropsAdFromDeck::extractTableIndex(const std::string& keyword,
                                                const int* compressedToCartesianCellIdx,
                                                std::vector<int>& tableIdx) const {
     //Get the Region data
-    const auto& regionData = eclState->getEclipseProperties().getIntGridProperty(keyword).getData();
+    const auto& regionData = eclState->get3DProperties().getIntGridProperty(keyword).getData();
     // Convert this into an array of compressed cells
     // Eclipse uses Fortran-style indices which start at 1
     // instead of 0, we subtract 1.