Diagnostic codes: acccept test changes

The testsuite output now contains diagnostic codes, so many tests need
to be updated at once.
We decided it was best to keep the diagnostic codes in the testsuite
output, so that contributors don't inadvertently make changes to the
diagnostic codes.

102 files changed, 260 insertions, 223 deletions

diff --git a/testsuite/tests/rename/should_fail/ExplicitForAllRules2.stderr b/testsuite/tests/rename/should_fail/ExplicitForAllRules2.stderr
index 909cc0ae20..8930d4d1fd 100644
--- a/testsuite/tests/rename/should_fail/ExplicitForAllRules2.stderr
+++ b/testsuite/tests/rename/should_fail/ExplicitForAllRules2.stderr
@@ -1,10 +1,10 @@
 
-ExplicitForAllRules2.hs:6:41: error:
+ExplicitForAllRules2.hs:6:41: error: [GHC-76037]
     Not in scope: type variable ‘b’
 
 ExplicitForAllRules2.hs:7:11: error:
     Rule "new5":
     Forall'd variable ‘x’ does not appear on left hand side
 
-ExplicitForAllRules2.hs:8:49: error:
+ExplicitForAllRules2.hs:8:49: error: [GHC-76037]
     Not in scope: type variable ‘c’
diff --git a/testsuite/tests/rename/should_fail/RnStaticPointersFail01.stderr b/testsuite/tests/rename/should_fail/RnStaticPointersFail01.stderr
index 52adc5b55b..ce9052593e 100644
--- a/testsuite/tests/rename/should_fail/RnStaticPointersFail01.stderr
+++ b/testsuite/tests/rename/should_fail/RnStaticPointersFail01.stderr
@@ -1,6 +1,6 @@
 
-RnStaticPointersFail01.hs:5:7:
-    ‘x’  is used in a static form but it is not closed because it
-    is not let-bound.
-    In the expression: static x
-    In an equation for ‘f’: f x = static x
+RnStaticPointersFail01.hs:5:7: error: [GHC-88431]
+    • ‘x’ is used in a static form but it is not closed because it
+      is not let-bound.
+    • In the expression: static x
+      In an equation for ‘f’: f x = static x
diff --git a/testsuite/tests/rename/should_fail/RnStaticPointersFail02.stderr b/testsuite/tests/rename/should_fail/RnStaticPointersFail02.stderr
index 6367162c68..07405667df 100644
--- a/testsuite/tests/rename/should_fail/RnStaticPointersFail02.stderr
+++ b/testsuite/tests/rename/should_fail/RnStaticPointersFail02.stderr
@@ -1,5 +1,5 @@
 
-RnStaticPointersFail02.hs:5:12: error:
+RnStaticPointersFail02.hs:5:12: error: [GHC-31891]
     • Illegal term-level use of the type constructor or class ‘T’
     • defined at RnStaticPointersFail02.hs:7:1
     • In the body of a static form: T
diff --git a/testsuite/tests/rename/should_fail/RnStaticPointersFail03.stderr b/testsuite/tests/rename/should_fail/RnStaticPointersFail03.stderr
index 3ba18c6869..6ccee354a9 100644
--- a/testsuite/tests/rename/should_fail/RnStaticPointersFail03.stderr
+++ b/testsuite/tests/rename/should_fail/RnStaticPointersFail03.stderr
@@ -1,29 +1,29 @@
 
-RnStaticPointersFail03.hs:8:7:
-    ‘x’ is used in a static form but it is not closed because it
-    is not let-bound.
-    In the expression: static (x . id)
-    In an equation for ‘f’: f x = static (x . id)
+RnStaticPointersFail03.hs:8:7: error: [GHC-88431]
+    • ‘x’ is used in a static form but it is not closed because it
+      is not let-bound.
+    • In the expression: static (x . id)
+      In an equation for ‘f’: f x = static (x . id)
 
-RnStaticPointersFail03.hs:10:8:
-    ‘k’ is used in a static form but it is not closed because it
-    uses ‘x’ which is not let-bound.
-    In the expression: static (k . id)
-    In an equation for ‘f0’:
-         f0 x
-           = static (k . id)
-           where
-               k = const (const () x)
+RnStaticPointersFail03.hs:10:8: error: [GHC-88431]
+    • ‘k’ is used in a static form but it is not closed because it
+      uses ‘x’ which is not let-bound.
+    • In the expression: static (k . id)
+      In an equation for ‘f0’:
+          f0 x
+            = static (k . id)
+            where
+                k = const (const () x)
 
-RnStaticPointersFail03.hs:19:15:
-    ‘g’ is used in a static form but it is not closed because it
-    uses ‘h’ which has a non-closed type because it contains the
-    type variables: ‘a’
-    In the first argument of ‘const’, namely ‘(static (g undefined))’
-    In the expression: const (static (g undefined)) (h x)
-    In an equation for ‘f2’:
-        f2 x
-          = const (static (g undefined)) (h x)
-          where
-              g = h
-              h = typeOf
+RnStaticPointersFail03.hs:19:15: error: [GHC-88431]
+    • ‘g’ is used in a static form but it is not closed because it
+      uses ‘h’ which has a non-closed type because it contains the
+      type variables: ‘a’
+    • In the first argument of ‘const’, namely ‘(static (g undefined))’
+      In the expression: const (static (g undefined)) (h x)
+      In an equation for ‘f2’:
+          f2 x
+            = const (static (g undefined)) (h x)
+            where
+                g = h
+                h = typeOf
diff --git a/testsuite/tests/rename/should_fail/T10618.stderr b/testsuite/tests/rename/should_fail/T10618.stderr
index 629e93727b..f67456009e 100644
--- a/testsuite/tests/rename/should_fail/T10618.stderr
+++ b/testsuite/tests/rename/should_fail/T10618.stderr
@@ -1,5 +1,5 @@
 
-T10618.hs:3:22: error:
+T10618.hs:3:22: error: [GHC-88464]
     Variable not in scope: (<|>) :: Maybe (Maybe a0) -> Maybe a1 -> t
     Suggested fix:
       Perhaps use one of these:
diff --git a/testsuite/tests/rename/should_fail/T10781.stderr b/testsuite/tests/rename/should_fail/T10781.stderr
index 3a5ccde99f..7a7f017442 100644
--- a/testsuite/tests/rename/should_fail/T10781.stderr
+++ b/testsuite/tests/rename/should_fail/T10781.stderr
@@ -1,4 +1,4 @@
 
-T10781.hs:12:5: error:
+T10781.hs:12:5: error: [GHC-76037]
     Not in scope: ‘Foo._name’
     NB: no module named ‘Foo’ is imported.
diff --git a/testsuite/tests/rename/should_fail/T11071.stderr b/testsuite/tests/rename/should_fail/T11071.stderr
index 4faad680ec..ceb215ddb6 100644
--- a/testsuite/tests/rename/should_fail/T11071.stderr
+++ b/testsuite/tests/rename/should_fail/T11071.stderr
@@ -1,42 +1,42 @@
 
-T11071.hs:19:12: error:
+T11071.hs:19:12: error: [GHC-76037]
     Not in scope: ‘NoSuchModule.foo’
     NB: no module named ‘NoSuchModule’ is imported.
 
-T11071.hs:20:12: error:
+T11071.hs:20:12: error: [GHC-76037]
     Not in scope: ‘Data.List.foobar’
     NB: the module ‘Data.List’ does not export ‘foobar’.
 
-T11071.hs:21:12: error:
+T11071.hs:21:12: error: [GHC-76037]
     Not in scope: ‘M.foobar’
     NB: neither ‘Data.IntMap’ nor ‘Data.Map’ export ‘foobar’.
 
-T11071.hs:22:12: error:
+T11071.hs:22:12: error: [GHC-76037]
     Not in scope: ‘M'.foobar’
     NB: neither ‘System.IO’,
                 ‘Data.IntMap’ nor ‘Data.Map’ export ‘foobar’.
 
-T11071.hs:23:12: error:
+T11071.hs:23:12: error: [GHC-76037]
     Not in scope: ‘Data.List.sort’
     Suggested fix:
       Perhaps you want to add ‘sort’ to the import list in the import of
       ‘Data.List’ (T11071.hs:3:1-24).
 
-T11071.hs:24:12: error:
+T11071.hs:24:12: error: [GHC-76037]
     Not in scope: ‘Data.List.unlines’
     Suggested fixes:
       • Perhaps use ‘Data.List.lines’ (imported from Data.List)
       • Perhaps you want to add ‘unlines’ to the import list
         in the import of ‘Data.List’ (T11071.hs:3:1-24).
 
-T11071.hs:25:12: error:
+T11071.hs:25:12: error: [GHC-76037]
     Not in scope: ‘M.size’
     Suggested fix:
       Perhaps you want to add ‘size’ to one of these import lists:
         ‘Data.IntMap’ (T11071.hs:5:1-36)
         ‘Data.Map’ (T11071.hs:4:1-33)
 
-T11071.hs:26:12: error:
+T11071.hs:26:12: error: [GHC-76037]
     Not in scope: ‘M.valid’
     Suggested fixes:
       • Perhaps use one of these:
@@ -45,13 +45,13 @@ T11071.hs:26:12: error:
       • Perhaps you want to add ‘valid’ to the import list
         in the import of ‘Data.Map’ (T11071.hs:4:1-33).
 
-T11071.hs:27:12: error:
+T11071.hs:27:12: error: [GHC-76037]
     Not in scope: data constructor ‘Ord.Down’
     Suggested fix:
       Perhaps you want to remove ‘Down’ from the explicit hiding list
       in the import of ‘Data.Ord’ (T11071.hs:8:1-46).
 
-T11071.hs:28:12: error:
+T11071.hs:28:12: error: [GHC-76037]
     Not in scope: ‘M'.size’
     Suggested fix:
       Perhaps you want to remove ‘size’ from the hiding clauses
diff --git a/testsuite/tests/rename/should_fail/T11071a.stderr b/testsuite/tests/rename/should_fail/T11071a.stderr
index 5a2a9e92fa..6ab683b74b 100644
--- a/testsuite/tests/rename/should_fail/T11071a.stderr
+++ b/testsuite/tests/rename/should_fail/T11071a.stderr
@@ -1,11 +1,11 @@
 
