diff --git a/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out b/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out
index 1a390a98be10136d9b9a4b96bde2bea7bed38f25..ea250859fd311588a0490d4b02695aed9d49d11b 100644
--- a/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out
+++ b/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out
@@ -1,6 +1,6 @@
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - InternalLibrary1-0.1 (exe:lemon) (first run)
 Configuring InternalLibrary1-0.1...
diff --git a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out
index 808fb52eb1362cb6249de7dff56e658400753fb5..7e5b85598744a9bcd5081740ae00a65a79425fe5 100644
--- a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out
+++ b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out
@@ -2,7 +2,7 @@
 Downloading the latest package list from test-local-repo
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - pkg-1.0 (exe:my-exe) (first run)
 Configuring pkg-1.0...
diff --git a/cabal-testsuite/PackageTests/BuildToolDepends/setup.out b/cabal-testsuite/PackageTests/BuildToolDepends/setup.out
index 57493f50d62a995619ee1ab37c95dc01b84a6e0f..06c2569b5001a74ed0ecb5bc3335cbf93ab2f35a 100644
--- a/cabal-testsuite/PackageTests/BuildToolDepends/setup.out
+++ b/cabal-testsuite/PackageTests/BuildToolDepends/setup.out
@@ -1,6 +1,6 @@
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - pre-proc-999.999.999 (exe:zero-to-one) (first run)
  - client-0.1.0.0 (exe:hello-world) (first run)
diff --git a/cabal-testsuite/PackageTests/BuildTools/External/cabal.out b/cabal-testsuite/PackageTests/BuildTools/External/cabal.out
index 9eab0ac040df9ae552a07a327b139650ad6d24d4..a5f63dfc3daa9e4b03cd7d690e86660a975fe6b9 100644
--- a/cabal-testsuite/PackageTests/BuildTools/External/cabal.out
+++ b/cabal-testsuite/PackageTests/BuildTools/External/cabal.out
@@ -1,6 +1,6 @@
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - happy-999.999.999 (exe:happy) (first run)
  - client-0.1.0.0 (exe:hello-world) (first run)
diff --git a/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out b/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out
index 37de994b1f5f6ed857bd3282631489ed8a7d154d..98472f0fc7f2b29dbc22f187da2ac3880d10c110 100644
--- a/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out
+++ b/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out
@@ -1,6 +1,6 @@
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - foo-0.1.0.0 (exe:my-cpp) (first run)
  - foo-0.1.0.0 (lib) (first run)
diff --git a/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out b/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out
index 534f8f60cf3291757c3270ca9ca6e45f0d1c03f2..e89cb50a8e4294e61ab69a2b8b83d3e00705d3b2 100644
--- a/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out
+++ b/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out
@@ -1,6 +1,6 @@
 # cabal new-build
 Warning: <ROOT>/custom-setup-without-cabal.cabal: This package requires at least Cabal version 99999
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - custom-setup-without-cabal-1.0 (lib:custom-setup-without-cabal) (first run)
diff --git a/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out b/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out
index 485f8a076e961a5769181393e6e0c377f0702adf..f2bdafb5af7e36a42f28a8eefe5e028a18794b05 100644
--- a/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out
+++ b/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out
@@ -1,5 +1,5 @@
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - custom-setup-without-cabal-defaultMain-1.0 (lib:custom-setup-without-cabal-defaultMain) (first run)
diff --git a/cabal-testsuite/PackageTests/Exec/cabal.out b/cabal-testsuite/PackageTests/Exec/cabal.out
index 5dcd67280f2b6a88746e67f8936c65e2862bc4c5..d97b711ea60a5f93b554729c853aa313487de4c0 100644
--- a/cabal-testsuite/PackageTests/Exec/cabal.out
+++ b/cabal-testsuite/PackageTests/Exec/cabal.out
@@ -1,6 +1,6 @@
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - my-0.1 (exe:my-executable) (first run)
 Configuring my-0.1...
diff --git a/cabal-testsuite/PackageTests/ExecModern/cabal.out b/cabal-testsuite/PackageTests/ExecModern/cabal.out
index 97ddcc4a38950f4a3481741171136481ffab4493..da01911bbb92b46e4d605272ef8300dd39347bae 100644
--- a/cabal-testsuite/PackageTests/ExecModern/cabal.out
+++ b/cabal-testsuite/PackageTests/ExecModern/cabal.out
@@ -1,6 +1,6 @@
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - my-0.1 (exe:my-executable) (first run)
 Configuring executable 'my-executable' for my-0.1..
diff --git a/cabal-testsuite/PackageTests/InternalLibraries/cabal.out b/cabal-testsuite/PackageTests/InternalLibraries/cabal.out
index 4184d77d82a981faaf996e3fae40e35e9fa28da3..8017e6948aef476818da4805509d50c005e7a463 100644
--- a/cabal-testsuite/PackageTests/InternalLibraries/cabal.out
+++ b/cabal-testsuite/PackageTests/InternalLibraries/cabal.out
@@ -1,6 +1,6 @@
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - p-0.1.0.0 (lib:q) (first run)
  - p-0.1.0.0 (exe:foo) (first run)
