diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 41552add2..912141d2a 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -439,7 +439,7 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/flow/priVarsPacking.hpp
   opm/simulators/flow/BlackoilModelEbos.hpp
   opm/simulators/flow/BlackoilModelEbosNldd.hpp
-  opm/simulators/flow/BlackoilModelParametersEbos.hpp
+  opm/simulators/flow/BlackoilModelParameters.hpp
   opm/simulators/flow/Banners.hpp
   opm/simulators/flow/ConvergenceOutputConfiguration.hpp
   opm/simulators/flow/EclActionHandler.hpp
diff --git a/ebos/ebos.hh b/ebos/ebos.hh
index b4a6cb679..385690622 100644
--- a/ebos/ebos.hh
+++ b/ebos/ebos.hh
@@ -193,7 +193,7 @@ public:
     {
         ParentType::registerParameters();
 
-        BlackoilModelParametersEbos<TypeTag>::registerParameters();
+        BlackoilModelParameters<TypeTag>::registerParameters();
         EWOMS_REGISTER_PARAM(TypeTag, bool, EnableTerminalOutput, "Do *NOT* use!");
         EWOMS_HIDE_PARAM(TypeTag, DbhpMaxRel);
         EWOMS_HIDE_PARAM(TypeTag, DwellFractionMax);
diff --git a/ebos/eclbasevanguard.hh b/ebos/eclbasevanguard.hh
index 691b18383..5db011f7f 100644
--- a/ebos/eclbasevanguard.hh
+++ b/ebos/eclbasevanguard.hh
@@ -40,9 +40,7 @@
 #include <opm/models/utils/parametersystem.hh>
 #include <opm/models/utils/propertysystem.hh>
 
-#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp>
-
-
+#include <opm/simulators/flow/BlackoilModelParameters.hpp>
 
 #include <array>
 #include <cstddef>
diff --git a/opm/simulators/flow/BlackoilModelEbos.hpp b/opm/simulators/flow/BlackoilModelEbos.hpp
index 984d9138a..98080a321 100644
--- a/opm/simulators/flow/BlackoilModelEbos.hpp
+++ b/opm/simulators/flow/BlackoilModelEbos.hpp
@@ -40,7 +40,7 @@
 #include <opm/simulators/aquifers/AquiferGridUtils.hpp>
 #include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
 #include <opm/simulators/flow/BlackoilModelEbosNldd.hpp>
-#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp>
+#include <opm/simulators/flow/BlackoilModelParameters.hpp>
 #include <opm/simulators/flow/countGlobalCells.hpp>
 #include <opm/simulators/flow/NonlinearSolverEbos.hpp>
 #include <opm/simulators/flow/RSTConv.hpp>
@@ -165,7 +165,7 @@ namespace Opm {
     {
     public:
         // ---------  Types and enums  ---------
-        using ModelParameters = BlackoilModelParametersEbos<TypeTag>;
+        using ModelParameters = BlackoilModelParameters<TypeTag>;
 
         using Simulator = GetPropType<TypeTag, Properties::Simulator>;
         using Grid = GetPropType<TypeTag, Properties::Grid>;
diff --git a/opm/simulators/flow/BlackoilModelEbosNldd.hpp b/opm/simulators/flow/BlackoilModelEbosNldd.hpp
index b0ee88d09..12439e9e7 100644
--- a/opm/simulators/flow/BlackoilModelEbosNldd.hpp
+++ b/opm/simulators/flow/BlackoilModelEbosNldd.hpp
@@ -81,7 +81,7 @@ public:
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     using Grid = GetPropType<TypeTag, Properties::Grid>;
     using Indices = GetPropType<TypeTag, Properties::Indices>;
-    using ModelParameters = BlackoilModelParametersEbos<TypeTag>;
+    using ModelParameters = BlackoilModelParameters<TypeTag>;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
 
diff --git a/opm/simulators/flow/BlackoilModelParametersEbos.hpp b/opm/simulators/flow/BlackoilModelParameters.hpp
similarity index 99%
rename from opm/simulators/flow/BlackoilModelParametersEbos.hpp
rename to opm/simulators/flow/BlackoilModelParameters.hpp
index 97dfb0a40..e90368e07 100644
--- a/opm/simulators/flow/BlackoilModelParametersEbos.hpp
+++ b/opm/simulators/flow/BlackoilModelParameters.hpp
@@ -17,8 +17,8 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPM_BLACKOILMODELPARAMETERS_EBOS_HEADER_INCLUDED
-#define OPM_BLACKOILMODELPARAMETERS_EBOS_HEADER_INCLUDED
+#ifndef OPM_BLACKOILMODELPARAMETERS_HEADER_INCLUDED
+#define OPM_BLACKOILMODELPARAMETERS_HEADER_INCLUDED
 
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 
@@ -463,7 +463,7 @@ namespace Opm
 {
     /// Solver parameters for the BlackoilModel.
     template <class TypeTag>
-    struct BlackoilModelParametersEbos
+    struct BlackoilModelParameters
     {
     private:
         using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -595,7 +595,7 @@ namespace Opm
         bool write_partitions_{false};
 
         /// Construct from user parameters or defaults.
-        BlackoilModelParametersEbos()
+        BlackoilModelParameters()
         {
             dbhp_max_rel_=  EWOMS_GET_PARAM(TypeTag, Scalar, DbhpMaxRel);
             dwell_fraction_max_ = EWOMS_GET_PARAM(TypeTag, Scalar, DwellFractionMax);
@@ -715,4 +715,4 @@ namespace Opm
     };
 } // namespace Opm
 
-#endif // OPM_BLACKOILMODELPARAMETERS_EBOS_HEADER_INCLUDED
+#endif // OPM_BLACKOILMODELPARAMETERS_HEADER_INCLUDED
diff --git a/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp b/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
index 549a8ee47..b17d222b3 100644
--- a/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
+++ b/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
@@ -26,7 +26,7 @@
 
 #include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
 #include <opm/simulators/flow/BlackoilModelEbos.hpp>
-#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp>
+#include <opm/simulators/flow/BlackoilModelParameters.hpp>
 #include <opm/simulators/flow/ConvergenceOutputConfiguration.hpp>
 #include <opm/simulators/flow/ExtraConvergenceOutputThread.hpp>
 #include <opm/simulators/flow/NonlinearSolverEbos.hpp>
diff --git a/opm/simulators/linalg/ISTLSolverEbos.hpp b/opm/simulators/linalg/ISTLSolverEbos.hpp
index 6d6653f96..f27adc057 100644
--- a/opm/simulators/linalg/ISTLSolverEbos.hpp
+++ b/opm/simulators/linalg/ISTLSolverEbos.hpp
@@ -35,7 +35,7 @@
 #include <opm/models/common/multiphasebaseproperties.hh>
 #include <opm/models/utils/parametersystem.hh>
 #include <opm/models/utils/propertysystem.hh>
-#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp>
+#include <opm/simulators/flow/BlackoilModelParameters.hpp>
 #include <opm/simulators/linalg/ExtractParallelGridInformationToISTL.hpp>
 #include <opm/simulators/linalg/FlowLinearSolverParameters.hpp>
 #include <opm/simulators/linalg/matrixblock.hh>
diff --git a/opm/simulators/wells/BlackoilWellModel.hpp b/opm/simulators/wells/BlackoilWellModel.hpp
index bb3490451..de72dd055 100644
--- a/opm/simulators/wells/BlackoilWellModel.hpp
+++ b/opm/simulators/wells/BlackoilWellModel.hpp
@@ -96,7 +96,7 @@ namespace Opm {
         {
         public:
             // ---------      Types      ---------
-            typedef BlackoilModelParametersEbos<TypeTag> ModelParameters;
+            using ModelParameters = BlackoilModelParameters<TypeTag>;
 
             using Grid = GetPropType<TypeTag, Properties::Grid>;
             using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>;
diff --git a/opm/simulators/wells/WellInterface.hpp b/opm/simulators/wells/WellInterface.hpp
index 1d0e48711..c695f10b1 100644
--- a/opm/simulators/wells/WellInterface.hpp
+++ b/opm/simulators/wells/WellInterface.hpp
@@ -39,7 +39,7 @@ namespace Opm {
 
 #include <opm/core/props/BlackoilPhases.hpp>
 
-#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp>
+#include <opm/simulators/flow/BlackoilModelParameters.hpp>
 
 #include <opm/simulators/wells/BlackoilWellModel.hpp>
 #include <opm/simulators/wells/GasLiftGroupInfo.hpp>
@@ -78,7 +78,7 @@ class WellInterface : public WellInterfaceIndices<GetPropType<TypeTag, Propertie
                                       GetPropType<TypeTag, Properties::Indices>,
                                       GetPropType<TypeTag, Properties::Scalar>>;
 public:
-    using ModelParameters = BlackoilModelParametersEbos<TypeTag>;
+    using ModelParameters = BlackoilModelParameters<TypeTag>;
 
     using Grid = GetPropType<TypeTag, Properties::Grid>;
     using Simulator = GetPropType<TypeTag, Properties::Simulator>;
diff --git a/tests/test_equil.cc b/tests/test_equil.cc
index 2917ca523..955acb8ae 100644
--- a/tests/test_equil.cc
+++ b/tests/test_equil.cc
@@ -39,7 +39,7 @@
 #include <opm/models/utils/start.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
 
-#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp>
+#include <opm/simulators/flow/BlackoilModelParameters.hpp>
 #include <opm/simulators/wells/BlackoilWellModel.hpp>
 
 #if HAVE_DUNE_FEM
@@ -238,7 +238,7 @@ struct EquilFixture {
         Dune::MPIHelper::instance(argc, argv);
 #endif
         Opm::EclGenericVanguard::setCommunication(std::make_unique<Opm::Parallel::Communication>());
-        Opm::BlackoilModelParametersEbos<TypeTag>::registerParameters();
+        Opm::BlackoilModelParameters<TypeTag>::registerParameters();
         Opm::AdaptiveTimeSteppingEbos<TypeTag>::registerParameters();
         Opm::Parameters::registerParam<TypeTag, bool>("EnableTerminalOutput",
                                                       "EnableTerminalOutput",
diff --git a/tests/test_wellmodel.cpp b/tests/test_wellmodel.cpp
index 795588977..9840d1633 100644
--- a/tests/test_wellmodel.cpp
+++ b/tests/test_wellmodel.cpp
@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE(TestStandardWellInput) {
     const auto& wells_ecl = setup_test.schedule->getWells(setup_test.current_timestep);
     BOOST_CHECK_EQUAL( wells_ecl.size(), 2);
     const Opm::Well& well = wells_ecl[1];
-    const Opm::BlackoilModelParametersEbos<Opm::Properties::TTag::EclFlowProblem> param;
+    const Opm::BlackoilModelParameters<Opm::Properties::TTag::EclFlowProblem> param;
 
     // For the conversion between the surface volume rate and resrevoir voidage rate
     typedef Opm::BlackOilFluidSystem<double> FluidSystem;
@@ -147,7 +147,7 @@ BOOST_AUTO_TEST_CASE(TestBehavoir) {
 
     {
         const int nw = wells_ecl.size();
-        const Opm::BlackoilModelParametersEbos<Opm::Properties::TTag::EclFlowProblem> param;
+        const Opm::BlackoilModelParameters<Opm::Properties::TTag::EclFlowProblem> param;
 
         for (int w = 0; w < nw; ++w) {
             // For the conversion between the surface volume rate and resrevoir voidage rate