-T11071a.hs:12:12: error:
+T11071a.hs:12:12: error: [GHC-88464]
     Variable not in scope: intersperse
     Suggested fix:
       Perhaps you want to add ‘intersperse’ to the import list
       in the import of ‘Data.List’ (T11071a.hs:3:1-24).
 
-T11071a.hs:13:12: error:
+T11071a.hs:13:12: error: [GHC-88464]
     Variable not in scope: foldl'
     Suggested fixes:
       • Perhaps use one of these:
@@ -15,16 +15,16 @@ T11071a.hs:13:12: error:
           ‘Data.List’ (T11071a.hs:3:1-24)
           ‘Data.IntMap’ (T11071a.hs:4:1-21)
 
-T11071a.hs:14:12: error:
+T11071a.hs:14:12: error: [GHC-88464]
     Data constructor not in scope: Down
     Suggested fix:
       Perhaps you want to remove ‘Down’ from the explicit hiding list
       in the import of ‘Data.Ord’ (T11071a.hs:5:1-29).
 
-T11071a.hs:15:12: error:
+T11071a.hs:15:12: error: [GHC-88464]
     Data constructor not in scope: True
     Suggested fix:
       Perhaps you want to remove ‘True’ from the explicit hiding list
       in the import of ‘Prelude’ (T11071a.hs:6:1-28).
 
-T11071a.hs:16:12: error: Variable not in scope: foobar
+T11071a.hs:16:12: error: [GHC-88464] Variable not in scope: foobar
diff --git a/testsuite/tests/rename/should_fail/T11592.stderr b/testsuite/tests/rename/should_fail/T11592.stderr
index 9adac1549b..362e662fcb 100644
--- a/testsuite/tests/rename/should_fail/T11592.stderr
+++ b/testsuite/tests/rename/should_fail/T11592.stderr
@@ -1,8 +1,8 @@
 
-T11592.hs:5:14: error: Not in scope: type variable ‘a’
+T11592.hs:5:14: error: [GHC-76037] Not in scope: type variable ‘a’
 
-T11592.hs:7:16: error: Not in scope: type variable ‘a’
+T11592.hs:7:16: error: [GHC-76037] Not in scope: type variable ‘a’
 
-T11592.hs:8:18: error: Not in scope: type variable ‘a’
+T11592.hs:8:18: error: [GHC-76037] Not in scope: type variable ‘a’
 
-T11592.hs:10:20: error: Not in scope: type variable ‘a’
+T11592.hs:10:20: error: [GHC-76037] Not in scope: type variable ‘a’
diff --git a/testsuite/tests/rename/should_fail/T12229.stderr b/testsuite/tests/rename/should_fail/T12229.stderr
index 6eb4de53e2..e2758fe420 100644
--- a/testsuite/tests/rename/should_fail/T12229.stderr
+++ b/testsuite/tests/rename/should_fail/T12229.stderr
@@ -1,5 +1,5 @@
 
-T12229.hs:7:7: warning: [-Wmissing-fields (in -Wdefault)]
+T12229.hs:7:7: warning: [GHC-20125] [-Wmissing-fields (in -Wdefault)]
     • Fields of ‘MkT’ not initialised:
         pi :: Float
     • In the expression: MkT {..}
diff --git a/testsuite/tests/rename/should_fail/T12681.stderr b/testsuite/tests/rename/should_fail/T12681.stderr
index 9f57265bcd..3a48d80c17 100644
--- a/testsuite/tests/rename/should_fail/T12681.stderr
+++ b/testsuite/tests/rename/should_fail/T12681.stderr
@@ -1,4 +1,4 @@
 
-T12681.hs:4:17: error:
+T12681.hs:4:17: error: [GHC-76037]
     Not in scope: ‘a’
     Suggested fix: Perhaps use ‘T12681a.a’ (imported from T12681a)
diff --git a/testsuite/tests/rename/should_fail/T12686.stderr b/testsuite/tests/rename/should_fail/T12686.stderr
index 682a3bd8f4..63f511dca7 100644
--- a/testsuite/tests/rename/should_fail/T12686.stderr
+++ b/testsuite/tests/rename/should_fail/T12686.stderr
@@ -1,8 +1,8 @@
 
-T12686.hs:7:16:
+T12686.hs:7:16: error: [GHC-88634]
     Term variable ‘x’ cannot be used here
       (term variables cannot be promoted)
 
-T12686.hs:12:19:
+T12686.hs:12:19: error: [GHC-88634]
     Term variable ‘a’ cannot be used here
       (term variables cannot be promoted)
diff --git a/testsuite/tests/rename/should_fail/T12879.stderr b/testsuite/tests/rename/should_fail/T12879.stderr
index 0c6b7f36f5..4f41da75b9 100644
--- a/testsuite/tests/rename/should_fail/T12879.stderr
+++ b/testsuite/tests/rename/should_fail/T12879.stderr
@@ -1,4 +1,4 @@
 
-T12879.hs:4:7: error:
+T12879.hs:4:7: error: [GHC-84077]
     @-pattern in expression context: x@x
     Type application syntax requires a space before '@'
diff --git a/testsuite/tests/rename/should_fail/T13568.stderr b/testsuite/tests/rename/should_fail/T13568.stderr
index b0fce190e0..7682b8836f 100644
--- a/testsuite/tests/rename/should_fail/T13568.stderr
+++ b/testsuite/tests/rename/should_fail/T13568.stderr
@@ -1,5 +1,5 @@
 
-T13568.hs:7:8: error:
+T13568.hs:7:8: error: [GHC-76037]
     Not in scope: type constructor or class ‘A’
     Suggested fix:
       Perhaps you intended to use DataKinds
diff --git a/testsuite/tests/rename/should_fail/T13947.stderr b/testsuite/tests/rename/should_fail/T13947.stderr
index 8533f9f743..a24d2e1fa5 100644
--- a/testsuite/tests/rename/should_fail/T13947.stderr
+++ b/testsuite/tests/rename/should_fail/T13947.stderr
@@ -1,3 +1,3 @@
 
-T13947.hs:4:16: error:
+T13947.hs:4:16: error: [GHC-76037]
     Not in scope: type constructor or class ‘:~:’
diff --git a/testsuite/tests/rename/should_fail/T14225.stderr b/testsuite/tests/rename/should_fail/T14225.stderr
index c3ea46a789..2f760e0dd4 100644
--- a/testsuite/tests/rename/should_fail/T14225.stderr
+++ b/testsuite/tests/rename/should_fail/T14225.stderr
@@ -1,4 +1,4 @@
 
-<interactive>:2:1: error:
+<interactive>:2:1: error: [GHC-76037]
     Not in scope: ‘M.fromJusr’
     Suggested fix: Perhaps use ‘M.fromJust’ (imported from Data.Maybe)
diff --git a/testsuite/tests/rename/should_fail/T14307.stderr b/testsuite/tests/rename/should_fail/T14307.stderr
index 1470a406d4..0ef380104c 100644
--- a/testsuite/tests/rename/should_fail/T14307.stderr
+++ b/testsuite/tests/rename/should_fail/T14307.stderr
@@ -1,2 +1,3 @@
 
-T14307.hs:10:4: error: Not in scope: data constructor ‘C’
+T14307.hs:10:4: error: [GHC-76037]
+    Not in scope: data constructor ‘C’
diff --git a/testsuite/tests/rename/should_fail/T14548.stderr b/testsuite/tests/rename/should_fail/T14548.stderr
index 3527ac4d63..62828a99de 100644
--- a/testsuite/tests/rename/should_fail/T14548.stderr
+++ b/testsuite/tests/rename/should_fail/T14548.stderr
@@ -1,10 +1,10 @@
 
-T14548.hs:8:27: error: Not in scope: type variable ‘k’
+T14548.hs:8:27: error: [GHC-76037] Not in scope: type variable ‘k’
 
-T14548.hs:9:13: error: Not in scope: type variable ‘k’
+T14548.hs:9:13: error: [GHC-76037] Not in scope: type variable ‘k’
 
-T14548.hs:12:19: error: Not in scope: type variable ‘k’
+T14548.hs:12:19: error: [GHC-76037] Not in scope: type variable ‘k’
 
-T14548.hs:12:34: error: Not in scope: type variable ‘k’
+T14548.hs:12:34: error: [GHC-76037] Not in scope: type variable ‘k’
 
-T14548.hs:13:13: error: Not in scope: type variable ‘k’
+T14548.hs:13:13: error: [GHC-76037] Not in scope: type variable ‘k’
diff --git a/testsuite/tests/rename/should_fail/T14591.stderr b/testsuite/tests/rename/should_fail/T14591.stderr
index 47e4df0d55..88e6a4852c 100644
--- a/testsuite/tests/rename/should_fail/T14591.stderr
+++ b/testsuite/tests/rename/should_fail/T14591.stderr
@@ -1,2 +1,2 @@
 
-T14591.hs:11:23: error: Variable not in scope: x
+T14591.hs:11:23: error: [GHC-88464] Variable not in scope: x
diff --git a/testsuite/tests/rename/should_fail/T14907a.stderr b/testsuite/tests/rename/should_fail/T14907a.stderr
index 26ce914c3d..28c9b01f9c 100644
--- a/testsuite/tests/rename/should_fail/T14907a.stderr
+++ b/testsuite/tests/rename/should_fail/T14907a.stderr
@@ -1,5 +1,5 @@
 
-T14907a.hs:3:8: error:
+T14907a.hs:3:8: error: [GHC-77878]
     Unexpected type ‘Bool’
     In the class declaration for ‘(,,)’
     A class declaration should have form
diff --git a/testsuite/tests/rename/should_fail/T14907b.stderr b/testsuite/tests/rename/should_fail/T14907b.stderr
index b76cc11e2a..c113238389 100644
--- a/testsuite/tests/rename/should_fail/T14907b.stderr
+++ b/testsuite/tests/rename/should_fail/T14907b.stderr
@@ -1,6 +1,9 @@
 
-T14907b.hs:5:1: error: Illegal binding of built-in syntax: ()
+T14907b.hs:5:1: error: [GHC-69639]
+    Illegal binding of built-in syntax: ()
 