diff --git a/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out b/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out
index f2e8d3aa665b24ef823cd4c3575a3866c70cac83..b50c5b0981b5bf6cc2e630ebedfca864caa16dd3 100644
--- a/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out
@@ -1,6 +1,6 @@
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - q-0.1.0.0 (exe:q) (first run)
 Configuring executable 'q' for q-0.1.0.0..
@@ -8,7 +8,7 @@ Preprocessing executable 'q' for q-0.1.0.0..
 Building executable 'q' for q-0.1.0.0..
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - p-1.0 (lib) (first run)
  - q-0.1.0.0 (exe:q) (configuration changed)
diff --git a/cabal-testsuite/PackageTests/NewBuild/T3827/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T3827/cabal.out
index 8bcea1b9ca0e7840f3939baeae128ef6ab0c3627..9c41558a2bd6bf916fcbe249c375a52b6e27d5d2 100644
--- a/cabal-testsuite/PackageTests/NewBuild/T3827/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/T3827/cabal.out
@@ -1,6 +1,6 @@
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - p-1.0 (lib) --enable-library-profiling (first run)
  - q-1.0 (exe:q) --enable-profiling (first run)
diff --git a/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out
index dfb2122bd10cac358dea05695988532b62735ad0..5b7f60b72d838aa43cdc80a081dad7071209fd2c 100644
--- a/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out
@@ -1,6 +1,6 @@
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - p-1.0 (lib) (first run)
  - q-1.0 (lib) (first run)
diff --git a/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out
index c5b0e610921d0de75c863ab333fca5ea58f3ca9b..397196d0f183f4df81441879edd09d0be2012fe2 100644
--- a/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out
@@ -1,6 +1,6 @@
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - p-1.0 (lib) (first run)
  - q-1.0 (lib) (first run)
diff --git a/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out b/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out
index e232a9d9f75892370a9f7e1039a7738072455adc..1ccfa17174b93a255c8e7f62b8768c15b5ba37aa 100644
--- a/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out
+++ b/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out
@@ -1,6 +1,6 @@
 # cabal new-configure
 'cabal.project.local' file already exists. Now overwriting it.
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following would be built:
  - NewConfigure-0.1.0.0 (lib) (first run)
diff --git a/cabal-testsuite/PackageTests/Regression/T3436/cabal.out b/cabal-testsuite/PackageTests/Regression/T3436/cabal.out
index 8e7c356c90c8923c3cb460d19e19250a9e6a9b75..511ff7d839f02c91bcd4e750f846e6c06d450c8f 100644
--- a/cabal-testsuite/PackageTests/Regression/T3436/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T3436/cabal.out
@@ -1,7 +1,7 @@
 # cabal new-build
 Warning: <ROOT>/custom-setup/custom-setup.cabal: This package requires at least Cabal version 99999
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - Cabal-99999 (lib:Cabal) (first run)
  - custom-setup-1.0 (lib:custom-setup) (first run)
diff --git a/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out b/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out
index aa3cd7a8fea6d6a22330e1a9aefe9e9956dcb75a..1f99758a9852ed82e49ea5017ec2ea28ec197240 100644
--- a/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out
+++ b/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out
@@ -2,7 +2,7 @@
 Downloading the latest package list from test-local-repo
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following would be built:
  - Cabal-99999 (lib) (requires download & build)
  - time-99999 (lib:time) (first run)
diff --git a/cabal-testsuite/PackageTests/Regression/T4202/cabal.out b/cabal-testsuite/PackageTests/Regression/T4202/cabal.out
index ed138d86b1ac3ab78332faf2ba32c5cd0ac6ab46..cd2b164ab4dbbc5e88f2bd2bdc4a45fba49394e3 100644
--- a/cabal-testsuite/PackageTests/Regression/T4202/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T4202/cabal.out
@@ -1,6 +1,6 @@
 # cabal new-build
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - p-1.0 (lib) (first run)
  - q-1.0 (exe:qexe) (first run)
@@ -11,13 +11,13 @@ Configuring executable 'qexe' for q-1.0..
 Preprocessing executable 'qexe' for q-1.0..
 Building executable 'qexe' for q-1.0..
 # cabal new-build
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - p-1.0 (lib) (file P.hs changed)
 Preprocessing library for p-1.0..
 Building library for p-1.0..
 # cabal new-build
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - q-1.0 (exe:qexe) (file <ROOT>/cabal.dist/work/dist/build/<ARCH>/ghc-<GHCVER>/p-1.0/cache/build changed)
 Preprocessing executable 'qexe' for q-1.0..
diff --git a/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out b/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out
index b53e34eec45131792b80b837de0a66fb1accc455..10afdfa3bd83f52953ce8d77ace3891df12caf0b 100644
--- a/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out
+++ b/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out
@@ -1,6 +1,6 @@
 # cabal new-test
 Resolving dependencies...
-Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation
+Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation
 In order, the following will be built:
  - my-0.1 (lib) (first run)
  - my-0.1 (test:test-Short) (first run)