diff --git a/opm/simulators/wells/GasLiftSingleWell.hpp b/opm/simulators/wells/GasLiftSingleWell.hpp
index 10b9a53d6..d95275a76 100644
--- a/opm/simulators/wells/GasLiftSingleWell.hpp
+++ b/opm/simulators/wells/GasLiftSingleWell.hpp
@@ -58,7 +58,7 @@ namespace Opm
         std::optional<double> computeBhpAtThpLimit_(double alq) const override;
         BasicRates computeWellRates_(
             double bhp, bool bhp_is_limited, bool debug_output=true) const override;
-        void setAlqMaxRate_(const GasLiftOpt::Well& well);
+        void setAlqMaxRate_(const GasLiftWell& well);
         void setupPhaseVariables_();
         bool checkThpControl_() const override;
 
diff --git a/opm/simulators/wells/GasLiftSingleWellGeneric.cpp b/opm/simulators/wells/GasLiftSingleWellGeneric.cpp
index c14ccb9e4..a7b37ea98 100644
--- a/opm/simulators/wells/GasLiftSingleWellGeneric.cpp
+++ b/opm/simulators/wells/GasLiftSingleWellGeneric.cpp
@@ -1304,7 +1304,7 @@ GasLiftSingleWellGeneric::tryIncreaseLiftGas_()
 }
 
 void
-GasLiftSingleWellGeneric::setAlqMinRate_(const GasLiftOpt::Well& well)
+GasLiftSingleWellGeneric::setAlqMinRate_(const GasLiftWell& well)
 {
     // NOTE:  According to WLIFTOPT item 5 :
     //   if min_rate() is negative, it means: allocate at least enough lift gas
@@ -1394,7 +1394,7 @@ GasLiftSingleWellGeneric::updateRatesToGroupLimits_(const BasicRates& old_rates,
 
 // Called when we should use a fixed ALQ value
 void
-GasLiftSingleWellGeneric::updateWellStateAlqFixedValue_(const GasLiftOpt::Well& well)
+GasLiftSingleWellGeneric::updateWellStateAlqFixedValue_(const GasLiftWell& well)
 {
     auto& max_alq_optional = well.max_rate();
     if (max_alq_optional) {
@@ -1421,7 +1421,7 @@ GasLiftSingleWellGeneric::updateWellStateAlqFixedValue_(const GasLiftOpt::Well&
 //   value that can be set either in Item 3 of this keyword, or in
 //   Item 12 of keyword WCONPROD, or with keyword WELTARG.
 bool
-GasLiftSingleWellGeneric::useFixedAlq_(const GasLiftOpt::Well& well)
+GasLiftSingleWellGeneric::useFixedAlq_(const GasLiftWell& well)
 {
     auto wliftopt_item2 = well.use_glo();
     if (wliftopt_item2) {
diff --git a/opm/simulators/wells/GasLiftSingleWellGeneric.hpp b/opm/simulators/wells/GasLiftSingleWellGeneric.hpp
index b958bda81..6e85e9ff4 100644
--- a/opm/simulators/wells/GasLiftSingleWellGeneric.hpp
+++ b/opm/simulators/wells/GasLiftSingleWellGeneric.hpp
@@ -317,7 +317,7 @@ protected:
     std::unique_ptr<GasLiftWellState> runOptimize1_();
     std::unique_ptr<GasLiftWellState> runOptimize2_();
     std::unique_ptr<GasLiftWellState> runOptimizeLoop_(bool increase);
-    void setAlqMinRate_(const GasLiftOpt::Well& well);
+    void setAlqMinRate_(const GasLiftWell& well);
     std::unique_ptr<GasLiftWellState> tryIncreaseLiftGas_();
     std::unique_ptr<GasLiftWellState> tryDecreaseLiftGas_();
     void updateGroupRates_(
@@ -326,8 +326,8 @@ protected:
         double delta_alq) const;
     LimitedRates updateRatesToGroupLimits_(
         const BasicRates& rates, const LimitedRates& new_rates, const std::string& gr_name = "") const;
-    void updateWellStateAlqFixedValue_(const GasLiftOpt::Well& well);
-    bool useFixedAlq_(const GasLiftOpt::Well& well);
+    void updateWellStateAlqFixedValue_(const GasLiftWell& well);
+    bool useFixedAlq_(const GasLiftWell& well);
     void debugInfoGroupRatesExceedTarget(
         Rate rate_type, const std::string& gr_name, double rate, double target) const;
     void warnMaxIterationsExceeded_();
@@ -356,7 +356,7 @@ protected:
 
     std::string well_name_;
 
-    const GasLiftOpt::Well* gl_well_;
+    const GasLiftWell* gl_well_;
 
     bool optimize_;
     bool debug_limit_increase_decrease_;
diff --git a/opm/simulators/wells/GasLiftSingleWell_impl.hpp b/opm/simulators/wells/GasLiftSingleWell_impl.hpp
index b6fb7ca6d..76e07631c 100644
--- a/opm/simulators/wells/GasLiftSingleWell_impl.hpp
+++ b/opm/simulators/wells/GasLiftSingleWell_impl.hpp
@@ -191,7 +191,7 @@ setupPhaseVariables_()
 template<typename TypeTag>
 void
 GasLiftSingleWell<TypeTag>::
-setAlqMaxRate_(const GasLiftOpt::Well &well)
+setAlqMaxRate_(const GasLiftWell &well)
 {
     auto& max_alq_optional = well.max_rate();
     if (max_alq_optional) {