diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index e444b2d2a..8924a8f28 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -109,7 +109,7 @@ void CompilerStack::setLibraries(std::map<std::string, h160> const& _libraries)
 
 void CompilerStack::setOptimiserSettings(bool _optimize, unsigned _runs)
 {
-	OptimiserSettings settings = _optimize ? OptimiserSettings::enabled() : OptimiserSettings::minimal();
+	OptimiserSettings settings = _optimize ? OptimiserSettings::standard() : OptimiserSettings::minimal();
 	settings.expectedExecutionsPerDeployment = _runs;
 	setOptimiserSettings(std::move(settings));
 }
@@ -978,7 +978,7 @@ string CompilerStack::createMetadata(Contract const& _contract) const
 	settingsWithoutRuns.expectedExecutionsPerDeployment = OptimiserSettings::minimal().expectedExecutionsPerDeployment;
 	if (settingsWithoutRuns == OptimiserSettings::minimal())
 		meta["settings"]["optimizer"]["enabled"] = false;
-	else if (settingsWithoutRuns == OptimiserSettings::enabled())
+	else if (settingsWithoutRuns == OptimiserSettings::standard())
 		meta["settings"]["optimizer"]["enabled"] = true;
 	else
 	{
diff --git a/libsolidity/interface/OptimiserSettings.h b/libsolidity/interface/OptimiserSettings.h
index c88778949..83203865f 100644
--- a/libsolidity/interface/OptimiserSettings.h
+++ b/libsolidity/interface/OptimiserSettings.h
@@ -45,7 +45,7 @@ struct OptimiserSettings
 		return s;
 	}
 	/// Standard optimisations.
-	static OptimiserSettings enabled()
+	static OptimiserSettings standard()
 	{
 		OptimiserSettings s;
 		s.runOrderLiterals = true;
@@ -63,7 +63,7 @@ struct OptimiserSettings
 	/// Standard optimisations plus yul and stack optimiser.
 	static OptimiserSettings full()
 	{
-		OptimiserSettings s = enabled();
+		OptimiserSettings s = standard();
 		s.optimizeStackAllocation = true;
 		s.runYulOptimiser = true;
 		return s;
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 326dac601..607f2d42e 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -369,7 +369,7 @@ boost::variant<OptimiserSettings, Json::Value> parseOptimizerSettings(Json::Valu
 		if (!_jsonInput["enabled"].isBool())
 			return formatFatalError("JSONError", "The \"enabled\" setting must be a Boolean.");
 
-		settings = _jsonInput["enabled"].asBool() ? OptimiserSettings::enabled() : OptimiserSettings::minimal();
+		settings = _jsonInput["enabled"].asBool() ? OptimiserSettings::standard() : OptimiserSettings::minimal();
 	}
 
 	if (_jsonInput.isMember("runs"))
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index ac512d4e4..4b56db6f1 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -904,7 +904,7 @@ bool CommandLineInterface::processInput()
 		m_compiler->setEVMVersion(m_evmVersion);
 		// TODO: Perhaps we should not compile unless requested
 
-		OptimiserSettings settings = m_args.count(g_argOptimize) ? OptimiserSettings::enabled() : OptimiserSettings::minimal();
+		OptimiserSettings settings = m_args.count(g_argOptimize) ? OptimiserSettings::standard() : OptimiserSettings::minimal();
 		settings.expectedExecutionsPerDeployment = m_args[g_argOptimizeRuns].as<unsigned>();
 		settings.runYulOptimiser = m_args.count(g_strOptimizeYul);
 		settings.optimizeStackAllocation = settings.runYulOptimiser;
diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
index 3359fa322..eeac68be2 100644
--- a/test/ExecutionFramework.cpp
+++ b/test/ExecutionFramework.cpp
@@ -57,7 +57,7 @@ ExecutionFramework::ExecutionFramework():
 ExecutionFramework::ExecutionFramework(string const& _ipcPath, langutil::EVMVersion _evmVersion):
 	m_rpc(RPCSession::instance(_ipcPath)),
 	m_evmVersion(_evmVersion),
-	m_optimiserSettings(dev::test::Options::get().optimize ? solidity::OptimiserSettings::enabled() : solidity::OptimiserSettings::minimal()),
+	m_optimiserSettings(dev::test::Options::get().optimize ? solidity::OptimiserSettings::standard() : solidity::OptimiserSettings::minimal()),
 	m_showMessages(dev::test::Options::get().showMessages),
 	m_sender(m_rpc.account(0))
 {
diff --git a/test/liblll/ExecutionFramework.h b/test/liblll/ExecutionFramework.h
index b5c15f881..2f54afa8a 100644
--- a/test/liblll/ExecutionFramework.h
+++ b/test/liblll/ExecutionFramework.h
@@ -59,7 +59,7 @@ public:
 		bytes bytecode = lll::compileLLL(
 			_sourceCode,
 			dev::test::Options::get().evmVersion(),
-			m_optimiserSettings == solidity::OptimiserSettings::enabled(),
+			m_optimiserSettings == solidity::OptimiserSettings::standard(),
 			&errors
 		);
 		if (!errors.empty())
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
index b028e5176..f48f022ef 100644
--- a/test/libsolidity/Assembly.cpp
+++ b/test/libsolidity/Assembly.cpp
@@ -86,7 +86,7 @@ eth::AssemblyItems compileContract(std::shared_ptr<CharStream> _sourceCode)
 		{
 			Compiler compiler(
 				dev::test::Options::get().evmVersion(),
-				dev::test::Options::get().optimize ? OptimiserSettings::enabled() : OptimiserSettings::minimal()
+				dev::test::Options::get().optimize ? OptimiserSettings::standard() : OptimiserSettings::minimal()
 			);
 			compiler.compileContract(*contract, map<ContractDefinition const*, shared_ptr<Compiler const>>{}, bytes());
 
diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
index 5f0f66664..419bc8ad8 100644
--- a/test/libsolidity/SolidityOptimizer.cpp
+++ b/test/libsolidity/SolidityOptimizer.cpp
@@ -56,7 +56,7 @@ public:
 	{
 		OptimiserSettings previousSettings = std::move(m_optimiserSettings);
 		// This uses "none" / "full" while most other test frameworks use
-		// "minimal" / "enabled".
+		// "minimal" / "standard".
 		m_optimiserSettings = _optimize ? OptimiserSettings::full() : OptimiserSettings::none();
 		m_optimiserSettings.expectedExecutionsPerDeployment = _optimizeRuns;
 		bytes const& ret = compileAndRun(_sourceCode, _value, _contractName);