-T14907b.hs:6:1: error: Illegal binding of built-in syntax: (,)
+T14907b.hs:6:1: error: [GHC-69639]
+    Illegal binding of built-in syntax: (,)
 
-T14907b.hs:7:1: error: Illegal binding of built-in syntax: (,,)
+T14907b.hs:7:1: error: [GHC-69639]
+    Illegal binding of built-in syntax: (,,)
diff --git a/testsuite/tests/rename/should_fail/T15539.stderr b/testsuite/tests/rename/should_fail/T15539.stderr
index c3c1653b51..2658ee3265 100644
--- a/testsuite/tests/rename/should_fail/T15539.stderr
+++ b/testsuite/tests/rename/should_fail/T15539.stderr
@@ -1,5 +1,5 @@
 
-T15539.hs:6:13: error:
+T15539.hs:6:13: error: [GHC-88464]
     Variable not in scope: baz
     Suggested fix:
       Perhaps use one of these: ‘bam’ (line 17), ‘bar’ (line 15)
diff --git a/testsuite/tests/rename/should_fail/T15607.stderr b/testsuite/tests/rename/should_fail/T15607.stderr
index 2a534d2a5a..b6bfed5e29 100644
--- a/testsuite/tests/rename/should_fail/T15607.stderr
+++ b/testsuite/tests/rename/should_fail/T15607.stderr
@@ -1,5 +1,5 @@
 
-T15607.hs:6:10: error:
+T15607.hs:6:10: error: [GHC-88464]
     Variable not in scope: pure :: t0 -> t
     Suggested fix:
       Perhaps you want to remove ‘pure’ from the explicit hiding list
diff --git a/testsuite/tests/rename/should_fail/T15611a.stderr b/testsuite/tests/rename/should_fail/T15611a.stderr
index ebeb83b5f2..97cbb50bf8 100644
--- a/testsuite/tests/rename/should_fail/T15611a.stderr
+++ b/testsuite/tests/rename/should_fail/T15611a.stderr
@@ -1 +1,2 @@
-T15611a.hs:2:8: Not in scope: ‘Main.foo’
+
+T15611a.hs:2:8: error: [GHC-76037] Not in scope: ‘Main.foo’
diff --git a/testsuite/tests/rename/should_fail/T15611b.stderr b/testsuite/tests/rename/should_fail/T15611b.stderr
index 609ab4c041..339f295f44 100644
--- a/testsuite/tests/rename/should_fail/T15611b.stderr
+++ b/testsuite/tests/rename/should_fail/T15611b.stderr
@@ -1 +1,2 @@
-<interactive>:2:1: Not in scope: ‘T15611b.foo’
+
+<interactive>:2:1: error: [GHC-76037] Not in scope: ‘T15611b.foo’
diff --git a/testsuite/tests/rename/should_fail/T15957_Fail.stderr b/testsuite/tests/rename/should_fail/T15957_Fail.stderr
index 54d77c189b..4032c32814 100644
--- a/testsuite/tests/rename/should_fail/T15957_Fail.stderr
+++ b/testsuite/tests/rename/should_fail/T15957_Fail.stderr
@@ -1,36 +1,36 @@
 
-T15957_Fail.hs:7:6: error: [-Wunused-record-wildcards (in -Wall), -Werror=unused-record-wildcards]
+T15957_Fail.hs:7:6: error: [-Wunused-record-wildcards (in -Wall), Werror=unused-record-wildcards]
     No variables bound in the record wildcard match are used
       Possible fix: omit the ‘..’
 
-T15957_Fail.hs:8:9: error: [-Wunused-record-wildcards (in -Wall), -Werror=unused-record-wildcards]
+T15957_Fail.hs:8:9: error: [-Wunused-record-wildcards (in -Wall), Werror=unused-record-wildcards]
     No variables bound in the record wildcard match are used
       Possible fix: omit the ‘..’
 
-T15957_Fail.hs:9:12: error: [-Wredundant-record-wildcards (in -Wall), -Werror=redundant-record-wildcards]
+T15957_Fail.hs:9:12: error: [-Wredundant-record-wildcards (in -Wall), Werror=redundant-record-wildcards]
     Record wildcard does not bind any new variables
       Possible fix: omit the ‘..’
 
-T15957_Fail.hs:11:11: error: [-Wunused-record-wildcards (in -Wall), -Werror=unused-record-wildcards]
+T15957_Fail.hs:11:11: error: [-Wunused-record-wildcards (in -Wall), Werror=unused-record-wildcards]
     No variables bound in the record wildcard match are used
       Possible fix: omit the ‘..’
 
-T15957_Fail.hs:12:16: error: [-Wredundant-record-wildcards (in -Wall), -Werror=redundant-record-wildcards]
+T15957_Fail.hs:12:16: error: [-Wredundant-record-wildcards (in -Wall), Werror=redundant-record-wildcards]
     Record wildcard does not bind any new variables
       Possible fix: omit the ‘..’
 
-T15957_Fail.hs:13:15: error: [-Wredundant-record-wildcards (in -Wall), -Werror=redundant-record-wildcards]
+T15957_Fail.hs:13:15: error: [-Wredundant-record-wildcards (in -Wall), Werror=redundant-record-wildcards]
     Record wildcard does not bind any new variables
       Possible fix: omit the ‘..’
 
-T15957_Fail.hs:20:9: error: [-Wunused-record-wildcards (in -Wall), -Werror=unused-record-wildcards]
+T15957_Fail.hs:20:9: error: [-Wunused-record-wildcards (in -Wall), Werror=unused-record-wildcards]
     No variables bound in the record wildcard match are used
       Possible fix: omit the ‘..’
 
-T15957_Fail.hs:25:9: error: [-Wunused-record-wildcards (in -Wall), -Werror=unused-record-wildcards]
+T15957_Fail.hs:25:9: error: [-Wunused-record-wildcards (in -Wall), Werror=unused-record-wildcards]
     No variables bound in the record wildcard match are used
       Possible fix: omit the ‘..’
 
-T15957_Fail.hs:31:18: error: [-Wunused-record-wildcards (in -Wall), -Werror=unused-record-wildcards]
+T15957_Fail.hs:31:18: error: [-Wunused-record-wildcards (in -Wall), Werror=unused-record-wildcards]
     No variables bound in the record wildcard match are used
       Possible fix: omit the ‘..’
diff --git a/testsuite/tests/rename/should_fail/T1595a.stderr b/testsuite/tests/rename/should_fail/T1595a.stderr
index bcd601a377..1b23d215b2 100644
--- a/testsuite/tests/rename/should_fail/T1595a.stderr
+++ b/testsuite/tests/rename/should_fail/T1595a.stderr
@@ -1,3 +1,3 @@
 
-T1595a.hs:3:20: error:
+T1595a.hs:3:20: error: [GHC-76037]
     Not in scope: type constructor or class ‘Tpyo’
diff --git a/testsuite/tests/rename/should_fail/T16116b.stderr b/testsuite/tests/rename/should_fail/T16116b.stderr
index ff6b5e13a4..5825633d37 100644
--- a/testsuite/tests/rename/should_fail/T16116b.stderr
+++ b/testsuite/tests/rename/should_fail/T16116b.stderr
@@ -1,2 +1,2 @@
 
-T16116b.hs:7:16: error: Not in scope: type variable ‘b’
+T16116b.hs:7:16: error: [GHC-76037] Not in scope: type variable ‘b’
diff --git a/testsuite/tests/rename/should_fail/T16385.stderr b/testsuite/tests/rename/should_fail/T16385.stderr
index b80275643c..2f0376ba70 100644
--- a/testsuite/tests/rename/should_fail/T16385.stderr
+++ b/testsuite/tests/rename/should_fail/T16385.stderr
@@ -1,8 +1,8 @@
 
-T16385.hs:4:10: error:
+T16385.hs:4:10: error: [GHC-56538]
     • Instance head is not headed by a class: c
     • In the instance declaration for ‘c’
 
-T16385.hs:5:10: error:
+T16385.hs:5:10: error: [GHC-56538]
     • Instance head is not headed by a class: c
     • In the instance declaration for ‘c’
diff --git a/testsuite/tests/rename/should_fail/T16504.stderr b/testsuite/tests/rename/should_fail/T16504.stderr
index 798404afc3..4d33569a1a 100644
--- a/testsuite/tests/rename/should_fail/T16504.stderr
+++ b/testsuite/tests/rename/should_fail/T16504.stderr
@@ -1,5 +1,5 @@
 
-T16504.hs:5:1: error:
+T16504.hs:5:1: error: [GHC-44432]
     The type signature for ‘simpleFuntcion’
       lacks an accompanying binding
     Suggested fix:
@@ -7,12 +7,12 @@ T16504.hs:5:1: error:
         ‘simpleFunction’ (Defined at T16504.hs:6:1),
         ‘simpleFunction2’ (Defined at T16504.hs:7:1)
 
-T16504.hs:11:9: error:
+T16504.hs:11:9: error: [GHC-44432]
     The type signature for ‘anotherFunction’
       lacks an accompanying binding
     Suggested fix:
       Perhaps use ‘anotherFuntcion’ (Defined at T16504.hs:12:9)
 
-T16504.hs:15:1: error:
+T16504.hs:15:1: error: [GHC-44432]
     The type signature for ‘nonexistentFuntcion’
       lacks an accompanying binding
diff --git a/testsuite/tests/rename/should_fail/T16610.stderr b/testsuite/tests/rename/should_fail/T16610.stderr
index 9f1a671b53..e15a5fb51f 100644
--- a/testsuite/tests/rename/should_fail/T16610.stderr
+++ b/testsuite/tests/rename/should_fail/T16610.stderr
@@ -1,3 +1,3 @@
 
-T16610.hs:6:3: error:
+T16610.hs:6:3: error: [GHC-54721]
     ‘wrong’ is not a (visible) method of class ‘Eq’
diff --git a/testsuite/tests/rename/should_fail/T17593.stderr b/testsuite/tests/rename/should_fail/T17593.stderr
index 005f6c9fd4..2fde25b1f0 100644
--- a/testsuite/tests/rename/should_fail/T17593.stderr
+++ b/testsuite/tests/rename/should_fail/T17593.stderr
@@ -1,7 +1,7 @@
 
