diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2b50d956..7b7e66ec2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -281,7 +281,7 @@ source_group(models FILES ${STORM_MODELS_FILES})
 source_group(parser FILES ${STORM_PARSER_FILES})
 source_group(parser\\prismparser FILES ${STORM_PARSER_PRISMPARSER_FILES})
 source_group(settings FILES ${STORM_SETTINGS_FILES})
-source_group(settings\\modules ${STORM_SETTINGS_MODULES_FILES})
+source_group(settings\\modules FILES ${STORM_SETTINGS_MODULES_FILES})
 source_group(solver FILES ${STORM_SOLVER_FILES})
 source_group(storage FILES ${STORM_STORAGE_FILES})
 source_group(storage\\dd FILES ${STORM_STORAGE_DD_FILES})
diff --git a/src/adapters/ExplicitModelAdapter.h b/src/adapters/ExplicitModelAdapter.h
index dfc3e1219..7befe5ee8 100644
--- a/src/adapters/ExplicitModelAdapter.h
+++ b/src/adapters/ExplicitModelAdapter.h
@@ -27,7 +27,7 @@
 #include "src/models/Ctmdp.h"
 #include "src/models/AtomicPropositionsLabeling.h"
 #include "src/storage/SparseMatrix.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/exceptions/ExceptionMacros.h"
 #include "src/exceptions/WrongFormatException.h"
 
