diff --git a/opm/simulators/aquifers/AquiferCarterTracy.hpp b/opm/simulators/aquifers/AquiferCarterTracy.hpp
index 5e2a56e49..c523f28e3 100644
--- a/opm/simulators/aquifers/AquiferCarterTracy.hpp
+++ b/opm/simulators/aquifers/AquiferCarterTracy.hpp
@@ -212,10 +212,10 @@ protected:
 
         int pvttableIdx = aquct_data_.pvttableID - 1;
         Base::rhow_.resize(Base::cell_idx_.size(), 0.);
-        if (!aquct_data_.p0) {
+        if (!aquct_data_.p0.first) {
             Base::pa0_ = calculateReservoirEquilibrium();
         } else {
-            Base::pa0_ = *(aquct_data_.p0);
+            Base::pa0_ = aquct_data_.p0.second;
         }
 
         // use the thermodynamic state of the first active cell as a
diff --git a/opm/simulators/aquifers/AquiferFetkovich.hpp b/opm/simulators/aquifers/AquiferFetkovich.hpp
index af09ec6ec..fd5383975 100644
--- a/opm/simulators/aquifers/AquiferFetkovich.hpp
+++ b/opm/simulators/aquifers/AquiferFetkovich.hpp
@@ -207,10 +207,10 @@ protected:
             return;
         }
 
-        if (!aqufetp_data_.p0) {
+        if (!aqufetp_data_.p0.first) {
             Base::pa0_ = calculateReservoirEquilibrium();
         } else {
-            Base::pa0_ = *(aqufetp_data_.p0);
+            Base::pa0_ = aqufetp_data_.p0.second;
         }
         aquifer_pressure_ = Base::pa0_;
     }
diff --git a/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp
index 80594b909..58a82199f 100644
--- a/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp
+++ b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp
@@ -155,10 +155,10 @@ BlackoilAquiferModel<TypeTag>::init()
         const auto& eclState = this->simulator_.vanguard().eclState();
 
         // Get all the carter tracy aquifer properties data and put it in aquifers vector
-        const AquiferCT aquiferct = AquiferCT(eclState, deck);
+        const AquiferCT aquiferct = AquiferCT(eclState.getTableManager(), deck);
         const Aquancon aquifer_connect = Aquancon(eclState.getInputGrid(), deck);
 
-        std::vector<AquiferCT::AQUCT_data> aquifersData = aquiferct.getAquifers();
+        std::vector<AquiferCT::AQUCT_data> aquifersData = aquiferct.data();
         std::vector<Aquancon::AquanconOutput> aquifer_connection = aquifer_connect.getAquOutput();
 
         assert(aquifersData.size() == aquifer_connection.size());
@@ -170,7 +170,7 @@ BlackoilAquiferModel<TypeTag>::init()
 
         for (size_t i = 0; i < aquifersData.size(); ++i) {
             aquifers_CarterTracy.push_back(AquiferCarterTracy<TypeTag>(
-                aquifer_connection.at(i), cartesian_to_compressed_, this->simulator_, aquifersData.at(i)));
+                aquifer_connection[i], cartesian_to_compressed_, this->simulator_, aquifersData[i]));
         }
     }
     if (comm.rank() == 0)
@@ -188,7 +188,7 @@ BlackoilAquiferModel<TypeTag>::init()
         const Aquifetp aquifetp = Aquifetp(deck);
         const Aquancon aquifer_connect = Aquancon(eclState.getInputGrid(), deck);
 
-        std::vector<Aquifetp::AQUFETP_data> aquifersData = aquifetp.getAquifers();
+        std::vector<Aquifetp::AQUFETP_data> aquifersData = aquifetp.data();
         std::vector<Aquancon::AquanconOutput> aquifer_connection = aquifer_connect.getAquOutput();
 
         assert(aquifersData.size() == aquifer_connection.size());
@@ -200,7 +200,7 @@ BlackoilAquiferModel<TypeTag>::init()
 
         for (size_t i = 0; i < aquifersData.size(); ++i) {
             aquifers_Fetkovich.push_back(AquiferFetkovich<TypeTag>(
-                aquifer_connection.at(i), cartesian_to_compressed_, this->simulator_, aquifersData.at(i)));
+                aquifer_connection[i], cartesian_to_compressed_, this->simulator_, aquifersData[i]));
         }
     }
 }