-T17593.hs:5:1: error:
+T17593.hs:5:1: error: [GHC-44432]
     The type signature for ‘<+>’ lacks an accompanying binding
 
-T17593.hs:8:6: error:
+T17593.hs:8:6: error: [GHC-44432]
     The standalone kind signature for ‘MkT’
       lacks an accompanying binding
diff --git a/testsuite/tests/rename/should_fail/T18145.stderr b/testsuite/tests/rename/should_fail/T18145.stderr
index 606ad0f695..ac1fb7b807 100644
--- a/testsuite/tests/rename/should_fail/T18145.stderr
+++ b/testsuite/tests/rename/should_fail/T18145.stderr
@@ -1,6 +1,6 @@
 
-T18145.hs:10:44: error: Not in scope: type variable ‘a’
+T18145.hs:10:44: error: [GHC-76037] Not in scope: type variable ‘a’
 
-T18145.hs:14:41: error: Not in scope: type variable ‘a’
+T18145.hs:14:41: error: [GHC-76037] Not in scope: type variable ‘a’
 
-T18145.hs:17:41: error: Not in scope: type variable ‘a’
+T18145.hs:17:41: error: [GHC-76037] Not in scope: type variable ‘a’
diff --git a/testsuite/tests/rename/should_fail/T18240a.stderr b/testsuite/tests/rename/should_fail/T18240a.stderr
index 641bee5003..50b419add4 100644
--- a/testsuite/tests/rename/should_fail/T18240a.stderr
+++ b/testsuite/tests/rename/should_fail/T18240a.stderr
@@ -3,7 +3,8 @@ T18240a.hs:11:11: error:
     Instance head cannot contain nested ‘forall’s or contexts
     In an instance declaration
 
-T18240a.hs:12:15: error: Not in scope: type variable ‘a’
+T18240a.hs:12:15: error: [GHC-76037]
+    Not in scope: type variable ‘a’
 
 T18240a.hs:14:11: error:
     Instance head cannot contain nested ‘forall’s or contexts
@@ -13,13 +14,15 @@ T18240a.hs:17:11: error:
     Instance head cannot contain nested ‘forall’s or contexts
     In an instance declaration
 
-T18240a.hs:18:22: error: Not in scope: type variable ‘a’
+T18240a.hs:18:22: error: [GHC-76037]
+    Not in scope: type variable ‘a’
 
 T18240a.hs:20:21: error:
     Instance head cannot contain nested ‘forall’s or contexts
     In an instance declaration
 
-T18240a.hs:21:24: error: Not in scope: type variable ‘b’
+T18240a.hs:21:24: error: [GHC-76037]
+    Not in scope: type variable ‘b’
 
 T18240a.hs:23:19: error:
     Instance head cannot contain nested ‘forall’s or contexts
diff --git a/testsuite/tests/rename/should_fail/T18740a.stderr b/testsuite/tests/rename/should_fail/T18740a.stderr
index c814f2bf36..5b36171a38 100644
--- a/testsuite/tests/rename/should_fail/T18740a.stderr
+++ b/testsuite/tests/rename/should_fail/T18740a.stderr
@@ -1,5 +1,5 @@
 
-T18740a.hs:3:5: error:
+T18740a.hs:3:5: error: [GHC-31891]
     • Illegal term-level use of the type constructor or class ‘Int’
     • imported from ‘Prelude’ at T18740a.hs:1:8-14
       (and originally defined in ‘GHC.Types’)
diff --git a/testsuite/tests/rename/should_fail/T18740b.stderr b/testsuite/tests/rename/should_fail/T18740b.stderr
index 86c6c74961..1e13c3a974 100644
--- a/testsuite/tests/rename/should_fail/T18740b.stderr
+++ b/testsuite/tests/rename/should_fail/T18740b.stderr
@@ -1,6 +1,6 @@
 
-T18740b.hs:6:24: error:
+T18740b.hs:6:24: error: [GHC-31891]
     • Illegal term-level use of the type variable ‘a’
-         bound at T18740b.hs:6:4
+    • bound at T18740b.hs:6:4
     • In the expression: a
       In an equation for ‘f’: f (Proxy :: Proxy a) = a
diff --git a/testsuite/tests/rename/should_fail/T19843a.stderr b/testsuite/tests/rename/should_fail/T19843a.stderr
index 8f96612743..02ce2c6711 100644
--- a/testsuite/tests/rename/should_fail/T19843a.stderr
+++ b/testsuite/tests/rename/should_fail/T19843a.stderr
@@ -1,3 +1,3 @@
 
-T19843a.hs:5:6:
+T19843a.hs:5:6: error: [GHC-76037]
     Not in scope: data constructor ‘Map’
diff --git a/testsuite/tests/rename/should_fail/T19843b.stderr b/testsuite/tests/rename/should_fail/T19843b.stderr
index 6a92e26a4d..e587843907 100644
--- a/testsuite/tests/rename/should_fail/T19843b.stderr
+++ b/testsuite/tests/rename/should_fail/T19843b.stderr
@@ -1,4 +1,4 @@
 
-T19843b.hs:7:6: error:
+T19843b.hs:7:6: error: [GHC-88464]
     Data constructor not in scope: Map :: (a0 -> Bool) -> t -> t0
     Suggested fix: Perhaps use variable ‘map’ (imported from Prelude)
diff --git a/testsuite/tests/rename/should_fail/T19843c.stderr b/testsuite/tests/rename/should_fail/T19843c.stderr
index d15ac772b4..28f58cd6f1 100644
--- a/testsuite/tests/rename/should_fail/T19843c.stderr
+++ b/testsuite/tests/rename/should_fail/T19843c.stderr
@@ -1,4 +1,4 @@
 
-T19843c.hs:6:6: error:
+T19843c.hs:6:6: error: [GHC-76037]
     Not in scope: data constructor ‘Map.Map’
     NB: the module ‘Data.Map’ does not export ‘Map’.
diff --git a/testsuite/tests/rename/should_fail/T19843d.stderr b/testsuite/tests/rename/should_fail/T19843d.stderr
index 34a5de28f0..f976076794 100644
--- a/testsuite/tests/rename/should_fail/T19843d.stderr
+++ b/testsuite/tests/rename/should_fail/T19843d.stderr
@@ -1,4 +1,4 @@
 
-T19843d.hs:7:6: error:
+T19843d.hs:7:6: error: [GHC-76037]
     Not in scope: data constructor ‘Map’
     Suggested fix: Perhaps use ‘Mup’ (line 5)
diff --git a/testsuite/tests/rename/should_fail/T19843e.stderr b/testsuite/tests/rename/should_fail/T19843e.stderr
index f5870a356e..69188c6b05 100644
--- a/testsuite/tests/rename/should_fail/T19843e.stderr
+++ b/testsuite/tests/rename/should_fail/T19843e.stderr
@@ -1,4 +1,4 @@
 
-T19843e.hs:9:6: error:
+T19843e.hs:9:6: error: [GHC-76037]
     Not in scope: data constructor ‘Map’
     Suggested fix: Perhaps use ‘Mup’ (line 7)
diff --git a/testsuite/tests/rename/should_fail/T19843f.stderr b/testsuite/tests/rename/should_fail/T19843f.stderr
index 3b73444439..c7c4d5dc58 100644
--- a/testsuite/tests/rename/should_fail/T19843f.stderr
+++ b/testsuite/tests/rename/should_fail/T19843f.stderr
@@ -1,8 +1,8 @@
 
-T19843f.hs:8:12: error:
+T19843f.hs:8:12: error: [GHC-76037]
     Not in scope: ‘mup’
     Suggested fix: Perhaps use ‘mop’ (line 5)
 
-T19843f.hs:10:10: error:
+T19843f.hs:10:10: error: [GHC-76037]
     Not in scope: ‘mup’
     Suggested fix: Perhaps use ‘mop’ (line 5)
diff --git a/testsuite/tests/rename/should_fail/T19843g.stderr b/testsuite/tests/rename/should_fail/T19843g.stderr
index f635b6c2d2..78ee13eadf 100644
--- a/testsuite/tests/rename/should_fail/T19843g.stderr
+++ b/testsuite/tests/rename/should_fail/T19843g.stderr
@@ -1,4 +1,4 @@
 
-T19843g.hs:10:12: error:
+T19843g.hs:10:12: error: [GHC-76037]
     Not in scope: ‘mup’
     Suggested fix: Perhaps use ‘mop’ (line 7)
diff --git a/testsuite/tests/rename/should_fail/T19843h.stderr b/testsuite/tests/rename/should_fail/T19843h.stderr
index 963740ca35..43cf59befd 100644
--- a/testsuite/tests/rename/should_fail/T19843h.stderr
+++ b/testsuite/tests/rename/should_fail/T19843h.stderr
@@ -1,30 +1,30 @@
 
-T19843h.hs:14:7: error:
+T19843h.hs:14:7: error: [GHC-39999]
     • No instance for ‘GHC.Records.HasField "mup" r4 a4’
         arising from selecting the field ‘mup’
       Perhaps use ‘mop’ (line 11)
     • In the expression: undefined.mup
       In an equation for ‘foo’: foo = undefined.mup
 
-T19843h.hs:16:7: error:
+T19843h.hs:16:7: error: [GHC-39999]
     • No instance for ‘GHC.Records.HasField "traverse" r3 a3’
         arising from selecting the field ‘traverse’
     • In the expression: undefined.traverse
       In an equation for ‘bar’: bar = undefined.traverse
 
-T19843h.hs:18:7: error:
+T19843h.hs:18:7: error: [GHC-39999]
     • No instance for ‘GHC.Records.HasField "getSum" r2 a2’
         arising from selecting the field ‘getSum’
     • In the expression: undefined.getSum
       In an equation for ‘baz’: baz = undefined.getSum
 
-T19843h.hs:20:8: error:
+T19843h.hs:20:8: error: [GHC-39999]
     • No instance for ‘GHC.Records.HasField "getAlt" r1 a1’
         arising from selecting the field ‘getAlt’
     • In the expression: undefined.getAlt
       In an equation for ‘quux’: quux = undefined.getAlt
 