diff --git a/src/modelchecker/prctl/AbstractModelChecker.h b/src/modelchecker/prctl/AbstractModelChecker.h
index 930c002db..9729494be 100644
--- a/src/modelchecker/prctl/AbstractModelChecker.h
+++ b/src/modelchecker/prctl/AbstractModelChecker.h
@@ -22,7 +22,7 @@ namespace prctl {
 #include "src/properties/Prctl.h"
 #include "src/storage/BitVector.h"
 #include "src/models/AbstractModel.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"
diff --git a/src/modelchecker/prctl/SparseMdpPrctlModelChecker.h b/src/modelchecker/prctl/SparseMdpPrctlModelChecker.h
index 10fc04aaf..7d0600d85 100644
--- a/src/modelchecker/prctl/SparseMdpPrctlModelChecker.h
+++ b/src/modelchecker/prctl/SparseMdpPrctlModelChecker.h
@@ -18,7 +18,7 @@
 #include "src/utility/vector.h"
 #include "src/utility/graph.h"
 #include "src/utility/solver.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/storage/TotalScheduler.h"
 
 namespace storm {
diff --git a/src/models/Ctmdp.h b/src/models/Ctmdp.h
index 842ad4391..c29c16b8c 100644
--- a/src/models/Ctmdp.h
+++ b/src/models/Ctmdp.h
@@ -14,7 +14,7 @@
 #include "AtomicPropositionsLabeling.h"
 #include "AbstractNondeterministicModel.h"
 #include "src/storage/SparseMatrix.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 namespace storm {
 
diff --git a/src/models/Dtmc.h b/src/models/Dtmc.h
index c703c1127..ec625b6d8 100644
--- a/src/models/Dtmc.h
+++ b/src/models/Dtmc.h
@@ -17,7 +17,7 @@
 #include "AtomicPropositionsLabeling.h"
 #include "src/storage/SparseMatrix.h"
 #include "src/exceptions/InvalidArgumentException.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/utility/vector.h"
 #include "src/utility/matrix.h"
 
diff --git a/src/models/MarkovAutomaton.h b/src/models/MarkovAutomaton.h
index ef73c26ea..106cc0e7d 100644
--- a/src/models/MarkovAutomaton.h
+++ b/src/models/MarkovAutomaton.h
@@ -12,7 +12,7 @@
 #include "AtomicPropositionsLabeling.h"
 #include "src/storage/SparseMatrix.h"
 #include "src/exceptions/InvalidArgumentException.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/utility/vector.h"
 #include "src/utility/matrix.h"
 
diff --git a/src/models/Mdp.h b/src/models/Mdp.h
index a19424457..b647f6813 100644
--- a/src/models/Mdp.h
+++ b/src/models/Mdp.h
@@ -16,7 +16,7 @@
 
 #include "AtomicPropositionsLabeling.h"
 #include "src/storage/SparseMatrix.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/models/AbstractNondeterministicModel.h"
 #include "src/utility/matrix.h"
 
diff --git a/src/parser/DeterministicSparseTransitionParser.cpp b/src/parser/DeterministicSparseTransitionParser.cpp
index bf4b66b6d..165f8d8f2 100644
--- a/src/parser/DeterministicSparseTransitionParser.cpp
+++ b/src/parser/DeterministicSparseTransitionParser.cpp
@@ -19,7 +19,7 @@
 #include "src/parser/MappedFile.h"
 #include "src/exceptions/FileIoException.h"
 #include "src/exceptions/WrongFormatException.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"
diff --git a/src/parser/MarkovAutomatonSparseTransitionParser.cpp b/src/parser/MarkovAutomatonSparseTransitionParser.cpp
index b653afe24..7e235827c 100644
--- a/src/parser/MarkovAutomatonSparseTransitionParser.cpp
+++ b/src/parser/MarkovAutomatonSparseTransitionParser.cpp
@@ -1,6 +1,6 @@
 #include "MarkovAutomatonSparseTransitionParser.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/exceptions/WrongFormatException.h"
 #include "src/exceptions/FileIoException.h"
 #include "src/parser/MappedFile.h"
diff --git a/src/parser/NondeterministicSparseTransitionParser.cpp b/src/parser/NondeterministicSparseTransitionParser.cpp
index 8e9361a81..01f3281cd 100644
--- a/src/parser/NondeterministicSparseTransitionParser.cpp
+++ b/src/parser/NondeterministicSparseTransitionParser.cpp
@@ -10,7 +10,7 @@
 #include <string>
 
 #include "src/parser/MappedFile.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/exceptions/FileIoException.h"
 #include "src/exceptions/OutOfRangeException.h"
 #include "src/exceptions/WrongFormatException.h"
diff --git a/src/settings/InternalOptionMemento.h b/src/settings/InternalOptionMemento.h
index 6e323db8e..88406894b 100644
--- a/src/settings/InternalOptionMemento.h
+++ b/src/settings/InternalOptionMemento.h
@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_INTERNALOPTIONMEMENTO_H_
 #define STORM_SETTINGS_INTERNALOPTIONMEMENTO_H_
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"
 
diff --git a/src/settings/Settings.cpp b/src/settings/SettingsManager.cpp
similarity index 99%
rename from src/settings/Settings.cpp
rename to src/settings/SettingsManager.cpp
index 2954cade4..0b476323d 100644
--- a/src/settings/Settings.cpp
+++ b/src/settings/SettingsManager.cpp
@@ -1,4 +1,4 @@
-#include "Settings.h"
+#include "src/settings/SettingsManager.h"
 
 #include <cstring>
 #include <cctype>
diff --git a/src/settings/Settings.h b/src/settings/SettingsManager.h
similarity index 100%
rename from src/settings/Settings.h
rename to src/settings/SettingsManager.h
diff --git a/src/settings/modules/GeneralSettings.cpp b/src/settings/modules/GeneralSettings.cpp
new file mode 100644
index 000000000..c66276eb8
--- /dev/null
+++ b/src/settings/modules/GeneralSettings.cpp
@@ -0,0 +1,13 @@
+#include "src/settings/modules/GeneralSettings.h"
+
+namespace storm {
+    namespace settings {
+        namespace modules {
+            
+            GeneralSettings::GeneralSettings(storm::settings::SettingsManager& settingsManager) : ModuleSettings(settingsManager) {
+                
+            }
+            
+        } // namespace modules
+    } // namespace settings
+} // namespace storm
\ No newline at end of file
diff --git a/src/settings/modules/GeneralSettings.h b/src/settings/modules/GeneralSettings.h
new file mode 100644
index 000000000..8297437d0
--- /dev/null
+++ b/src/settings/modules/GeneralSettings.h
@@ -0,0 +1,16 @@
+#include "src/settings/modules/ModuleSettings.h"
+
+namespace storm {
+    namespace settings {
+        namespace modules {
+            
+            /*!
+             * This class represents the general options.
+             */
+            class GeneralSettings : public ModuleSettings {
+                GeneralSettings(storm::settings::SettingsManager& settingsManager);
+            };
+            
+        } // namespace modules
+    } // namespace settings
+} // namespace storm
\ No newline at end of file
diff --git a/src/settings/modules/ModuleSettings.cpp b/src/settings/modules/ModuleSettings.cpp
new file mode 100644
index 000000000..0662256fd
--- /dev/null
+++ b/src/settings/modules/ModuleSettings.cpp
@@ -0,0 +1,13 @@
+#include "src/settings/modules/ModuleSettings.h"
+
+namespace storm {
+    namespace settings {
+        namespace modules {
+            
+            ModuleSettings::ModuleSettings(storm::settings::SettingsManager& settingsManager) {
+                // Intentionally left empty.
+            }
+            
+        } // namespace modules
+    } // namespace settings
+} // namespace storm
\ No newline at end of file
diff --git a/src/settings/modules/ModuleSettings.h b/src/settings/modules/ModuleSettings.h
new file mode 100644
index 000000000..f07a4b24f
--- /dev/null
+++ b/src/settings/modules/ModuleSettings.h
@@ -0,0 +1,22 @@
+#include "src/settings/SettingsManager.h"
+
+namespace storm {
+    namespace settings {
+        namespace modules {
+            
+            /*!
+             * This is the base class of the settings for a particular module.
+             */
+            class ModuleSettings {
+            public:
+                /*!
+                 * Constructs a new settings object.
+                 *
+                 * @param settingsManager The manager responsible for these settings.
+                 */
+                ModuleSettings(storm::settings::SettingsManager& settingsManager);
+            };
+            
+        } // namespace modules
+    } // namespace settings
+} // namespace storm
\ No newline at end of file
diff --git a/src/settings/modules/Settings.h b/src/settings/modules/Settings.h
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/solver/GlpkLpSolver.cpp b/src/solver/GlpkLpSolver.cpp
index 5c4d59639..e68528fa6 100644
--- a/src/solver/GlpkLpSolver.cpp
+++ b/src/solver/GlpkLpSolver.cpp
@@ -6,7 +6,7 @@
 
 #include "src/storage/expressions/LinearCoefficientVisitor.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/exceptions/ExceptionMacros.h"
 #include "src/exceptions/InvalidAccessException.h"
 #include "src/exceptions/InvalidStateException.h"
diff --git a/src/solver/GmmxxLinearEquationSolver.cpp b/src/solver/GmmxxLinearEquationSolver.cpp
index a3ca08623..5f3d92275 100644
--- a/src/solver/GmmxxLinearEquationSolver.cpp
+++ b/src/solver/GmmxxLinearEquationSolver.cpp
@@ -4,7 +4,7 @@
 #include <utility>
 
 #include "src/adapters/GmmxxAdapter.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/utility/vector.h"
 #include "src/utility/constants.h"
 #include "src/exceptions/InvalidStateException.h"
diff --git a/src/solver/GmmxxNondeterministicLinearEquationSolver.cpp b/src/solver/GmmxxNondeterministicLinearEquationSolver.cpp
index f3bb2621e..5de34200e 100644
--- a/src/solver/GmmxxNondeterministicLinearEquationSolver.cpp
+++ b/src/solver/GmmxxNondeterministicLinearEquationSolver.cpp
@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/adapters/GmmxxAdapter.h"
 #include "src/utility/vector.h"
 
diff --git a/src/solver/GurobiLpSolver.cpp b/src/solver/GurobiLpSolver.cpp
index bf7c34378..139bda5fe 100644
--- a/src/solver/GurobiLpSolver.cpp
+++ b/src/solver/GurobiLpSolver.cpp
@@ -5,7 +5,7 @@
 
 #include "src/storage/expressions/LinearCoefficientVisitor.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/exceptions/ExceptionMacros.h"
 #include "src/exceptions/InvalidStateException.h"
 #include "src/exceptions/InvalidAccessException.h"
diff --git a/src/solver/NativeLinearEquationSolver.cpp b/src/solver/NativeLinearEquationSolver.cpp
index dd54297e4..47ca2f0e4 100644
--- a/src/solver/NativeLinearEquationSolver.cpp
+++ b/src/solver/NativeLinearEquationSolver.cpp
@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/utility/vector.h"
 #include "src/exceptions/InvalidStateException.h"
 
diff --git a/src/solver/NativeNondeterministicLinearEquationSolver.cpp b/src/solver/NativeNondeterministicLinearEquationSolver.cpp
index 220486a40..478448ed5 100644
--- a/src/solver/NativeNondeterministicLinearEquationSolver.cpp
+++ b/src/solver/NativeNondeterministicLinearEquationSolver.cpp
@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/utility/vector.h"
 
 namespace storm {
diff --git a/src/storage/dd/CuddDdManager.cpp b/src/storage/dd/CuddDdManager.cpp
index 76d6fc3d9..e98d7f8fe 100644
--- a/src/storage/dd/CuddDdManager.cpp
+++ b/src/storage/dd/CuddDdManager.cpp
@@ -5,7 +5,7 @@
 #include "src/storage/dd/CuddDdManager.h"
 #include "src/exceptions/ExceptionMacros.h"
 #include "src/exceptions/InvalidArgumentException.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 namespace storm {
     namespace dd {
diff --git a/src/utility/InitializeLogging.h b/src/utility/InitializeLogging.h
index d174732f7..eefd0f604 100644
--- a/src/utility/InitializeLogging.h
+++ b/src/utility/InitializeLogging.h
@@ -6,7 +6,7 @@
 #include "log4cplus/consoleappender.h"
 #include "log4cplus/fileappender.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 log4cplus::Logger logger;
 
diff --git a/src/utility/solver.cpp b/src/utility/solver.cpp
index 7a93c4146..5531f61e5 100644
--- a/src/utility/solver.cpp
+++ b/src/utility/solver.cpp
@@ -1,6 +1,6 @@
 #include "src/utility/solver.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 #include "src/solver/NativeLinearEquationSolver.h"
 #include "src/solver/GmmxxLinearEquationSolver.h"
diff --git a/test/functional/adapter/Z3ExpressionAdapterTest.cpp b/test/functional/adapter/Z3ExpressionAdapterTest.cpp
index b92794f87..68aee3adb 100644
--- a/test/functional/adapter/Z3ExpressionAdapterTest.cpp
+++ b/test/functional/adapter/Z3ExpressionAdapterTest.cpp
@@ -4,7 +4,7 @@
 #ifdef STORM_HAVE_Z3
 #include "z3++.h"
 #include "src/adapters/Z3ExpressionAdapter.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(Z3ExpressionAdapter, StormToZ3Basic) {
 	z3::context ctx;
diff --git a/test/functional/modelchecker/EigenDtmcPrctlModelCheckerTest.cpp b/test/functional/modelchecker/EigenDtmcPrctlModelCheckerTest.cpp
index 8cb8d131d..9de36e64c 100644
--- a/test/functional/modelchecker/EigenDtmcPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/EigenDtmcPrctlModelCheckerTest.cpp
@@ -2,7 +2,7 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/modelchecker/EigenDtmcPrctlModelChecker.h"
 #include "src/parser/AutoParser.h"
 
diff --git a/test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp
index 37f9459fd..a673994d5 100644
--- a/test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp
@@ -3,7 +3,7 @@
 
 #include "src/solver/GmmxxLinearEquationSolver.h"
 #include "src/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/settings/InternalOptionMemento.h"
 #include "src/parser/AutoParser.h"
 
diff --git a/test/functional/modelchecker/SparseMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/SparseMdpPrctlModelCheckerTest.cpp
index c128c6f47..be1ef8674 100644
--- a/test/functional/modelchecker/SparseMdpPrctlModelCheckerTest.cpp
+++ b/test/functional/modelchecker/SparseMdpPrctlModelCheckerTest.cpp
@@ -2,7 +2,7 @@
 #include "storm-config.h"
 
 #include "src/solver/NativeNondeterministicLinearEquationSolver.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
 #include "src/parser/AutoParser.h"
 
diff --git a/test/functional/parser/MarkovAutomatonSparseTransitionParserTest.cpp b/test/functional/parser/MarkovAutomatonSparseTransitionParserTest.cpp
index 38b152cd4..0d1dbb682 100644
--- a/test/functional/parser/MarkovAutomatonSparseTransitionParserTest.cpp
+++ b/test/functional/parser/MarkovAutomatonSparseTransitionParserTest.cpp
@@ -7,7 +7,7 @@
 
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 #include <vector>
 
diff --git a/test/functional/solver/GlpkLpSolverTest.cpp b/test/functional/solver/GlpkLpSolverTest.cpp
index 66299c856..0dd33f80c 100644
--- a/test/functional/solver/GlpkLpSolverTest.cpp
+++ b/test/functional/solver/GlpkLpSolverTest.cpp
@@ -5,7 +5,7 @@
 #include "src/solver/GlpkLpSolver.h"
 #include "src/exceptions/InvalidStateException.h"
 #include "src/exceptions/InvalidAccessException.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(GlpkLpSolver, LPOptimizeMax) {
     storm::solver::GlpkLpSolver solver(storm::solver::LpSolver::ModelSense::Maximize);
diff --git a/test/functional/solver/GmmxxLinearEquationSolverTest.cpp b/test/functional/solver/GmmxxLinearEquationSolverTest.cpp
index f9c1759fa..e714c24b6 100644
--- a/test/functional/solver/GmmxxLinearEquationSolverTest.cpp
+++ b/test/functional/solver/GmmxxLinearEquationSolverTest.cpp
@@ -2,7 +2,7 @@
 #include "storm-config.h"
 
 #include "src/solver/GmmxxLinearEquationSolver.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(GmmxxLinearEquationSolver, SolveWithStandardOptions) {
     ASSERT_NO_THROW(storm::storage::SparseMatrixBuilder<double> builder);
diff --git a/test/functional/solver/GmmxxNondeterministicLinearEquationSolverTest.cpp b/test/functional/solver/GmmxxNondeterministicLinearEquationSolverTest.cpp
index 6aa26304e..13488bd1c 100644
--- a/test/functional/solver/GmmxxNondeterministicLinearEquationSolverTest.cpp
+++ b/test/functional/solver/GmmxxNondeterministicLinearEquationSolverTest.cpp
@@ -2,7 +2,7 @@
 #include "storm-config.h"
 
 #include "src/solver/GmmxxNondeterministicLinearEquationSolver.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(GmmxxNondeterministicLinearEquationSolver, SolveWithStandardOptions) {
     storm::storage::SparseMatrixBuilder<double> builder(0, 0, 0, false, true);
diff --git a/test/functional/solver/GurobiLpSolverTest.cpp b/test/functional/solver/GurobiLpSolverTest.cpp
index a862fac42..88c8929c0 100644
--- a/test/functional/solver/GurobiLpSolverTest.cpp
+++ b/test/functional/solver/GurobiLpSolverTest.cpp
@@ -5,7 +5,7 @@
 #include "src/solver/GurobiLpSolver.h"
 #include "src/exceptions/InvalidStateException.h"
 #include "src/exceptions/InvalidAccessException.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(GurobiLpSolver, LPOptimizeMax) {
     storm::solver::GurobiLpSolver solver(storm::solver::LpSolver::ModelSense::Maximize);
diff --git a/test/functional/solver/NativeLinearEquationSolverTest.cpp b/test/functional/solver/NativeLinearEquationSolverTest.cpp
index 7fdc37f6e..5cfa01bcb 100644
--- a/test/functional/solver/NativeLinearEquationSolverTest.cpp
+++ b/test/functional/solver/NativeLinearEquationSolverTest.cpp
@@ -2,7 +2,7 @@
 #include "storm-config.h"
 
 #include "src/solver/NativeLinearEquationSolver.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(NativeLinearEquationSolver, SolveWithStandardOptions) {
     ASSERT_NO_THROW(storm::storage::SparseMatrixBuilder<double> builder);
diff --git a/test/functional/solver/NativeNondeterministicLinearEquationSolverTest.cpp b/test/functional/solver/NativeNondeterministicLinearEquationSolverTest.cpp
index 66ca32b84..c1c019c47 100644
--- a/test/functional/solver/NativeNondeterministicLinearEquationSolverTest.cpp
+++ b/test/functional/solver/NativeNondeterministicLinearEquationSolverTest.cpp
@@ -2,7 +2,7 @@
 #include "storm-config.h"
 
 #include "src/solver/NativeNondeterministicLinearEquationSolver.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(NativeNondeterministicLinearEquationSolver, SolveWithStandardOptions) {
     storm::storage::SparseMatrixBuilder<double> builder(0, 0, 0, false, true);
diff --git a/test/functional/solver/Z3SmtSolverTest.cpp b/test/functional/solver/Z3SmtSolverTest.cpp
index 4f10871f0..1f5a0cf86 100644
--- a/test/functional/solver/Z3SmtSolverTest.cpp
+++ b/test/functional/solver/Z3SmtSolverTest.cpp
@@ -3,7 +3,7 @@
 
 #ifdef STORM_HAVE_Z3
 #include "src/solver/Z3SmtSolver.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(Z3SmtSolver, CheckSat) {
 	storm::solver::Z3SmtSolver s;
diff --git a/test/functional/storm-functional-tests.cpp b/test/functional/storm-functional-tests.cpp
index 16d5c0c13..8dbbd98ba 100644
--- a/test/functional/storm-functional-tests.cpp
+++ b/test/functional/storm-functional-tests.cpp
@@ -6,7 +6,7 @@
 #include "log4cplus/consoleappender.h"
 #include "log4cplus/fileappender.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 log4cplus::Logger logger;
 
diff --git a/test/performance/graph/GraphTest.cpp b/test/performance/graph/GraphTest.cpp
index e0fe1b9b4..7dcab0d34 100644
--- a/test/performance/graph/GraphTest.cpp
+++ b/test/performance/graph/GraphTest.cpp
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/parser/AutoParser.h"
 #include "src/utility/graph.h"
 #include "src/storage/StronglyConnectedComponentDecomposition.h"
diff --git a/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp b/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp
index fc85b69b5..80c410e22 100644
--- a/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp
+++ b/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/settings/InternalOptionMemento.h"
 #include "src/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
 #include "src/solver/GmmxxLinearEquationSolver.h"
diff --git a/test/performance/modelchecker/SparseMdpPrctlModelCheckerTest.cpp b/test/performance/modelchecker/SparseMdpPrctlModelCheckerTest.cpp
index 1766ef267..242aef71e 100644
--- a/test/performance/modelchecker/SparseMdpPrctlModelCheckerTest.cpp
+++ b/test/performance/modelchecker/SparseMdpPrctlModelCheckerTest.cpp
@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
 #include "src/solver/NativeNondeterministicLinearEquationSolver.h"
 #include "src/parser/AutoParser.h"
diff --git a/test/performance/storm-performance-tests.cpp b/test/performance/storm-performance-tests.cpp
index c6363f46d..c16e2cadd 100644
--- a/test/performance/storm-performance-tests.cpp
+++ b/test/performance/storm-performance-tests.cpp
@@ -6,7 +6,7 @@
 #include "log4cplus/consoleappender.h"
 #include "log4cplus/fileappender.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 log4cplus::Logger logger;