diff --git a/ebos/equil/initstateequil.hh b/ebos/equil/initstateequil.hh
index 7c82aaa8a..cb6024556 100644
--- a/ebos/equil/initstateequil.hh
+++ b/ebos/equil/initstateequil.hh
@@ -36,18 +36,18 @@
 
 #include <opm/grid/cpgrid/GridHelpers.hpp>
 
-#include <opm/parser/eclipse/Units/Units.hpp>
-#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp>
-#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
-#include <opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp>
-#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
-#include <opm/parser/eclipse/EclipseState/Tables/RsvdTable.hpp>
-#include <opm/parser/eclipse/EclipseState/Tables/RvvdTable.hpp>
-#include <opm/parser/eclipse/EclipseState/Tables/PbvdTable.hpp>
-#include <opm/parser/eclipse/EclipseState/Tables/PdvdTable.hpp>
-#include <opm/parser/eclipse/EclipseState/Tables/SaltvdTable.hpp>
-#include <opm/parser/eclipse/EclipseState/Tables/SaltpvdTable.hpp>
+#include <opm/input/eclipse/Units/Units.hpp>
+#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/input/eclipse/EclipseState/InitConfig/Equil.hpp>
+#include <opm/input/eclipse/EclipseState/InitConfig/InitConfig.hpp>
+#include <opm/input/eclipse/EclipseState/Tables/TableContainer.hpp>
+#include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
+#include <opm/input/eclipse/EclipseState/Tables/RsvdTable.hpp>
+#include <opm/input/eclipse/EclipseState/Tables/RvvdTable.hpp>
+#include <opm/input/eclipse/EclipseState/Tables/PbvdTable.hpp>
+#include <opm/input/eclipse/EclipseState/Tables/PdvdTable.hpp>
+#include <opm/input/eclipse/EclipseState/Tables/SaltvdTable.hpp>
+#include <opm/input/eclipse/EclipseState/Tables/SaltpvdTable.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <fmt/format.h>
 
diff --git a/flow/flow_ebos_brine_saltprecipitation.cpp b/flow/flow_ebos_brine_saltprecipitation.cpp
index 74483e601..18d27a607 100644
--- a/flow/flow_ebos_brine_saltprecipitation.cpp
+++ b/flow/flow_ebos_brine_saltprecipitation.cpp
@@ -26,17 +26,17 @@
 namespace Opm {
 namespace Properties {
 namespace TTag {
-struct EclFlowBrineProblem {
+struct EclFlowBrineSaltPrecipitationProblem {
     using InheritsFrom = std::tuple<EclFlowProblem>;
 };
 }
 template<class TypeTag>
-struct EnableBrine<TypeTag, TTag::EclFlowBrineProblem> {
+struct EnableBrine<TypeTag, TTag::EclFlowBrineSaltPrecipitationProblem> {
     static constexpr bool value = true;
 };
 
 template<class TypeTag>
-struct EnableSaltPrecipitation<TypeTag, TTag::EclFlowBrineProblem> {
+struct EnableSaltPrecipitation<TypeTag, TTag::EclFlowBrineSaltPrecipitationProblem> {
     static constexpr bool value = true;
 };
 }}
@@ -47,7 +47,7 @@ void flowEbosBrineSaltPrecipitationSetDeck(double setupTime, std::shared_ptr<Dec
                           std::shared_ptr<Schedule> schedule,
                           std::shared_ptr<SummaryConfig> summaryConfig)
 {
-    using TypeTag = Properties::TTag::EclFlowBrineProblem;
+    using TypeTag = Properties::TTag::EclFlowBrineSaltPrecipitationProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(setupTime);
@@ -65,14 +65,14 @@ int flowEbosBrineSaltPrecipitationMain(int argc, char** argv, bool outputCout, b
     // with incorrect locale settings.
     resetLocale();
 
-    FlowMainEbos<Properties::TTag::EclFlowBrineProblem>
+    FlowMainEbos<Properties::TTag::EclFlowBrineSaltPrecipitationProblem>
         mainfunc {argc, argv, outputCout, outputFiles};
     return mainfunc.execute();
 }
 
 int flowEbosBrineSaltPrecipitationMainStandalone(int argc, char** argv)
 {
-    using TypeTag = Properties::TTag::EclFlowBrineProblem;
+    using TypeTag = Properties::TTag::EclFlowBrineSaltPrecipitationProblem;
     auto mainObject = Opm::Main(argc, argv);
     return mainObject.runStatic<TypeTag>();
 }