-T19843h.hs:24:8: error:
+T19843h.hs:24:8: error: [GHC-39999]
     • No instance for ‘GHC.Records.HasField "getAll" r0 a0’
         arising from selecting the field ‘getAll’
       Perhaps use ‘getAlt’ (imported from Data.Monoid)
diff --git a/testsuite/tests/rename/should_fail/T19843i.stderr b/testsuite/tests/rename/should_fail/T19843i.stderr
index f5de15281b..d55bb16d66 100644
--- a/testsuite/tests/rename/should_fail/T19843i.stderr
+++ b/testsuite/tests/rename/should_fail/T19843i.stderr
@@ -1,5 +1,5 @@
 
-T19843i.hs:5:5: error:
+T19843i.hs:5:5: error: [GHC-76037]
     Not in scope: ‘M.getSum’
     Suggested fix:
       Perhaps you want to add ‘getSum’ to the import list
diff --git a/testsuite/tests/rename/should_fail/T19843j.stderr b/testsuite/tests/rename/should_fail/T19843j.stderr
index a0423eeb76..c7aa7058b9 100644
--- a/testsuite/tests/rename/should_fail/T19843j.stderr
+++ b/testsuite/tests/rename/should_fail/T19843j.stderr
@@ -1,5 +1,5 @@
 
-T19843j.hs:5:5: error:
+T19843j.hs:5:5: error: [GHC-88464]
     Variable not in scope: guard
     Suggested fix:
       Perhaps you want to add ‘guard’ to the import list in the import of
diff --git a/testsuite/tests/rename/should_fail/T19843k.stderr b/testsuite/tests/rename/should_fail/T19843k.stderr
index 7872fdb784..266b45e245 100644
--- a/testsuite/tests/rename/should_fail/T19843k.stderr
+++ b/testsuite/tests/rename/should_fail/T19843k.stderr
@@ -1,4 +1,4 @@
 
-T19843k.hs:5:8: error:
+T19843k.hs:5:8: error: [GHC-76037]
     Not in scope: ‘M.doesn'tExist’
     NB: the module ‘Data.Monoid’ does not export ‘doesn'tExist’.
diff --git a/testsuite/tests/rename/should_fail/T19843l.stderr b/testsuite/tests/rename/should_fail/T19843l.stderr
index 094a0b43a2..8b56ad570a 100644
--- a/testsuite/tests/rename/should_fail/T19843l.stderr
+++ b/testsuite/tests/rename/should_fail/T19843l.stderr
@@ -1,4 +1,4 @@
 
-T19843l.hs:7:12: error:
+T19843l.hs:7:12: error: [GHC-76037]
     Not in scope: type constructor or class ‘WrongName’
     Suggested fix: Perhaps use ‘FongName’ (line 4)
diff --git a/testsuite/tests/rename/should_fail/T19843m.stderr b/testsuite/tests/rename/should_fail/T19843m.stderr
index 1ec2b31925..44cd5cc78c 100644
--- a/testsuite/tests/rename/should_fail/T19843m.stderr
+++ b/testsuite/tests/rename/should_fail/T19843m.stderr
@@ -1,5 +1,5 @@
 
-T19843m.hs:9:12: error:
+T19843m.hs:9:12: error: [GHC-76037]
     Not in scope: type constructor or class ‘WrongName’
     Suggested fix:
       Perhaps use one of these:
diff --git a/testsuite/tests/rename/should_fail/T2723.stderr b/testsuite/tests/rename/should_fail/T2723.stderr
index 682479ac98..10712ebf8c 100644
--- a/testsuite/tests/rename/should_fail/T2723.stderr
+++ b/testsuite/tests/rename/should_fail/T2723.stderr
@@ -1,4 +1,4 @@
 
-T2723.hs:15:5: warning: [-Wname-shadowing (in -Wall)]
+T2723.hs:15:5: warning: [GHC-63397] [-Wname-shadowing (in -Wall)]
     This binding for ‘field3’ shadows the existing binding
       defined at T2723.hs:7:1
diff --git a/testsuite/tests/rename/should_fail/T2901.stderr b/testsuite/tests/rename/should_fail/T2901.stderr
index eab94f2acf..ba1bbcebc8 100644
--- a/testsuite/tests/rename/should_fail/T2901.stderr
+++ b/testsuite/tests/rename/should_fail/T2901.stderr
@@ -1,4 +1,4 @@
 
-T2901.hs:6:5: error:
+T2901.hs:6:5: error: [GHC-76037]
     Not in scope: data constructor ‘F.Foo’
     NB: no module named ‘F’ is imported.
diff --git a/testsuite/tests/rename/should_fail/T2993.stderr b/testsuite/tests/rename/should_fail/T2993.stderr
index d993c398ca..e6818de4a7 100644
--- a/testsuite/tests/rename/should_fail/T2993.stderr
+++ b/testsuite/tests/rename/should_fail/T2993.stderr
@@ -1,4 +1,4 @@
 
-T2993.hs:7:13: error:
+T2993.hs:7:13: error: [GHC-88464]
     Variable not in scope: (<**>) :: t1 -> (a -> a) -> t2
     Suggested fix: Perhaps use ‘<*>’ (imported from Prelude)
diff --git a/testsuite/tests/rename/should_fail/T3265.stderr b/testsuite/tests/rename/should_fail/T3265.stderr
index 8ef1acdf39..dfe09aa986 100644
--- a/testsuite/tests/rename/should_fail/T3265.stderr
+++ b/testsuite/tests/rename/should_fail/T3265.stderr
@@ -1,8 +1,8 @@
 
-T3265.hs:8:8: error:
+T3265.hs:8:8: error: [GHC-50649]
     Illegal declaration of a type or class operator ‘:+:’
     Suggested fix: Perhaps you intended to use TypeOperators
 
-T3265.hs:10:9: error:
+T3265.hs:10:9: error: [GHC-50649]
     Illegal declaration of a type or class operator ‘:*:’
     Suggested fix: Perhaps you intended to use TypeOperators
diff --git a/testsuite/tests/rename/should_fail/T495.stderr b/testsuite/tests/rename/should_fail/T495.stderr
index cc637c4681..d9ffb92edd 100644
--- a/testsuite/tests/rename/should_fail/T495.stderr
+++ b/testsuite/tests/rename/should_fail/T495.stderr
@@ -1,8 +1,8 @@
 
-T495.hs:4:12: error:
+T495.hs:4:12: error: [GHC-44432]
     The INLINE pragma for ‘blarg’ lacks an accompanying binding
 
-T495.hs:7:12: error:
+T495.hs:7:12: error: [GHC-44432]
     The INLINE pragma for ‘lookup’ lacks an accompanying binding
     Suggested fix:
       Move the INLINE pragma to the declaration site of ‘lookup’.
diff --git a/testsuite/tests/rename/should_fail/T5001b.stderr b/testsuite/tests/rename/should_fail/T5001b.stderr
index 2544aa4dc2..09caa51d07 100644
--- a/testsuite/tests/rename/should_fail/T5001b.stderr
+++ b/testsuite/tests/rename/should_fail/T5001b.stderr
@@ -1,5 +1,5 @@
 
-T5001b.hs:10:17: error:
+T5001b.hs:10:17: error: [GHC-44432]
     The INLINE pragma for ‘genum’ lacks an accompanying binding
     Suggested fix:
       Move the INLINE pragma to the declaration site of ‘genum’.
diff --git a/testsuite/tests/rename/should_fail/T5281.stderr b/testsuite/tests/rename/should_fail/T5281.stderr
index 26d7b8da77..a5c5fd2520 100644
--- a/testsuite/tests/rename/should_fail/T5281.stderr
+++ b/testsuite/tests/rename/should_fail/T5281.stderr
@@ -1,4 +1,4 @@
 
-T5281.hs:6:5: warning: [-Wdeprecations (in -Wdefault)]
+T5281.hs:6:5: warning: [GHC-68441] [-Wdeprecations (in -Wdefault)]
     In the use of ‘deprec’ (imported from T5281A):
     Deprecated: "This is deprecated"
diff --git a/testsuite/tests/rename/should_fail/T5372.stderr b/testsuite/tests/rename/should_fail/T5372.stderr
index 3642362660..8e45e8f043 100644
--- a/testsuite/tests/rename/should_fail/T5372.stderr
+++ b/testsuite/tests/rename/should_fail/T5372.stderr
@@ -1,4 +1,4 @@
 
-T5372.hs:4:11: error:
+T5372.hs:4:11: error: [GHC-76037]
     Not in scope: data constructor ‘MkS’
     Suggested fix: Perhaps use ‘T5372a.MkS’ (imported from T5372a)
diff --git a/testsuite/tests/rename/should_fail/T5513.stderr b/testsuite/tests/rename/should_fail/T5513.stderr
index 4ce02ace8b..22e869cfb4 100644
--- a/testsuite/tests/rename/should_fail/T5513.stderr
+++ b/testsuite/tests/rename/should_fail/T5513.stderr
@@ -1,4 +1,4 @@
 
-T5513.hs:4:19: error:
+T5513.hs:4:19: error: [GHC-56538]
     • Instance head is not headed by a class: lowercase_name a
     • In the stand-alone deriving instance for ‘lowercase_name a’
diff --git a/testsuite/tests/rename/should_fail/T5533.stderr b/testsuite/tests/rename/should_fail/T5533.stderr
index 67dbf3a93e..0275756c44 100644
--- a/testsuite/tests/rename/should_fail/T5533.stderr
+++ b/testsuite/tests/rename/should_fail/T5533.stderr
@@ -1,5 +1,5 @@
 
-T5533.hs:4:1: error:
+T5533.hs:4:1: error: [GHC-44432]
     The type signature for ‘f2’ lacks an accompanying binding
     Suggested fix:
       Move the type signature to the declaration site of ‘f2’.
diff --git a/testsuite/tests/rename/should_fail/T5657.stderr b/testsuite/tests/rename/should_fail/T5657.stderr
index 28c3ba7d6c..042f7af35b 100644
--- a/testsuite/tests/rename/should_fail/T5657.stderr
+++ b/testsuite/tests/rename/should_fail/T5657.stderr
@@ -1,5 +1,5 @@
 
