diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs
index 90028bf947d295a41b482f82103121a15825b4e5..6f330707bb9dc6a0d676125de8c42fcc864c2572 100644
--- a/compiler/GHC/Driver/Session.hs
+++ b/compiler/GHC/Driver/Session.hs
@@ -1461,9 +1461,15 @@ dynamic_flags_deps = [
(setDumpFlag Opt_D_dump_call_arity)
, make_ord_flag defGhcFlag "ddump-exitify"
(setDumpFlag Opt_D_dump_exitify)
- , make_ord_flag defGhcFlag "ddump-stranal"
+ , make_dep_flag defGhcFlag "ddump-stranal"
(setDumpFlag Opt_D_dump_dmdanal)
- , make_ord_flag defGhcFlag "ddump-str-signatures"
+ "Use `-ddump-dmdanal` instead"
+ , make_dep_flag defGhcFlag "ddump-str-signatures"
+ (setDumpFlag Opt_D_dump_dmd_signatures)
+ "Use `-ddump-dmd-signatures` instead"
+ , make_ord_flag defGhcFlag "ddump-dmdanal"
+ (setDumpFlag Opt_D_dump_dmdanal)
+ , make_ord_flag defGhcFlag "ddump-dmd-signatures"
(setDumpFlag Opt_D_dump_dmd_signatures)
, make_ord_flag defGhcFlag "ddump-cpranal"
(setDumpFlag Opt_D_dump_cpranal)
diff --git a/docs/users_guide/debugging.rst b/docs/users_guide/debugging.rst
index 3e22bc90d5b266e22d30342edb8f41684e8113ec..2b7c43b3f7f4e87dba774f91ebd9654b7b512e8a 100644
--- a/docs/users_guide/debugging.rst
+++ b/docs/users_guide/debugging.rst
@@ -409,6 +409,12 @@ subexpression elimination pass.
to determine whether the inlining is beneficial.
.. ghc-flag:: -ddump-stranal
+ :shortdesc: *(deprecated)* Alias for :ghc-flag:`-ddump-dmdanal`
+ :type: dynamic
+
+ Has been renamed to :ghc-flag:`-ddump-dmdanal`.
+
+.. ghc-flag:: -ddump-dmdanal
:shortdesc: Dump demand analysis output
:type: dynamic
@@ -418,6 +424,12 @@ subexpression elimination pass.
annotations.
.. ghc-flag:: -ddump-str-signatures
+ :shortdesc: *(deprecated)* Alias for :ghc-flag:`-ddump-dmd-signatures`
+ :type: dynamic
+
+ Has been renamed to :ghc-flag:`-ddump-dmd-signatures`.
+
+.. ghc-flag:: -ddump-dmd-signatures
:shortdesc: Dump top-level demand signatures
:type: dynamic
diff --git a/testsuite/tests/simplCore/should_compile/T13543.stderr b/testsuite/tests/simplCore/should_compile/T13543.stderr
index 94c0b76bfcef0a0724ec9fb7bb4d95bfdb409948..95f249048cc5c148cd6b4a789f9adcdd0a932e1c 100644
--- a/testsuite/tests/simplCore/should_compile/T13543.stderr
+++ b/testsuite/tests/simplCore/should_compile/T13543.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
Foo.$trModule:
Foo.f: <1!P(1L)><1!P(L)><1!P(L)>
Foo.g: <1!P(1!P(L),1!P(L))>
@@ -13,7 +13,7 @@ Foo.g: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
Foo.$trModule:
Foo.f: <1!P(1L)><1!P(L)><1!P(L)>
Foo.g: <1!P(1!P(L),1!P(L))>
diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index 01e49f3853eee4fe59da3f1fb17e14f6ff4a9d89..bd90feb59882eceb0a4015f1699caa5bd6516d20 100644
--- a/testsuite/tests/simplCore/should_compile/all.T
+++ b/testsuite/tests/simplCore/should_compile/all.T
@@ -246,7 +246,7 @@ test('T13410', normal, compile, ['-O2'])
test('T13468',
normal,
makefile_test, ['T13468'])
-test('T13543', only_ways(['optasm']), compile, ['-ddump-str-signatures -ddump-cpr-signatures'])
+test('T13543', only_ways(['optasm']), compile, ['-ddump-dmd-signatures -ddump-cpr-signatures'])
test('T11272', normal, makefile_test, ['T11272'])
test('T12600', normal, makefile_test, ['T12600'])
test('T13157', normal, compile, ['-ddump-simpl -dno-typeable-binds -dsuppress-uniques -dsuppress-all -O'])
diff --git a/testsuite/tests/stranal/should_compile/all.T b/testsuite/tests/stranal/should_compile/all.T
index 4560e47d4e6d88b3bfc12172993bcf51d371ef22..b13bb1d87f434ca642be6c652521eab15475f73c 100644
--- a/testsuite/tests/stranal/should_compile/all.T
+++ b/testsuite/tests/stranal/should_compile/all.T
@@ -65,9 +65,9 @@ test('T17819', [ grep_errmsg(r'(wfoo|wbar)') ], compile, ['-ddump-simpl'])
# We care about the call demand on $wg
test('T18903', [ grep_errmsg(r'Dmd=\S+C\S+') ], compile, ['-ddump-simpl -dsuppress-uniques'])
# We care about the call demand on $wg1 and $wg2
-test('T18894', [ grep_errmsg(r'Dmd=\S+C\S+') ], compile, ['-ddump-stranal -dsuppress-uniques'])
+test('T18894', [ grep_errmsg(r'Dmd=\S+C\S+') ], compile, ['-ddump-dmdanal -dsuppress-uniques'])
# We care about the Arity 2 on eta, as a result of the annotated Dmd
-test('T18894b', [ grep_errmsg(r'Arity=2') ], compile, ['-ddump-stranal -dsuppress-uniques -fno-call-arity -dppr-cols=200'])
+test('T18894b', [ grep_errmsg(r'Arity=2') ], compile, ['-ddump-dmdanal -dsuppress-uniques -fno-call-arity -dppr-cols=200'])
# We care about the workers of f,g,h,i:
test('T18982', [ grep_errmsg(r'\$w. .*Int#$') ], compile, ['-dppr-cols=1000 -ddump-simpl -dsuppress-idinfo -dsuppress-uniques'])
# We care about the type of $wyeah. The unlifted Gram constructor should unbox
@@ -81,7 +81,7 @@ test('T19882b', normal, compile, [''])
# We want that the 'go' joinrec in the unfolding has been worker/wrappered.
# So we simply grep for 'jump $wgo' and hope we find more than 2 call sites:
test('T20510', [ grep_errmsg(r'jump \$wgo') ], compile, ['-dsuppress-uniques -ddump-exitify'])
-test('T20817', [ grep_errmsg(r'Str') ], compile, ['-dsuppress-uniques -ddump-stranal'])
+test('T20817', [ grep_errmsg(r'Str') ], compile, ['-dsuppress-uniques -ddump-dmdanal'])
# T21150: Check that t{,1,2} haven't been inlined.
test('T21150', [ grep_errmsg(r'( t\d? :: Int)') ], compile, ['-dsuppress-uniques -ddump-exitify'])
diff --git a/testsuite/tests/stranal/sigs/BottomFromInnerLambda.stderr b/testsuite/tests/stranal/sigs/BottomFromInnerLambda.stderr
index 953727a119923ccaecc589dffbf3b50944e42b27..0449aa96035af32a8e7fb5fda6bf4be1ec2cf695 100644
--- a/testsuite/tests/stranal/sigs/BottomFromInnerLambda.stderr
+++ b/testsuite/tests/stranal/sigs/BottomFromInnerLambda.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
BottomFromInnerLambda.expensive: <1!P(SL)>
BottomFromInnerLambda.f: <1!P(S)><1!P(S)>b
@@ -11,7 +11,7 @@ BottomFromInnerLambda.f: b
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
BottomFromInnerLambda.expensive: <1!P(1L)>
BottomFromInnerLambda.f: <1!P(1S)><1!P(S)>b
diff --git a/testsuite/tests/stranal/sigs/DmdAnalGADTs.stderr b/testsuite/tests/stranal/sigs/DmdAnalGADTs.stderr
index 2f7b6376f0829d8eb54a58b9e71fc5e7d49dff7c..d002a4a6f5df0c301ee146e70729c5c71ed71b4d 100644
--- a/testsuite/tests/stranal/sigs/DmdAnalGADTs.stderr
+++ b/testsuite/tests/stranal/sigs/DmdAnalGADTs.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
DmdAnalGADTs.diverges: b
DmdAnalGADTs.f: <1L>
DmdAnalGADTs.f': <1L>
@@ -19,7 +19,7 @@ DmdAnalGADTs.hasStrSig: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
DmdAnalGADTs.diverges: b
DmdAnalGADTs.f: <1L>
DmdAnalGADTs.f': <1L>
diff --git a/testsuite/tests/stranal/sigs/FacState.stderr b/testsuite/tests/stranal/sigs/FacState.stderr
index 133ad6ec26f2fc92f23e6a5da7569310e80921af..6a705c0fef28b2cf02ecb596227da66a7edd6e45 100644
--- a/testsuite/tests/stranal/sigs/FacState.stderr
+++ b/testsuite/tests/stranal/sigs/FacState.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
FacState.fac: <S,1*U(U)><L,U>dm1(d,tm1(d))
diff --git a/testsuite/tests/stranal/sigs/HyperStrUse.stderr b/testsuite/tests/stranal/sigs/HyperStrUse.stderr
index 23c437158e70972cc31b9a7ee7d46802c1fb9699..373c158ae8b3001d7d33eed2f5937b239958d555 100644
--- a/testsuite/tests/stranal/sigs/HyperStrUse.stderr
+++ b/testsuite/tests/stranal/sigs/HyperStrUse.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
HyperStrUse.f: <1!P(1!P(L),A)><1L>
@@ -9,7 +9,7 @@ HyperStrUse.f: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
HyperStrUse.f: <1!P(1!P(L),A)><1L>
diff --git a/testsuite/tests/stranal/sigs/NewtypeArity.stderr b/testsuite/tests/stranal/sigs/NewtypeArity.stderr
index 7190bedc355dcd647ed2381e1bb7a6249b0a560a..f16bbf129a5b903f5687cc0b03f38336cecf6b14 100644
--- a/testsuite/tests/stranal/sigs/NewtypeArity.stderr
+++ b/testsuite/tests/stranal/sigs/NewtypeArity.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
Test.t: <1!P(L)><1!P(L)>
Test.t2: <1!P(L)><1!P(L)>
@@ -11,7 +11,7 @@ Test.t2: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
Test.t: <1!P(L)><1!P(L)>
Test.t2: <1!P(L)><1!P(L)>
diff --git a/testsuite/tests/stranal/sigs/StrAnalExample.stderr b/testsuite/tests/stranal/sigs/StrAnalExample.stderr
index 08485e735a4f9f2def9d6dc65fb5a2181e67b974..9fab92d121e657c834ab9656ceabdae0e1cf3679 100644
--- a/testsuite/tests/stranal/sigs/StrAnalExample.stderr
+++ b/testsuite/tests/stranal/sigs/StrAnalExample.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
StrAnalExample.foo: <1L>
@@ -9,7 +9,7 @@ StrAnalExample.foo:
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
StrAnalExample.foo: <1L>
diff --git a/testsuite/tests/stranal/sigs/T12370.stderr b/testsuite/tests/stranal/sigs/T12370.stderr
index 3070069a1ab853c2ffd37a42888e4b3fee88c2e4..c2400ac33a36ba1879da89cea871197ab2f72c1f 100644
--- a/testsuite/tests/stranal/sigs/T12370.stderr
+++ b/testsuite/tests/stranal/sigs/T12370.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T12370.bar: <1!P(L)><1!P(L)>
T12370.foo: <1!P(1!P(L),1!P(L))>
@@ -11,7 +11,7 @@ T12370.foo: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T12370.bar: <1!P(L)><1!P(L)>
T12370.foo: <1!P(1!P(L),1!P(L))>
diff --git a/testsuite/tests/stranal/sigs/T13331.stderr b/testsuite/tests/stranal/sigs/T13331.stderr
index feebb4eaa139210599d2bab159e527728956c3ed..e7d7e8f2a94d78d9d71a6df18657edc3781d8333 100644
--- a/testsuite/tests/stranal/sigs/T13331.stderr
+++ b/testsuite/tests/stranal/sigs/T13331.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T13331.naiveInsertInt: <1L><L><1L>
@@ -9,7 +9,7 @@ T13331.naiveInsertInt:
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T13331.naiveInsertInt: <1L><L><1L>
diff --git a/testsuite/tests/stranal/sigs/T13380c.stderr b/testsuite/tests/stranal/sigs/T13380c.stderr
index 2001614a58889fb15a00bb5dd556895656f1b3e8..828ae54545f732ba1b63937cc440a9832fa1cb0a 100644
--- a/testsuite/tests/stranal/sigs/T13380c.stderr
+++ b/testsuite/tests/stranal/sigs/T13380c.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
Lib.$trModule:
Lib.f: <S,1*U(U)><S,1*U(U)><L,U>
@@ -11,7 +11,7 @@ Lib.f:
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
Lib.$trModule:
Lib.f: <S,1*U(U)><S,1*U(U)><L,U>
diff --git a/testsuite/tests/stranal/sigs/T13380f.stderr b/testsuite/tests/stranal/sigs/T13380f.stderr
index 1da38aeeeeefbb37b4ca55dcf28794f5abbfb5d3..26ef9791f4deb3d1446023834ee93b88e295a4cd 100644
--- a/testsuite/tests/stranal/sigs/T13380f.stderr
+++ b/testsuite/tests/stranal/sigs/T13380f.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T13380f.f: <1!P(L)><1!P(L)><L>
T13380f.g: <1!P(L)><ML><L>
T13380f.h: <1!P(L)><ML><L>
@@ -19,7 +19,7 @@ T13380f.unsafeCall: 1(, 1)
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T13380f.f: <1!P(L)><1!P(L)><L>
T13380f.g: <1!P(L)><ML><L>
T13380f.h: <1!P(L)><ML><L>
diff --git a/testsuite/tests/stranal/sigs/T16197b.stderr b/testsuite/tests/stranal/sigs/T16197b.stderr
index 88988c266b247a4d5f685546e1586c5e8cbc66f1..1a932bec22b866f27e49be475f031c5fbe5b3610 100644
--- a/testsuite/tests/stranal/sigs/T16197b.stderr
+++ b/testsuite/tests/stranal/sigs/T16197b.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
f: <1!P(L)>
@@ -9,7 +9,7 @@ f: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
f: <1!P(1L)>
diff --git a/testsuite/tests/stranal/sigs/T16859.stderr b/testsuite/tests/stranal/sigs/T16859.stderr
index 9f7c3c9e5da9a2f2134ff4d7cb6d0cdd51b42d38..bb9b878043dfa88a44bca0a60cfbebbea4d1c6da 100644
--- a/testsuite/tests/stranal/sigs/T16859.stderr
+++ b/testsuite/tests/stranal/sigs/T16859.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T16859.bar: <1!A><L>
T16859.baz: <1L><1!P(L)><1C(1,L)>
T16859.buz: <1!P(L,L)>
@@ -25,7 +25,7 @@ T16859.n_uniq: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T16859.bar: <1!A><L>
T16859.baz: <1L><1!P(L)><1C(1,L)>
T16859.buz: <1!P(L,L)>
diff --git a/testsuite/tests/stranal/sigs/T17932.stderr b/testsuite/tests/stranal/sigs/T17932.stderr
index 52b365bcc212e339e5a149967fdaba5cd911937d..feec04e0324cbed7054c32e66f8ff6f61a91f0d6 100644
--- a/testsuite/tests/stranal/sigs/T17932.stderr
+++ b/testsuite/tests/stranal/sigs/T17932.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T17932.flags: <1!P(1L,1L)>
@@ -9,7 +9,7 @@ T17932.flags:
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T17932.flags: <1!P(1L,1L)>
diff --git a/testsuite/tests/stranal/sigs/T18086.stderr b/testsuite/tests/stranal/sigs/T18086.stderr
index ce1471102594498610ac793e8673f9a5643db069..9a3c55685f719ab4a48d516504293cbd105c63ba 100644
--- a/testsuite/tests/stranal/sigs/T18086.stderr
+++ b/testsuite/tests/stranal/sigs/T18086.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T18086.m: <L>x
T18086.panic: <L>x
@@ -11,7 +11,7 @@ T18086.panic: b
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T18086.m: <L>x
T18086.panic: <L>x
diff --git a/testsuite/tests/stranal/sigs/T18907.stderr b/testsuite/tests/stranal/sigs/T18907.stderr
index 235872a8ebedfc35d0f6a1a007e7912106c7382a..6e92f76bfcf3d9ca42faac4bedf9fa5a12044e36 100644
--- a/testsuite/tests/stranal/sigs/T18907.stderr
+++ b/testsuite/tests/stranal/sigs/T18907.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T18907.f: <1L>
T18907.g: <1P(SL,L,L,L,L)>
T18907.h: <1!A><1L>
@@ -15,7 +15,7 @@ T18907.m: b
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T18907.f: <1L>
T18907.g: <1P(SL,L,L,L,L)>
T18907.h: <1!A><1L>
diff --git a/testsuite/tests/stranal/sigs/T18957.stderr b/testsuite/tests/stranal/sigs/T18957.stderr
index 94044e754bced165ead219318d1a9bc6fbf65f51..4599a20fd51f16b5e50c0f7934dcabe15cb865e8 100644
--- a/testsuite/tests/stranal/sigs/T18957.stderr
+++ b/testsuite/tests/stranal/sigs/T18957.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T18957.g: <MC(1,L)><1L>
T18957.h1: <SC(M,L)><1L>
T18957.h2: <1C(M,L)><1L>
@@ -17,7 +17,7 @@ T18957.seq':
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T18957.g: <MC(1,L)><1L>
T18957.h1: <SC(M,L)><1L>
T18957.h2: <1C(M,L)><1L>
diff --git a/testsuite/tests/stranal/sigs/T19407.stderr b/testsuite/tests/stranal/sigs/T19407.stderr
index a855d89810cee73faaa1c5bbeb7a217dae74257d..19f23f8a4114c42dcac09cd694db64130c9aa3b8 100644
--- a/testsuite/tests/stranal/sigs/T19407.stderr
+++ b/testsuite/tests/stranal/sigs/T19407.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T19407.f: <SP(1P(1L,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A),ML)>
T19407.g: <1!P(1L,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A)><MP(A,1L)>
T19407.h: <1!P(1L,A)>
@@ -15,7 +15,7 @@ T19407.n: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T19407.f: <1P(1P(1L,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A),ML)>
T19407.g: <1!P(1L,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A)><MP(A,1L)>
T19407.h: <1!P(1L,A)>
diff --git a/testsuite/tests/stranal/sigs/T19871.stderr b/testsuite/tests/stranal/sigs/T19871.stderr
index 41f557d08aab2f3e8c78835baa7d3d3b3d230fc9..91a8aab415a1b443759efc6060362a57e99f0761 100644
--- a/testsuite/tests/stranal/sigs/T19871.stderr
+++ b/testsuite/tests/stranal/sigs/T19871.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T19871.absent: <1P(1L,ML,A,A,A,A,A,A,A,A,A,A)>
T19871.ann: <1P(SL,L,L,L,L,L,L,L,L,L,L,L)>
T19871.f1: <1!P(1L,A,A,A,A,A,A,A,A,A,A,A)>
@@ -41,7 +41,7 @@ T19871.update: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T19871.absent: <1P(1L,ML,A,A,A,A,A,A,A,A,A,A)>
T19871.ann: <1P(SL,L,L,L,L,L,L,L,L,L,L,L)>
T19871.f1: <1!P(1L,A,A,A,A,A,A,A,A,A,A,A)>
diff --git a/testsuite/tests/stranal/sigs/T20746.stderr b/testsuite/tests/stranal/sigs/T20746.stderr
index 109bff9198a8396cf18fd087b95098c9e2d6610a..ec021094079ce60c6d79954033b52ed623389f9b 100644
--- a/testsuite/tests/stranal/sigs/T20746.stderr
+++ b/testsuite/tests/stranal/sigs/T20746.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
Foo.f: <LP(A,L,A)><L>
Foo.foogle: <L><L>
@@ -11,7 +11,7 @@ Foo.foogle: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
Foo.f: <MP(A,1C(1,L),A)><L>
Foo.foogle: <L><L>
diff --git a/testsuite/tests/stranal/sigs/T20746b.stderr b/testsuite/tests/stranal/sigs/T20746b.stderr
index 7e6fada4e58d65bd97b0cc5665e2fc5fb44bae60..0500cf04414ed86886980332ba6cab3b7d300d14 100644
--- a/testsuite/tests/stranal/sigs/T20746b.stderr
+++ b/testsuite/tests/stranal/sigs/T20746b.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T20746b.f: <1L><L><L>
T20746b.mightThrow: <L><L>
@@ -11,7 +11,7 @@ T20746b.mightThrow: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T20746b.f: <1L><L><L>
T20746b.mightThrow: <L><L>
diff --git a/testsuite/tests/stranal/sigs/T21081.stderr b/testsuite/tests/stranal/sigs/T21081.stderr
index e6d2f2c30988d30cb390fd7bc6fbe718a2c101bf..3256e7e9d245327e84fa10923e616f3953547ff6 100644
--- a/testsuite/tests/stranal/sigs/T21081.stderr
+++ b/testsuite/tests/stranal/sigs/T21081.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T21081.blah: <LC(L,C(1,L))><1!P(1L)>
T21081.blurg: <S!P(SL)>
T21081.blurg2: <S!P(SL)>
@@ -45,7 +45,7 @@ T21081.snd':
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T21081.blah: <LC(L,C(1,L))><1!P(1L)>
T21081.blurg: <1!P(SL)>
T21081.blurg2: <1!P(SL)>
diff --git a/testsuite/tests/stranal/sigs/T21119.stderr b/testsuite/tests/stranal/sigs/T21119.stderr
index a0549af229b616555944f0a282a43a0e517e950c..de855d29d94b8e8ed8d9a318ff3d4132d14796ce 100644
--- a/testsuite/tests/stranal/sigs/T21119.stderr
+++ b/testsuite/tests/stranal/sigs/T21119.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T21119.$fMyShowInt: <1!A>
T21119.$fMyShowTuple2: <1!A>
T21119.get: <1!P(1!P(L),1!P(L))><1!P(L)><1L>
@@ -19,7 +19,7 @@ T21119.throwIndexError: b
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T21119.$fMyShowInt: <1!A>
T21119.$fMyShowTuple2: <1!A>
T21119.get: <1!P(1!P(L),1!P(L))><1!P(L)><1L>
diff --git a/testsuite/tests/stranal/sigs/T21717.stderr b/testsuite/tests/stranal/sigs/T21717.stderr
index b971191531942f9da99e47c67f6f47ba657cbe8b..372312b4f6323aa083fd98ab8e518ce9003d3f18 100644
--- a/testsuite/tests/stranal/sigs/T21717.stderr
+++ b/testsuite/tests/stranal/sigs/T21717.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T21717.g: <SC(S,P(ML,ML))>
@@ -9,7 +9,7 @@ T21717.g: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T21717.g: <SC(S,P(ML,ML))>
diff --git a/testsuite/tests/stranal/sigs/T21737.stderr b/testsuite/tests/stranal/sigs/T21737.stderr
index fe4d92b628561422634472d19f68bf1727abe9b3..8d4409840b98c71b78d468b4e8dd86f4a1adcdca 100644
--- a/testsuite/tests/stranal/sigs/T21737.stderr
+++ b/testsuite/tests/stranal/sigs/T21737.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T21737.app: <1C(1,L)><L>
T21737.boxed: <1!P(1!P(L),1!P(L))><1!P(1!P(L),1P(1L,1L,1L))>
T21737.f: <1!P(L)><1!P(1!P(L),1!P(L))><1P(1P(1L,1L,1L,1L))>
@@ -19,7 +19,7 @@ T21737.yes: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T21737.app: <1C(1,L)><L>
T21737.boxed: <1!P(1!P(L),1!P(L))><1!P(1!P(L),1P(1L,1L,1L))>
T21737.f: <1!P(L)><1!P(1!P(L),1!P(L))><1P(1P(1L,1L,1L,1L))>
diff --git a/testsuite/tests/stranal/sigs/T21754.stderr b/testsuite/tests/stranal/sigs/T21754.stderr
index 0370380d8aadc03ecbdb40c4d1bf93293dea2aa9..7573688c8c4e123de0d30af6e6fdcd32467a2c91 100644
--- a/testsuite/tests/stranal/sigs/T21754.stderr
+++ b/testsuite/tests/stranal/sigs/T21754.stderr
@@ -1,10 +1,10 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
Test.f: <1L>
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
Test.f: <1L>
diff --git a/testsuite/tests/stranal/sigs/T21888.stderr b/testsuite/tests/stranal/sigs/T21888.stderr
index ff046ca2cfc9f8bdc1fbb675d157c0dc078353f9..e98163c241c9c8428f17cd9b00cb9337b1d76b63 100644
--- a/testsuite/tests/stranal/sigs/T21888.stderr
+++ b/testsuite/tests/stranal/sigs/T21888.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
Data.MemoTrie.$fHasTrieBool: <1!P(L,L)>
Data.MemoTrie.$fHasTrieEither: <1C(1,L)><1C(1,L)><1!P(L,L)>
Data.MemoTrie.$fHasTrieInteger: <1!P(1!P(S,1!P(1!P(S,1L),1!P(S,1L))),1!P(S,1!P(1!P(S,1L),1!P(S,1L))))>b
@@ -19,7 +19,7 @@ Data.MemoTrie.$fHasTrieUnit:
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
Data.MemoTrie.$fHasTrieBool: <1!P(L,L)>
Data.MemoTrie.$fHasTrieEither: <1C(1,L)><1C(1,L)><1!P(L,L)>
Data.MemoTrie.$fHasTrieInteger: <1!P(1!P(B,1!P(1!P(B,1!P(L,L)),1!P(B,1!P(L,L)))),1!P(B,1!P(1!B,1!B)))>b
diff --git a/testsuite/tests/stranal/sigs/T21888a.stderr b/testsuite/tests/stranal/sigs/T21888a.stderr
index 21127cc2a53b72d70e3884bf0d6eb434062cf6db..bf4b4777a3d109f64dc1f71d6e3f929687b0a086 100644
--- a/testsuite/tests/stranal/sigs/T21888a.stderr
+++ b/testsuite/tests/stranal/sigs/T21888a.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T21888a.f: <L>
T21888a.g: <1L><S!P(L)>
T21888a.wombat: <S!P(S)>b
@@ -13,7 +13,7 @@ T21888a.wombat: b
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T21888a.f: <L>
T21888a.g: <1L><1!P(L)>
T21888a.wombat: <1!P(S)>b
diff --git a/testsuite/tests/stranal/sigs/T22241.stderr b/testsuite/tests/stranal/sigs/T22241.stderr
index 284fe2cf7661e99f88efe65dae85ce6688dcbbc3..8993d5b3b79bd130ac11a684bdeb62ff4e3ec406 100644
--- a/testsuite/tests/stranal/sigs/T22241.stderr
+++ b/testsuite/tests/stranal/sigs/T22241.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T22241.f: <1L><S!P(L)>
T22241.g: <L><1!P(L)><A>
T22241.get: <1!P(A,1L)>
@@ -15,7 +15,7 @@ T22241.unD: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T22241.f: <1L><1!P(SL)>
T22241.g: <ML><1!P(L)><A>
T22241.get: <1!P(A,1L)>
diff --git a/testsuite/tests/stranal/sigs/T5075.stderr b/testsuite/tests/stranal/sigs/T5075.stderr
index a3eea5d2cdecace8e6f65c585c41246d942fadbd..e7bf4a57db5733b45f7b819e26da786ee8068146 100644
--- a/testsuite/tests/stranal/sigs/T5075.stderr
+++ b/testsuite/tests/stranal/sigs/T5075.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T5075.f: <SP(A,A,SC(S,C(1,L)),A,A,A,A,A)><LP(A,A,LC(S,C(1,L)),A,A,A,L)><L>
T5075.g: <1L><S!P(L)>
T5075.h: <S!P(L)>
@@ -13,7 +13,7 @@ T5075.h:
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T5075.f: <SP(A,A,SC(S,C(1,L)),A,A,A,A,A)><LP(A,A,LC(S,C(1,L)),A,A,A,L)><L>
T5075.g: <1L><S!P(L)>
T5075.h: <1!P(L)>
diff --git a/testsuite/tests/stranal/sigs/T6070.stderr b/testsuite/tests/stranal/sigs/T6070.stderr
index 891cf6c8d699b17d4f38e7b813a1194cc9857335..b21caf43bc35c806e25862fb46148adc0f0274ab 100644
--- a/testsuite/tests/stranal/sigs/T6070.stderr
+++ b/testsuite/tests/stranal/sigs/T6070.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T6070.c: <1L>
T6070.h: <1!P(L,L)><1!P(L)>
@@ -11,7 +11,7 @@ T6070.h: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T6070.c: <1L>
T6070.h: <1!P(L,L)><1!P(L)>
diff --git a/testsuite/tests/stranal/sigs/T8569.stderr b/testsuite/tests/stranal/sigs/T8569.stderr
index 0330cc6b617c507a4627682076255df3d2214976..b7ea9415c4861d3dd014951427a9753df0d8b22e 100644
--- a/testsuite/tests/stranal/sigs/T8569.stderr
+++ b/testsuite/tests/stranal/sigs/T8569.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T8569.addUp: <1L><L>
@@ -9,7 +9,7 @@ T8569.addUp:
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T8569.addUp: <1L><L>
diff --git a/testsuite/tests/stranal/sigs/T8598.stderr b/testsuite/tests/stranal/sigs/T8598.stderr
index 00542be6685f6d0c10707a0e647c4f25f4acb655..7556eb1df38629c7ce6214c405f5044b877c9b96 100644
--- a/testsuite/tests/stranal/sigs/T8598.stderr
+++ b/testsuite/tests/stranal/sigs/T8598.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T8598.fun: <1!P(L)>
@@ -9,7 +9,7 @@ T8598.fun: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
T8598.fun: <1!P(L)>
diff --git a/testsuite/tests/stranal/sigs/UnsatFun.stderr b/testsuite/tests/stranal/sigs/UnsatFun.stderr
index c6f131d8cb0664c2f06ede8b93c87d5225240110..3e2347587c4b308e7cc20ab704f050ad74327bdf 100644
--- a/testsuite/tests/stranal/sigs/UnsatFun.stderr
+++ b/testsuite/tests/stranal/sigs/UnsatFun.stderr
@@ -1,5 +1,5 @@
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
UnsatFun.f: <1!P(S)><B>b
UnsatFun.g: <1!P(S)>b
UnsatFun.g': <MS>
@@ -21,7 +21,7 @@ UnsatFun.h3: 1
-==================== Strictness signatures ====================
+==================== Demand signatures ====================
UnsatFun.f: <1!P(S)><B>b
UnsatFun.g: <1!P(S)>b
UnsatFun.g': <MS>
diff --git a/testsuite/tests/stranal/sigs/all.T b/testsuite/tests/stranal/sigs/all.T
index bef6797b7d2ec1b683d12d09a73ca67bac461c86..d28bec500b11f516f251c85199b8ff01da8e3e89 100644
--- a/testsuite/tests/stranal/sigs/all.T
+++ b/testsuite/tests/stranal/sigs/all.T
@@ -1,7 +1,7 @@
# This directory contains tests where we annotate functions with expected
# type signatures, and verify that these actually those found by the compiler
-setTestOpts(extra_hc_opts('-ddump-str-signatures -ddump-cpr-signatures -dno-typeable-binds'))
+setTestOpts(extra_hc_opts('-ddump-dmd-signatures -ddump-cpr-signatures -dno-typeable-binds'))
# We are testing the result of an optimization, so no use
# running them in various runtimes