-T5657.hs:3:8: error:
+T5657.hs:3:8: error: [GHC-76037]
     Not in scope: ‘LT..’
     NB: no module named ‘LT’ is imported.
 
diff --git a/testsuite/tests/rename/should_fail/T5745.stderr b/testsuite/tests/rename/should_fail/T5745.stderr
index dc590bba33..47fd21e17c 100644
--- a/testsuite/tests/rename/should_fail/T5745.stderr
+++ b/testsuite/tests/rename/should_fail/T5745.stderr
@@ -1,2 +1,3 @@
 
-T5745.hs:5:6: error: Not in scope: type constructor or class ‘T’
+T5745.hs:5:6: error: [GHC-76037]
+    Not in scope: type constructor or class ‘T’
diff --git a/testsuite/tests/rename/should_fail/T5892a.stderr b/testsuite/tests/rename/should_fail/T5892a.stderr
index 436409ed24..79cb98ab4d 100644
--- a/testsuite/tests/rename/should_fail/T5892a.stderr
+++ b/testsuite/tests/rename/should_fail/T5892a.stderr
@@ -1,5 +1,5 @@
 
-T5892a.hs:12:8: error: [-Wmissing-fields (in -Wdefault), -Werror=missing-fields]
+T5892a.hs:12:8: error: [GHC-20125] [-Wmissing-fields (in -Wdefault), Werror=missing-fields]
     • Fields of ‘Node’ not initialised:
         subForest :: [Tree [Int]]
     • In the expression: Node {..}
diff --git a/testsuite/tests/rename/should_fail/T5892b.stderr b/testsuite/tests/rename/should_fail/T5892b.stderr
index d55d0cb8e1..ee7bd4820e 100644
--- a/testsuite/tests/rename/should_fail/T5892b.stderr
+++ b/testsuite/tests/rename/should_fail/T5892b.stderr
@@ -1,2 +1,2 @@
 
-T5892b.hs:11:7: error: Not in scope: ‘T5892b.subForest’
+T5892b.hs:11:7: error: [GHC-76037] Not in scope: ‘T5892b.subForest’
diff --git a/testsuite/tests/rename/should_fail/T6018rnfail.stderr b/testsuite/tests/rename/should_fail/T6018rnfail.stderr
index 2628024b83..8833ad8fbd 100644
--- a/testsuite/tests/rename/should_fail/T6018rnfail.stderr
+++ b/testsuite/tests/rename/should_fail/T6018rnfail.stderr
@@ -1,71 +1,81 @@
 
-T6018rnfail.hs:8:23:
+T6018rnfail.hs:8:23: error:
     Incorrect type variable on the LHS of injectivity condition
          Expected : r
          Actual   : a
 
-T6018rnfail.hs:9:24:
+T6018rnfail.hs:9:24: error:
     Incorrect type variable on the LHS of injectivity condition
          Expected : r
          Actual   : a
 
-T6018rnfail.hs:12:19:
+T6018rnfail.hs:12:19: error:
     Incorrect type variable on the LHS of injectivity condition
          Expected : r
          Actual   : a
 
-T6018rnfail.hs:15:19:
+T6018rnfail.hs:15:19: error:
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-T6018rnfail.hs:16:20:
+T6018rnfail.hs:16:20: error:
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-T6018rnfail.hs:20:20:
+T6018rnfail.hs:20:20: error:
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-T6018rnfail.hs:20:24:
+T6018rnfail.hs:20:24: error:
     Unknown type variable on the RHS of injectivity condition: a
 
-T6018rnfail.hs:21:21:
+T6018rnfail.hs:21:21: error:
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-T6018rnfail.hs:21:25:
+T6018rnfail.hs:21:25: error:
     Unknown type variable on the RHS of injectivity condition: a
 
-T6018rnfail.hs:24:16:
+T6018rnfail.hs:24:16: error:
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-T6018rnfail.hs:24:20:
+T6018rnfail.hs:24:20: error:
     Unknown type variable on the RHS of injectivity condition: a
 
-T6018rnfail.hs:27:1: Not in scope: type variable ‘c’
+T6018rnfail.hs:27:1: error: [GHC-76037]
+    Not in scope: type variable ‘c’
 
-T6018rnfail.hs:28:1: Not in scope: type variable ‘c’
+T6018rnfail.hs:28:1: error: [GHC-76037]
+    Not in scope: type variable ‘c’
 
-T6018rnfail.hs:31:3: Not in scope: type variable ‘c’
+T6018rnfail.hs:31:3: error: [GHC-76037]
+    Not in scope: type variable ‘c’
 
-T6018rnfail.hs:34:1: Not in scope: type variable ‘c’
+T6018rnfail.hs:34:1: error: [GHC-76037]
+    Not in scope: type variable ‘c’
 
-T6018rnfail.hs:35:1: Not in scope: type variable ‘c’
+T6018rnfail.hs:35:1: error: [GHC-76037]
+    Not in scope: type variable ‘c’
 
-T6018rnfail.hs:38:3: Not in scope: type variable ‘c’
+T6018rnfail.hs:38:3: error: [GHC-76037]
+    Not in scope: type variable ‘c’
 
-T6018rnfail.hs:42:15:
+T6018rnfail.hs:42:15: error:
     Type variable ‘a’, naming a type family result,
     shadows an already bound type variable
 
-T6018rnfail.hs:46:19:
+T6018rnfail.hs:46:19: error:
     Unknown type variable on the RHS of injectivity condition: b
 
-T6018rnfail.hs:49:21: Not in scope: type variable ‘r’
+T6018rnfail.hs:49:21: error: [GHC-76037]
+    Not in scope: type variable ‘r’
 
-T6018rnfail.hs:50:21: Not in scope: type variable ‘r’
+T6018rnfail.hs:50:21: error: [GHC-76037]
+    Not in scope: type variable ‘r’
 
-T6018rnfail.hs:52:26: Not in scope: type variable ‘r’
+T6018rnfail.hs:52:26: error: [GHC-76037]
+    Not in scope: type variable ‘r’
 
-T6018rnfail.hs:53:26: Not in scope: type variable ‘r’
+T6018rnfail.hs:53:26: error: [GHC-76037]
+    Not in scope: type variable ‘r’
diff --git a/testsuite/tests/rename/should_fail/T7906.stderr b/testsuite/tests/rename/should_fail/T7906.stderr
index 5a8c7cb77d..38576165e1 100644
--- a/testsuite/tests/rename/should_fail/T7906.stderr
+++ b/testsuite/tests/rename/should_fail/T7906.stderr
@@ -1,5 +1,5 @@
 
-T7906.hs:5:15: error:
+T7906.hs:5:15: error: [GHC-44432]
     The INLINABLE pragma for ‘foo’ lacks an accompanying binding
     Suggested fix:
       Move the INLINABLE pragma to the declaration site of ‘foo’.
diff --git a/testsuite/tests/rename/should_fail/T7937.stderr b/testsuite/tests/rename/should_fail/T7937.stderr
index 11a2bed876..267c273bc4 100644
--- a/testsuite/tests/rename/should_fail/T7937.stderr
+++ b/testsuite/tests/rename/should_fail/T7937.stderr
@@ -1,4 +1,4 @@
 
-T7937.hs:8:13: error:
+T7937.hs:8:13: error: [GHC-88464]
     Variable not in scope: (***) :: Bool -> Bool -> t
     Suggested fix: Perhaps use ‘**’ (imported from Prelude)
diff --git a/testsuite/tests/rename/should_fail/T7943.stderr b/testsuite/tests/rename/should_fail/T7943.stderr
index c6bf7ae9b5..3100928e51 100644
--- a/testsuite/tests/rename/should_fail/T7943.stderr
+++ b/testsuite/tests/rename/should_fail/T7943.stderr
@@ -1,6 +1,6 @@
 
-T7943.hs:4:22:
-     Record syntax is illegal here: {bar :: String}
-     In the type ‘{bar :: String}’
+T7943.hs:4:22: error: [GHC-89246]
+    • Record syntax is illegal here: {bar :: String}
+    • In the type ‘{bar :: String}’
       In the definition of data constructor ‘B’
-      In the data declaration for ‘Foo’
\ No newline at end of file
+      In the data declaration for ‘Foo’
diff --git a/testsuite/tests/rename/should_fail/T9177.stderr b/testsuite/tests/rename/should_fail/T9177.stderr
index 215a144f06..adc0c7e953 100644
--- a/testsuite/tests/rename/should_fail/T9177.stderr
+++ b/testsuite/tests/rename/should_fail/T9177.stderr
@@ -1,12 +1,13 @@
 
-T9177.hs:4:13: error:
+T9177.hs:4:13: error: [GHC-76037]
     Not in scope: type variable ‘int’
     Suggested fix:
       Perhaps use type constructor or class ‘Int’ (imported from Prelude)
 
-T9177.hs:7:14: error:
+T9177.hs:7:14: error: [GHC-76037]
     Not in scope: type variable ‘integerr’
     Suggested fix:
       Perhaps use type constructor or class ‘Integer’ (imported from Prelude)
 
-T9177.hs:17:6: error: Not in scope: data constructor ‘Fun’
+T9177.hs:17:6: error: [GHC-76037]
+    Not in scope: data constructor ‘Fun’
diff --git a/testsuite/tests/rename/should_fail/T9177a.stderr b/testsuite/tests/rename/should_fail/T9177a.stderr
index 0fd65a0726..0ee99840f4 100644
--- a/testsuite/tests/rename/should_fail/T9177a.stderr
+++ b/testsuite/tests/rename/should_fail/T9177a.stderr
@@ -1,4 +1,5 @@
 
-T9177a.hs:3:8: error: Variable not in scope: bar
+T9177a.hs:3:8: error: [GHC-88464] Variable not in scope: bar
 
-T9177a.hs:4:8: error: Data constructor not in scope: Fun
+T9177a.hs:4:8: error: [GHC-88464]
+    Data constructor not in scope: Fun
diff --git a/testsuite/tests/rename/should_fail/T9436.stderr b/testsuite/tests/rename/should_fail/T9436.stderr
index 30a7c5f6b4..65555ca427 100644
--- a/testsuite/tests/rename/should_fail/T9436.stderr
+++ b/testsuite/tests/rename/should_fail/T9436.stderr
@@ -1,4 +1,4 @@
 
-T9436.hs:8:4: error:
+T9436.hs:8:4: error: [GHC-76037]
     Not in scope: data constructor ‘T'’
     Suggested fix: Perhaps use ‘T’ (line 5)
diff --git a/testsuite/tests/rename/should_fail/T9437.stderr b/testsuite/tests/rename/should_fail/T9437.stderr
index 2b8ec84502..e9ad533b5f 100644
--- a/testsuite/tests/rename/should_fail/T9437.stderr
+++ b/testsuite/tests/rename/should_fail/T9437.stderr
@@ -1,2 +1,3 @@
 
-T9437.hs:8:18: You cannot use `..' in a record update
+T9437.hs:8:18: error: [GHC-70712]
+    You cannot use `..' in a record update
diff --git a/testsuite/tests/rename/should_fail/T9815.stderr b/testsuite/tests/rename/should_fail/T9815.stderr
index 99f16b624d..77b02eff6f 100644
--- a/testsuite/tests/rename/should_fail/T9815.stderr
+++ b/testsuite/tests/rename/should_fail/T9815.stderr
@@ -1,4 +1,4 @@
 
-T9815.hs:6:13:
+T9815.hs:6:13: error: [GHC-47217]
     Illegal `..' notation for constructor ‘N’
       The constructor has no labelled fields
diff --git a/testsuite/tests/rename/should_fail/mc13.stderr b/testsuite/tests/rename/should_fail/mc13.stderr
index e55f179a46..746e5b355c 100644
--- a/testsuite/tests/rename/should_fail/mc13.stderr
+++ b/testsuite/tests/rename/should_fail/mc13.stderr
@@ -1,2 +1,3 @@
 
-mc13.hs:12:37: error: Variable not in scope: f :: [a] -> m a
+mc13.hs:12:37: error: [GHC-88464]
+    Variable not in scope: f :: [a] -> m a
diff --git a/testsuite/tests/rename/should_fail/mc14.stderr b/testsuite/tests/rename/should_fail/mc14.stderr
index 402006af2a..24e34e6e31 100644
--- a/testsuite/tests/rename/should_fail/mc14.stderr
+++ b/testsuite/tests/rename/should_fail/mc14.stderr
@@ -1,2 +1,3 @@
 
-mc14.hs:14:49: error: Variable not in scope: f :: [a] -> m (t0 a)
+mc14.hs:14:49: error: [GHC-88464]
+    Variable not in scope: f :: [a] -> m (t0 a)
diff --git a/testsuite/tests/rename/should_fail/rnfail008.stderr b/testsuite/tests/rename/should_fail/rnfail008.stderr
index bf4b0e4d08..1b10749908 100644
--- a/testsuite/tests/rename/should_fail/rnfail008.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail008.stderr
@@ -1,2 +1,3 @@
 
-rnfail008.hs:18:9: ‘op3’ is not a (visible) method of class ‘K’
+rnfail008.hs:18:9: error: [GHC-54721]
+    ‘op3’ is not a (visible) method of class ‘K’
diff --git a/testsuite/tests/rename/should_fail/rnfail016.stderr b/testsuite/tests/rename/should_fail/rnfail016.stderr
index 6ed450ce0b..cb49527a8e 100644
--- a/testsuite/tests/rename/should_fail/rnfail016.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail016.stderr
@@ -1,4 +1,4 @@
 
-rnfail016.hs:6:7: error:
+rnfail016.hs:6:7: error: [GHC-84077]
     @-pattern in expression context: x@x
     Type application syntax requires a space before '@'
diff --git a/testsuite/tests/rename/should_fail/rnfail016a.stderr b/testsuite/tests/rename/should_fail/rnfail016a.stderr
index 544cf58cac..70fa2c20db 100644
--- a/testsuite/tests/rename/should_fail/rnfail016a.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail016a.stderr
@@ -1,2 +1,2 @@
 
-rnfail016a.hs:6:7: error: parse error on input ‘~’
+rnfail016a.hs:6:7: error: [GHC-58481] parse error on input ‘~’
diff --git a/testsuite/tests/rename/should_fail/rnfail018.stderr b/testsuite/tests/rename/should_fail/rnfail018.stderr
index 847cfe211e..af8100efdd 100644
--- a/testsuite/tests/rename/should_fail/rnfail018.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail018.stderr
@@ -1,8 +1,12 @@
 
-rnfail018.hs:12:37: Not in scope: type variable ‘a’
+rnfail018.hs:12:37: error: [GHC-76037]
+    Not in scope: type variable ‘a’
 
-rnfail018.hs:12:42: Not in scope: type variable ‘m’
+rnfail018.hs:12:42: error: [GHC-76037]
+    Not in scope: type variable ‘m’
 
-rnfail018.hs:12:47: Not in scope: type variable ‘m’
+rnfail018.hs:12:47: error: [GHC-76037]
+    Not in scope: type variable ‘m’
 
-rnfail018.hs:12:49: Not in scope: type variable ‘a’
+rnfail018.hs:12:49: error: [GHC-76037]
+    Not in scope: type variable ‘a’
diff --git a/testsuite/tests/rename/should_fail/rnfail022.stderr b/testsuite/tests/rename/should_fail/rnfail022.stderr
index 87a1adef3f..b916186408 100644
--- a/testsuite/tests/rename/should_fail/rnfail022.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail022.stderr
@@ -1,5 +1,5 @@
 
-rnfail022.hs:8:5: error:
+rnfail022.hs:8:5: error: [GHC-88464]
     Variable not in scope: intersperse
     Suggested fix:
       Perhaps use ‘L.intersperse’ (imported from Data.List)
diff --git a/testsuite/tests/rename/should_fail/rnfail023.stderr b/testsuite/tests/rename/should_fail/rnfail023.stderr
index d10427ae7e..8c0796aa23 100644
--- a/testsuite/tests/rename/should_fail/rnfail023.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail023.stderr
@@ -1,9 +1,9 @@
 
-rnfail023.hs:7:1:
+rnfail023.hs:7:1: error: [GHC-44432]
     The type signature for ‘f’ lacks an accompanying binding
 
-rnfail023.hs:8:12:
+rnfail023.hs:8:12: error: [GHC-44432]
     The INLINE pragma for ‘f’ lacks an accompanying binding
 
-rnfail023.hs:14:7:
+rnfail023.hs:14:7: error: [GHC-44432]
     The type signature for ‘g’ lacks an accompanying binding
diff --git a/testsuite/tests/rename/should_fail/rnfail024.stderr b/testsuite/tests/rename/should_fail/rnfail024.stderr
index 6be278d76e..21cc45f770 100644
--- a/testsuite/tests/rename/should_fail/rnfail024.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail024.stderr
@@ -1,4 +1,4 @@
 
-rnfail024.hs:3:1: error:
+rnfail024.hs:3:1: error: [GHC-44432]
     The type signature for ‘sig_without_a_defn’
       lacks an accompanying binding
diff --git a/testsuite/tests/rename/should_fail/rnfail025.stderr b/testsuite/tests/rename/should_fail/rnfail025.stderr
index 2f57250f33..a5684a29f1 100644
--- a/testsuite/tests/rename/should_fail/rnfail025.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail025.stderr
@@ -1,4 +1,4 @@
 
-rnfail025.hs:3:1:
+rnfail025.hs:3:1: error: [GHC-44432]
     The type signature for ‘sig_without_a_defn’
       lacks an accompanying binding
diff --git a/testsuite/tests/rename/should_fail/rnfail026.stderr b/testsuite/tests/rename/should_fail/rnfail026.stderr
index c7ce103ecc..ebbfb66279 100644
--- a/testsuite/tests/rename/should_fail/rnfail026.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail026.stderr
@@ -1,5 +1,5 @@
 
-rnfail026.hs:16:27: error:
+rnfail026.hs:16:27: error: [GHC-83865]
     • Expected kind ‘* -> *’, but ‘Set a’ has kind ‘*’
     • In the first argument of ‘Monad’, namely
         ‘(forall a. Eq a => Set a)’
diff --git a/testsuite/tests/rename/should_fail/rnfail027.stderr b/testsuite/tests/rename/should_fail/rnfail027.stderr
index c58a74f758..1827dc62a2 100644
--- a/testsuite/tests/rename/should_fail/rnfail027.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail027.stderr
@@ -1,3 +1,3 @@
 
-rnfail027.hs:5:10:
+rnfail027.hs:5:10: error: [GHC-44432]
     The fixity signature for ‘wibble’ lacks an accompanying binding
diff --git a/testsuite/tests/rename/should_fail/rnfail028.stderr b/testsuite/tests/rename/should_fail/rnfail028.stderr
index 848e39e920..33eb4def4b 100644
--- a/testsuite/tests/rename/should_fail/rnfail028.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail028.stderr
@@ -1,3 +1,3 @@
 
-rnfail028.hs:2:21: error:
+rnfail028.hs:2:21: error: [GHC-90973]
     The export item ‘module List’ is not imported
diff --git a/testsuite/tests/rename/should_fail/rnfail029.stderr b/testsuite/tests/rename/should_fail/rnfail029.stderr
index c1d97b3acf..6dc1305ffd 100644
--- a/testsuite/tests/rename/should_fail/rnfail029.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail029.stderr
@@ -1,5 +1,5 @@
 
-rnfail029.hs:2:36:
+rnfail029.hs:2:36: error: [GHC-69158]
     Conflicting exports for ‘map’:
        ‘Data.List.map’ exports ‘Data.List.map’
          imported qualified from ‘Data.List’ at rnfail029.hs:3:1-26
diff --git a/testsuite/tests/rename/should_fail/rnfail030.stderr b/testsuite/tests/rename/should_fail/rnfail030.stderr
index 6343062325..705ea7fba2 100644
--- a/testsuite/tests/rename/should_fail/rnfail030.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail030.stderr
@@ -1,5 +1,5 @@
 
-rnfail030.hs:2:21: error:
+rnfail030.hs:2:21: error: [GHC-76037]
     Not in scope: ‘Data.List.map’
     Suggested fix:
       Perhaps you want to add ‘map’ to the import list in the import of
diff --git a/testsuite/tests/rename/should_fail/rnfail031.stderr b/testsuite/tests/rename/should_fail/rnfail031.stderr
index 1036d52bcb..1f6d57d7a8 100644
--- a/testsuite/tests/rename/should_fail/rnfail031.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail031.stderr
@@ -1,5 +1,5 @@
 
-rnfail031.hs:2:21: error:
+rnfail031.hs:2:21: error: [GHC-76037]
     Not in scope: ‘Data.List.map’
     Suggested fix:
       Perhaps you want to add ‘map’ to the import list in the import of
diff --git a/testsuite/tests/rename/should_fail/rnfail032.stderr b/testsuite/tests/rename/should_fail/rnfail032.stderr
index febd380442..f05e4bc623 100644
--- a/testsuite/tests/rename/should_fail/rnfail032.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail032.stderr
@@ -1,5 +1,5 @@
 
-rnfail032.hs:2:21: error:
+rnfail032.hs:2:21: error: [GHC-76037]
     Not in scope: ‘Data.List.map’
     Suggested fixes:
       • Perhaps use one of these:
diff --git a/testsuite/tests/rename/should_fail/rnfail033.stderr b/testsuite/tests/rename/should_fail/rnfail033.stderr
index d9fbc22a1c..f16eb4ca2b 100644
--- a/testsuite/tests/rename/should_fail/rnfail033.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail033.stderr
@@ -1,5 +1,5 @@
 
-rnfail033.hs:2:21: error:
+rnfail033.hs:2:21: error: [GHC-76037]
     Not in scope: ‘Data.List.map’
     Suggested fixes:
       • Perhaps use one of these:
diff --git a/testsuite/tests/rename/should_fail/rnfail034.stderr b/testsuite/tests/rename/should_fail/rnfail034.stderr
index be73da47a4..f385539f79 100644
--- a/testsuite/tests/rename/should_fail/rnfail034.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail034.stderr
@@ -1,6 +1,6 @@
 
 rnfail034.hs:4:11: error: Qualified name in binding position: M.y
 
-rnfail034.hs:4:26: error:
+rnfail034.hs:4:26: error: [GHC-76037]
     Not in scope: ‘M.y’
     Suggested fix: Perhaps use ‘M.g’ (line 4)
diff --git a/testsuite/tests/rename/should_fail/rnfail035.stderr b/testsuite/tests/rename/should_fail/rnfail035.stderr
index b5de0c0700..2088e25d7b 100644
--- a/testsuite/tests/rename/should_fail/rnfail035.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail035.stderr
@@ -1,2 +1,3 @@
 
-rnfail035.hs:2:21: Not in scope: type constructor or class ‘C’
+rnfail035.hs:2:21: error: [GHC-76037]
+    Not in scope: type constructor or class ‘C’
diff --git a/testsuite/tests/rename/should_fail/rnfail040.stderr b/testsuite/tests/rename/should_fail/rnfail040.stderr
index 33f2f8cba9..19f36e9a05 100644
--- a/testsuite/tests/rename/should_fail/rnfail040.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail040.stderr
@@ -1,9 +1,9 @@
 
-rnfail040.hs:7:12: error:
+rnfail040.hs:7:12: error: [GHC-69158]
     Conflicting exports for ‘nub’:
        ‘module M’ exports ‘M.nub’
          imported from ‘Data.List’ at rnfail040.hs:10:2-22
-         (and originally defined in ‘base-4.13.0.0:Data.OldList’)
+         (and originally defined in ‘base-4.17.0.0:Data.OldList’)
        ‘module M’ exports ‘T.nub’
          imported from ‘Rnfail040_A’ at rnfail040.hs:11:2-24
          (and originally defined at Rnfail040_A.hs:2:3-5)
diff --git a/testsuite/tests/rename/should_fail/rnfail041.stderr b/testsuite/tests/rename/should_fail/rnfail041.stderr
index c5532569d1..423bc50927 100644
--- a/testsuite/tests/rename/should_fail/rnfail041.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail041.stderr
@@ -1,6 +1,6 @@
 
-rnfail041.hs:4:1:
+rnfail041.hs:4:1: error: [GHC-44432]
     The type signature for ‘h’ lacks an accompanying binding
 
-rnfail041.hs:5:1:
+rnfail041.hs:5:1: error: [GHC-44432]
     The type signature for ‘j’ lacks an accompanying binding
diff --git a/testsuite/tests/rename/should_fail/rnfail042.stderr b/testsuite/tests/rename/should_fail/rnfail042.stderr
index 03b7c54471..3ba1f9566f 100644
--- a/testsuite/tests/rename/should_fail/rnfail042.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail042.stderr
@@ -1,8 +1,12 @@
 
-rnfail042.hs:5:11: Illegal binding of built-in syntax: ()
+rnfail042.hs:5:11: error: [GHC-69639]
+    Illegal binding of built-in syntax: ()
 
-rnfail042.hs:6:10: Illegal binding of built-in syntax: (,,,)
+rnfail042.hs:6:10: error: [GHC-69639]
+    Illegal binding of built-in syntax: (,,,)
 
-rnfail042.hs:7:12: Illegal binding of built-in syntax: []
+rnfail042.hs:7:12: error: [GHC-69639]
+    Illegal binding of built-in syntax: []
 
-rnfail042.hs:8:13: Illegal binding of built-in syntax: :
+rnfail042.hs:8:13: error: [GHC-69639]
+    Illegal binding of built-in syntax: :
diff --git a/testsuite/tests/rename/should_fail/rnfail045.stderr b/testsuite/tests/rename/should_fail/rnfail045.stderr
index 52069f567c..b8cf59ba0f 100644
--- a/testsuite/tests/rename/should_fail/rnfail045.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail045.stderr
@@ -1,10 +1,10 @@
 
-rnfail045.hs:5:1:
+rnfail045.hs:5:1: error: [GHC-91938]
     Equations for ‘op1’ have different numbers of arguments
       rnfail045.hs:5:1-16
       rnfail045.hs:6:1-13
 
-rnfail045.hs:8:1:
+rnfail045.hs:8:1: error: [GHC-91938]
     Equations for ‘op2’ have different numbers of arguments
       rnfail045.hs:8:1-13
       rnfail045.hs:9:1-16
diff --git a/testsuite/tests/rename/should_fail/rnfail049.stderr b/testsuite/tests/rename/should_fail/rnfail049.stderr
index a374902114..8a065ff42b 100644
--- a/testsuite/tests/rename/should_fail/rnfail049.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail049.stderr
@@ -1,2 +1,3 @@
 
-rnfail049.hs:12:49: error: Variable not in scope: f :: [a] -> [[a]]
+rnfail049.hs:12:49: error: [GHC-88464]
+    Variable not in scope: f :: [a] -> [[a]]
diff --git a/testsuite/tests/rename/should_fail/rnfail050.stderr b/testsuite/tests/rename/should_fail/rnfail050.stderr
index 6ce61321f9..a559e0ccdf 100644
--- a/testsuite/tests/rename/should_fail/rnfail050.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail050.stderr
@@ -1,2 +1,3 @@
 
-rnfail050.hs:10:37: error: Variable not in scope: f :: [a] -> [a]
+rnfail050.hs:10:37: error: [GHC-88464]
+    Variable not in scope: f :: [a] -> [a]
diff --git a/testsuite/tests/rename/should_fail/rnfail051.stderr b/testsuite/tests/rename/should_fail/rnfail051.stderr
index c1f4f43a2f..75a37142ca 100644
--- a/testsuite/tests/rename/should_fail/rnfail051.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail051.stderr
@@ -1,3 +1,3 @@
 
-rnfail051.hs:7:17: error:
+rnfail051.hs:7:17: error: [GHC-66228]
     View pattern in expression context: _ -> putStrLn "_"
diff --git a/testsuite/tests/rename/should_fail/rnfail052.stderr b/testsuite/tests/rename/should_fail/rnfail052.stderr
index 242fb70fd6..db9aaeb923 100644
--- a/testsuite/tests/rename/should_fail/rnfail052.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail052.stderr
@@ -1,17 +1,17 @@
 
-rnfail052.hs:7:6: error:
+rnfail052.hs:7:6: error: [GHC-25955]
     Illegal symbol ‘forall’ in type
     Suggested fix:
       Perhaps you intended to use RankNTypes
       or a similar language extension to enable explicit-forall syntax: forall <tvs>. <type>
 
-rnfail052.hs:10:14: error:
+rnfail052.hs:10:14: error: [GHC-25955]
     Illegal symbol ‘forall’ in type
     Suggested fix:
       Perhaps you intended to use RankNTypes
       or a similar language extension to enable explicit-forall syntax: forall <tvs>. <type>
 
-rnfail052.hs:13:15: error:
+rnfail052.hs:13:15: error: [GHC-25955]
     Illegal symbol ‘forall’ in type
     Suggested fix:
       Perhaps you intended to use RankNTypes
diff --git a/testsuite/tests/rename/should_fail/rnfail054.stderr b/testsuite/tests/rename/should_fail/rnfail054.stderr
index edfac8a1c8..04fff51118 100644
--- a/testsuite/tests/rename/should_fail/rnfail054.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail054.stderr
@@ -1,5 +1,5 @@
 
-rnfail054.hs:6:13:
-    ‘foo’ is not a record selector
-    In the expression: x {foo = 1}
-    In an equation for ‘foo’: foo x = x {foo = 1}
+rnfail054.hs:6:13: error: [GHC-47535]
+    • ‘foo’ is not a record selector
+    • In the expression: x {foo = 1}
+      In an equation for ‘foo’: foo x = x {foo = 1}
diff --git a/testsuite/tests/rename/should_fail/rnfail057.stderr b/testsuite/tests/rename/should_fail/rnfail057.stderr
index aaeb29dc4f..67ef804dc3 100644
--- a/testsuite/tests/rename/should_fail/rnfail057.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail057.stderr
@@ -1,3 +1,3 @@
 
-rnfail057.hs:5:16:
+rnfail057.hs:5:16: error: [GHC-76037]
     Not in scope: type constructor or class ‘DontExistKind’