Adjust test suite to new Language Pragma warnigns

(this is related to #3647)

82 files changed, 114 insertions, 115 deletions

diff --git a/testsuite/tests/deriving/should_fail/Roles5.stderr b/testsuite/tests/deriving/should_fail/Roles5.stderr
index 2a58a8a0ed..29018be19d 100644
--- a/testsuite/tests/deriving/should_fail/Roles5.stderr
+++ b/testsuite/tests/deriving/should_fail/Roles5.stderr
@@ -1,15 +1,15 @@
 
 Roles5.hs:3:8:
     Illegal role annotation
-    Perhaps you intended to use -XRoleAnnotations
+    Perhaps you intended to use RoleAnnotations
     In the data type declaration for ‛T’
 
 Roles5.hs:4:9:
     Illegal role annotation
-    Perhaps you intended to use -XRoleAnnotations
+    Perhaps you intended to use RoleAnnotations
     In the declaration for class C
 
 Roles5.hs:5:8:
     Illegal role annotation
-    Perhaps you intended to use -XRoleAnnotations
+    Perhaps you intended to use RoleAnnotations
     In the declaration for type synonym ‛S’
diff --git a/testsuite/tests/deriving/should_fail/T1133A.stderr b/testsuite/tests/deriving/should_fail/T1133A.stderr
index c1830b143e..a17e684309 100644
--- a/testsuite/tests/deriving/should_fail/T1133A.stderr
+++ b/testsuite/tests/deriving/should_fail/T1133A.stderr
@@ -3,5 +3,5 @@ T1133A.hs:6:28:
     Can't make a derived instance of ‛Enum X’:
       ‛X’ must be an enumeration type
       (an enumeration consists of one or more nullary, non-GADT constructors)
-      Try -XGeneralizedNewtypeDeriving for GHC's newtype-deriving extension
+      Try GeneralizedNewtypeDeriving for GHC's newtype-deriving extension
     In the newtype declaration for ‛X’
diff --git a/testsuite/tests/deriving/should_fail/T2604.stderr b/testsuite/tests/deriving/should_fail/T2604.stderr
index fc5320030f..f583331c49 100644
--- a/testsuite/tests/deriving/should_fail/T2604.stderr
+++ b/testsuite/tests/deriving/should_fail/T2604.stderr
@@ -1,10 +1,10 @@
 
 T2604.hs:7:35:
     Can't make a derived instance of ‛Typeable * (DList a)’:
-      You need -XDeriveDataTypeable to derive an instance for this class
+      You need DeriveDataTypeable to derive an instance for this class
     In the data declaration for ‛DList’
 
 T2604.hs:9:38:
     Can't make a derived instance of ‛Typeable * (NList a)’:
-      You need -XDeriveDataTypeable to derive an instance for this class
+      You need DeriveDataTypeable to derive an instance for this class
     In the newtype declaration for ‛NList’
diff --git a/testsuite/tests/deriving/should_fail/T3833.stderr b/testsuite/tests/deriving/should_fail/T3833.stderr
index 3221c355ba..3bfb85705c 100644
--- a/testsuite/tests/deriving/should_fail/T3833.stderr
+++ b/testsuite/tests/deriving/should_fail/T3833.stderr
@@ -2,5 +2,5 @@
 T3833.hs:9:1:
     Can't make a derived instance of ‛Monoid (DecodeMap e)’:
       ‛Monoid’ is not a derivable class
-      Try -XGeneralizedNewtypeDeriving for GHC's newtype-deriving extension
+      Try GeneralizedNewtypeDeriving for GHC's newtype-deriving extension
     In the stand-alone deriving instance for ‛Monoid (DecodeMap e)’
diff --git a/testsuite/tests/deriving/should_fail/T3834.stderr b/testsuite/tests/deriving/should_fail/T3834.stderr
index ba51c74d53..ddd67b2074 100644
--- a/testsuite/tests/deriving/should_fail/T3834.stderr
+++ b/testsuite/tests/deriving/should_fail/T3834.stderr
@@ -2,5 +2,5 @@
 T3834.hs:8:1:
     Can't make a derived instance of ‛C T’:
       ‛C’ is not a derivable class
-      Try -XGeneralizedNewtypeDeriving for GHC's newtype-deriving extension
+      Try GeneralizedNewtypeDeriving for GHC's newtype-deriving extension
     In the stand-alone deriving instance for ‛C T’
diff --git a/testsuite/tests/deriving/should_fail/drvfail-functor1.stderr b/testsuite/tests/deriving/should_fail/drvfail-functor1.stderr
index ec0e79499a..3b5b00c2b8 100644
--- a/testsuite/tests/deriving/should_fail/drvfail-functor1.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail-functor1.stderr
@@ -1,5 +1,5 @@
 
 drvfail-functor1.hs:6:14:
     Can't make a derived instance of ‛Functor List’:
-      You need -XDeriveFunctor to derive an instance for this class
+      You need DeriveFunctor to derive an instance for this class
     In the data declaration for ‛List’
diff --git a/testsuite/tests/deriving/should_fail/drvfail015.stderr b/testsuite/tests/deriving/should_fail/drvfail015.stderr
index 7a755c697f..e47ca459d5 100644
--- a/testsuite/tests/deriving/should_fail/drvfail015.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail015.stderr
@@ -3,7 +3,7 @@ drvfail015.hs:10:19:
     Illegal instance declaration for ‛Eq T’
       (All instance types must be of the form (T t1 ... tn)
        where T is not a synonym.
-       Use -XTypeSynonymInstances if you want to disable this.)
+       Use TypeSynonymInstances if you want to disable this.)
     In the stand-alone deriving instance for ‛Eq T’
 
 drvfail015.hs:13:1:
diff --git a/testsuite/tests/gadt/gadtSyntaxFail001.stderr b/testsuite/tests/gadt/gadtSyntaxFail001.stderr
index 0250c5e663..0413ddf320 100644
--- a/testsuite/tests/gadt/gadtSyntaxFail001.stderr
+++ b/testsuite/tests/gadt/gadtSyntaxFail001.stderr
@@ -2,6 +2,6 @@
 gadtSyntaxFail001.hs:8:5:
     Data constructor ‛C2’ has existential type variables, a context, or a specialised result type
       C2 :: forall a. a -> Char -> Foo a Int
-      (Use -XExistentialQuantification or -XGADTs to allow this)
+      (Use ExistentialQuantification or GADTs to allow this)
     In the definition of data constructor ‛C2’
     In the data declaration for ‛Foo’
diff --git a/testsuite/tests/gadt/gadtSyntaxFail002.stderr b/testsuite/tests/gadt/gadtSyntaxFail002.stderr
index ebfd62d7bc..337e39d7e8 100644
--- a/testsuite/tests/gadt/gadtSyntaxFail002.stderr
+++ b/testsuite/tests/gadt/gadtSyntaxFail002.stderr
@@ -2,6 +2,6 @@
 gadtSyntaxFail002.hs:8:5:
     Data constructor ‛C2’ has existential type variables, a context, or a specialised result type
       C2 :: forall a. a -> Char -> Foo a a
-      (Use -XExistentialQuantification or -XGADTs to allow this)
+      (Use ExistentialQuantification or GADTs to allow this)
     In the definition of data constructor ‛C2’
     In the data declaration for ‛Foo’
diff --git a/testsuite/tests/gadt/gadtSyntaxFail003.stderr b/testsuite/tests/gadt/gadtSyntaxFail003.stderr
index aeed6f7d9a..e948698d03 100644
--- a/testsuite/tests/gadt/gadtSyntaxFail003.stderr
+++ b/testsuite/tests/gadt/gadtSyntaxFail003.stderr
@@ -2,6 +2,6 @@
 gadtSyntaxFail003.hs:7:5:
     Data constructor ‛C1’ has existential type variables, a context, or a specialised result type
       C1 :: forall b a c. a -> Int -> c -> Foo b a
-      (Use -XExistentialQuantification or -XGADTs to allow this)
+      (Use ExistentialQuantification or GADTs to allow this)
     In the definition of data constructor ‛C1’
     In the data declaration for ‛Foo’
diff --git a/testsuite/tests/generics/GenShouldFail0.stderr b/testsuite/tests/generics/GenShouldFail0.stderr
index f85cd92894..0c941b9781 100644
--- a/testsuite/tests/generics/GenShouldFail0.stderr
+++ b/testsuite/tests/generics/GenShouldFail0.stderr
@@ -1,5 +1,5 @@
 
 GenShouldFail0.hs:9:1:
     Can't make a derived instance of ‛Generic X’:
-      You need -XDeriveGeneric to derive an instance for this class
+      You need DeriveGeneric to derive an instance for this class
     In the stand-alone deriving instance for ‛Generic X’
diff --git a/testsuite/tests/generics/GenShouldFail1_0.stderr b/testsuite/tests/generics/GenShouldFail1_0.stderr
index 00779d00ea..d368be58cd 100644
--- a/testsuite/tests/generics/GenShouldFail1_0.stderr
+++ b/testsuite/tests/generics/GenShouldFail1_0.stderr
@@ -1,5 +1,5 @@
 
 GenShouldFail1_0.hs:9:1:
     Can't make a derived instance of ‛Generic1 X’:
-      You need -XDeriveGeneric to derive an instance for this class
+      You need DeriveGeneric to derive an instance for this class
     In the stand-alone deriving instance for ‛Generic1 X’
diff --git a/testsuite/tests/ghci/prog006/prog006.stderr b/testsuite/tests/ghci/prog006/prog006.stderr
index 53c82d5466..0001208e2d 100644
--- a/testsuite/tests/ghci/prog006/prog006.stderr
+++ b/testsuite/tests/ghci/prog006/prog006.stderr
@@ -1,4 +1,4 @@
 
 Boot.hs:5:13:
     Not a data constructor: ‛forall’
-    Perhaps you intended to use -XExistentialQuantification
+    Perhaps you intended to use ExistentialQuantification
diff --git a/testsuite/tests/ghci/scripts/ghci044.stderr b/testsuite/tests/ghci/scripts/ghci044.stderr
index c0737d13b5..173e39aca4 100644
--- a/testsuite/tests/ghci/scripts/ghci044.stderr
+++ b/testsuite/tests/ghci/scripts/ghci044.stderr
@@ -4,7 +4,7 @@
       (All instance types must be of the form (T a1 ... an)
        where a1 ... an are *distinct type variables*,
        and each type variable appears at most once in the instance head.
-       Use -XFlexibleInstances if you want to disable this.)
+       Use FlexibleInstances if you want to disable this.)
     In the instance declaration for ‛C [Int]’
 
 <interactive>:7:10:
diff --git a/testsuite/tests/ghci/scripts/ghci057.stderr b/testsuite/tests/ghci/scripts/ghci057.stderr
index 03065845f1..e26f15e1a9 100644
--- a/testsuite/tests/ghci/scripts/ghci057.stderr
+++ b/testsuite/tests/ghci/scripts/ghci057.stderr
@@ -1,19 +1,19 @@
 
 <interactive>:5:1:
     Illegal generalised algebraic data declaration for ‛T’
-      (Use -XGADTs to allow GADTs)
+      (Use GADTs to allow GADTs)
     In the data declaration for ‛T’
 
 ghci057.hs:3:3:
     Data constructor ‛C’ has existential type variables, a context, or a specialised result type
       C :: T Int
-      (Use -XExistentialQuantification or -XGADTs to allow this)
+      (Use ExistentialQuantification or GADTs to allow this)
     In the definition of data constructor ‛C’
     In the data declaration for ‛T’
 
 ghci057.hs:3:3:
     Data constructor ‛C’ has existential type variables, a context, or a specialised result type
       C :: T Int
-      (Use -XExistentialQuantification or -XGADTs to allow this)
+      (Use ExistentialQuantification or GADTs to allow this)
     In the definition of data constructor ‛C’
     In the data declaration for ‛T’
diff --git a/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.stderr b/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.stderr
index e56025a908..b06cae35f7 100644
--- a/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.stderr
+++ b/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.stderr
@@ -2,17 +2,17 @@
 NotRelaxedExamples.hs:9:15:
     Nested type family application
       in the type family application: F1 (F1 Char)
-    (Use -XUndecidableInstances to permit this)
+    (Use UndecidableInstances to permit this)
     In the type instance declaration for ‛F1’
 
 NotRelaxedExamples.hs:10:15:
     Application is no smaller than the instance head
       in the type family application: F2 [x]
-    (Use -XUndecidableInstances to permit this)
+    (Use UndecidableInstances to permit this)
     In the type instance declaration for ‛F2’
 
 NotRelaxedExamples.hs:11:15:
     Application is no smaller than the instance head
       in the type family application: F3 [Char]
-    (Use -XUndecidableInstances to permit this)
+    (Use UndecidableInstances to permit this)
     In the type instance declaration for ‛F3’
diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail15.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail15.stderr
index d5c1c7fb54..1b1d03c2e5 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail15.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail15.stderr
@@ -1,6 +1,6 @@
 
 SimpleFail15.hs:5:8:
     Illegal polymorphic or qualified type: a ~ b => t
-    Perhaps you intended to use -XRankNTypes or -XRank2Types
+    Perhaps you intended to use RankNTypes or Rank2Types
     In the type signature for ‛foo’:
       foo :: (a, b) -> (a ~ b => t) -> (a, b)
diff --git a/testsuite/tests/indexed-types/should_fail/T4485.stderr b/testsuite/tests/indexed-types/should_fail/T4485.stderr
index bd408824bf..fca2fc88f7 100644
--- a/testsuite/tests/indexed-types/should_fail/T4485.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4485.stderr
@@ -11,7 +11,7 @@ T4485.hs:47:15:
                               (IdentityT IO) (XMLGenT Identity ())
         -- Defined at T4485.hs:42:10
     (The choice depends on the instantiation of ‛m0’
-     To pick the first instance above, use -XIncoherentInstances
+     To pick the first instance above, use IncoherentInstances
      when compiling the other instance declarations)
     In the expression: asChild
     In the expression: asChild $ (genElement "foo")
diff --git a/testsuite/tests/indexed-types/should_fail/T5934.stderr b/testsuite/tests/indexed-types/should_fail/T5934.stderr
index d036467603..df0ea6e86a 100644
--- a/testsuite/tests/indexed-types/should_fail/T5934.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T5934.stderr
@@ -2,6 +2,6 @@
 T5934.hs:12:7:
     Cannot instantiate unification variable ‛a0’
     with a type involving foralls: (forall s. GenST s) -> Int
-      Perhaps you want -XImpredicativeTypes
+      Perhaps you want ImpredicativeTypes
     In the expression: 0
     In an equation for ‛run’: run = 0
diff --git a/testsuite/tests/indexed-types/should_fail/TyFamUndec.stderr b/testsuite/tests/indexed-types/should_fail/TyFamUndec.stderr
index fef47b534a..da77e08024 100644
--- a/testsuite/tests/indexed-types/should_fail/TyFamUndec.stderr
+++ b/testsuite/tests/indexed-types/should_fail/TyFamUndec.stderr
@@ -2,17 +2,17 @@
 TyFamUndec.hs:6:15:
     Variable ‛b’ occurs more often than in the instance head
       in the type family application: T (b, b)
-    (Use -XUndecidableInstances to permit this)
+    (Use UndecidableInstances to permit this)
     In the type instance declaration for ‛T’
 
 TyFamUndec.hs:7:15:
     Application is no smaller than the instance head
       in the type family application: T (a, Maybe b)
-    (Use -XUndecidableInstances to permit this)
+    (Use UndecidableInstances to permit this)
     In the type instance declaration for ‛T’
 
 TyFamUndec.hs:8:15:
     Nested type family application
       in the type family application: T (a, T b)
-    (Use -XUndecidableInstances to permit this)
+    (Use UndecidableInstances to permit this)
     In the type instance declaration for ‛T’
diff --git a/testsuite/tests/module/mod41.stderr b/testsuite/tests/module/mod41.stderr
index 921fc95942..e9dfe97c33 100644
--- a/testsuite/tests/module/mod41.stderr
+++ b/testsuite/tests/module/mod41.stderr
@@ -4,5 +4,5 @@ mod41.hs:3:18:
       (All instance types must be of the form (T a1 ... an)
        where a1 ... an are *distinct type variables*,
        and each type variable appears at most once in the instance head.
-       Use -XFlexibleInstances if you want to disable this.)
+       Use FlexibleInstances if you want to disable this.)
     In the instance declaration for ‛Eq (Either a a)’
diff --git a/testsuite/tests/module/mod42.stderr b/testsuite/tests/module/mod42.stderr
index 8fd553febd..b09258724f 100644
--- a/testsuite/tests/module/mod42.stderr
+++ b/testsuite/tests/module/mod42.stderr
@@ -4,5 +4,5 @@ mod42.hs:3:10:
       (All instance types must be of the form (T a1 ... an)
        where a1 ... an are *distinct type variables*,
        and each type variable appears at most once in the instance head.
-       Use -XFlexibleInstances if you want to disable this.)
+       Use FlexibleInstances if you want to disable this.)
     In the instance declaration for ‛Eq a’
diff --git a/testsuite/tests/module/mod43.stderr b/testsuite/tests/module/mod43.stderr
index 5630a4ae58..dd1dac68ad 100644
--- a/testsuite/tests/module/mod43.stderr
+++ b/testsuite/tests/module/mod43.stderr
@@ -3,5 +3,5 @@ mod43.hs:3:10:
     Illegal instance declaration for ‛Eq String’
       (All instance types must be of the form (T t1 ... tn)
        where T is not a synonym.
-       Use -XTypeSynonymInstances if you want to disable this.)
+       Use TypeSynonymInstances if you want to disable this.)
     In the instance declaration for ‛Eq String’
diff --git a/testsuite/tests/module/mod45.stderr b/testsuite/tests/module/mod45.stderr
index 2673763cb0..7102bf2e7d 100644
--- a/testsuite/tests/module/mod45.stderr
+++ b/testsuite/tests/module/mod45.stderr
@@ -2,5 +2,5 @@
 mod45.hs:5:11:
     Illegal type signature in instance declaration:
       (==) :: T -> T -> Bool
-    (Use -XInstanceSigs to allow this)
+    (Use InstanceSigs to allow this)
     In the instance declaration for ‛Eq T’
diff --git a/testsuite/tests/parser/should_fail/NoDoAndIfThenElse.stderr b/testsuite/tests/parser/should_fail/NoDoAndIfThenElse.stderr
index b175c0ac5e..6c96fc9679 100644
--- a/testsuite/tests/parser/should_fail/NoDoAndIfThenElse.stderr
+++ b/testsuite/tests/parser/should_fail/NoDoAndIfThenElse.stderr
@@ -2,4 +2,4 @@
 NoDoAndIfThenElse.hs:7:13:
     Unexpected semi-colons in conditional:
         if True; then return (); else return ()
-    Perhaps you meant to use -XDoAndIfThenElse?
+    Perhaps you meant to use DoAndIfThenElse?
diff --git a/testsuite/tests/parser/should_fail/ParserNoForallUnicode.stderr b/testsuite/tests/parser/should_fail/ParserNoForallUnicode.stderr
index a359864f44..6c9843343a 100644
--- a/testsuite/tests/parser/should_fail/ParserNoForallUnicode.stderr
+++ b/testsuite/tests/parser/should_fail/ParserNoForallUnicode.stderr
@@ -1,5 +1,5 @@
 
 ParserNoForallUnicode.hs:5:8:
     Illegal symbol '∀' in type
-    Perhaps you intended -XRankNTypes or similar flag
-    to enable explicit-forall syntax: ∀ <tvs>. <type>
+    Perhaps you intended to use RankNTypes or a similar language
+    extension to enable explicit-forall syntax: ∀ <tvs>. <type>
diff --git a/testsuite/tests/parser/should_fail/ParserNoMultiWayIf.stderr b/testsuite/tests/parser/should_fail/ParserNoMultiWayIf.stderr
index 1a82362884..64d70520b0 100644
--- a/testsuite/tests/parser/should_fail/ParserNoMultiWayIf.stderr
+++ b/testsuite/tests/parser/should_fail/ParserNoMultiWayIf.stderr
@@ -1,3 +1,3 @@
 
 ParserNoMultiWayIf.hs:4:5:
-    Multi-way if-expressions need -XMultiWayIf turned on
+    Multi-way if-expressions need MultiWayIf turned on
diff --git a/testsuite/tests/parser/should_fail/T3095.stderr b/testsuite/tests/parser/should_fail/T3095.stderr
index 3e47128e41..1cb7a0f41f 100644
--- a/testsuite/tests/parser/should_fail/T3095.stderr
+++ b/testsuite/tests/parser/should_fail/T3095.stderr
@@ -1,5 +1,5 @@
 
 T3095.hs:5:21:
     Illegal symbol '.' in type
-    Perhaps you intended -XRankNTypes or similar flag
-    to enable explicit-forall syntax: forall <tvs>. <type>
+    Perhaps you intended to use RankNTypes or a similar language
+    extension to enable explicit-forall syntax: forall <tvs>. <type>
diff --git a/testsuite/tests/parser/should_fail/T3811e.stderr b/testsuite/tests/parser/should_fail/T3811e.stderr
index f2acc84706..e98be9ffe6 100644
--- a/testsuite/tests/parser/should_fail/T3811e.stderr
+++ b/testsuite/tests/parser/should_fail/T3811e.stderr
@@ -1,5 +1,4 @@
 
 T3811e.hs:6:6:
-    Illegal datatype context (use -XDatatypeContexts): (Show a,
-                                                        Read a) =>
-
+    Illegal datatype context (use DatatypeContexts): (Show a,
+                                                      Read a) =>
diff --git a/testsuite/tests/parser/should_fail/readFail001.stderr b/testsuite/tests/parser/should_fail/readFail001.stderr
index aba4ec239d..dc02e8588f 100644
--- a/testsuite/tests/parser/should_fail/readFail001.stderr
+++ b/testsuite/tests/parser/should_fail/readFail001.stderr
@@ -4,11 +4,11 @@ readFail001.hs:25:11:
 
 readFail001.hs:38:32:
     Not in scope: type constructor or class ‛Leaf’
-    A data constructor of that name is in scope; did you mean -XDataKinds?
+    A data constructor of that name is in scope; did you mean DataKinds?
 
 readFail001.hs:38:41:
     Not in scope: type constructor or class ‛Leaf’
-    A data constructor of that name is in scope; did you mean -XDataKinds?
+    A data constructor of that name is in scope; did you mean DataKinds?
 
 readFail001.hs:87:11: Not in scope: ‛x’
 
diff --git a/testsuite/tests/parser/should_fail/readFail035.stderr b/testsuite/tests/parser/should_fail/readFail035.stderr
index 9e3a64a06c..cd0f2c38ea 100644
--- a/testsuite/tests/parser/should_fail/readFail035.stderr
+++ b/testsuite/tests/parser/should_fail/readFail035.stderr
@@ -1,4 +1,4 @@
 
 readFail035.hs:6:1:
-    ‛Foo’ has no constructors (-XEmptyDataDecls permits this)
+    ‛Foo’ has no constructors (EmptyDataDecls permits this)
     In the data declaration for ‛Foo’
diff --git a/testsuite/tests/parser/should_fail/readFail036.stderr b/testsuite/tests/parser/should_fail/readFail036.stderr
index 9360e6242f..8c9d4d4aa3 100644
--- a/testsuite/tests/parser/should_fail/readFail036.stderr
+++ b/testsuite/tests/parser/should_fail/readFail036.stderr
@@ -1,5 +1,5 @@
 
 readFail036.hs:4:16:
     Illegal kind signature: ‛*’
-      Perhaps you intended to use -XKindSignatures
+      Perhaps you intended to use KindSignatures
     In the data type declaration for ‛Foo’
diff --git a/testsuite/tests/parser/should_fail/readFail037.stderr b/testsuite/tests/parser/should_fail/readFail037.stderr
index a9c9ff7ad0..e3e65cf645 100644
--- a/testsuite/tests/parser/should_fail/readFail037.stderr
+++ b/testsuite/tests/parser/should_fail/readFail037.stderr
@@ -1,5 +1,5 @@
 
 readFail037.hs:4:1:
     Too many parameters for class ‛Foo’
-    (Use -XMultiParamTypeClasses to allow multi-parameter classes)
+    (Use MultiParamTypeClasses to allow multi-parameter classes)
     In the class declaration for ‛Foo’
diff --git a/testsuite/tests/parser/should_fail/readFail038.stderr b/testsuite/tests/parser/should_fail/readFail038.stderr
index 6933463b8f..c1650c6904 100644
--- a/testsuite/tests/parser/should_fail/readFail038.stderr
+++ b/testsuite/tests/parser/should_fail/readFail038.stderr
@@ -1,4 +1,4 @@
 
 readFail038.hs:6:7:
     Unexpected parallel statement in a list comprehension
-    Use -XParallelListComp
+    Use ParallelListComp
diff --git a/testsuite/tests/parser/should_fail/readFail039.stderr b/testsuite/tests/parser/should_fail/readFail039.stderr
index d0e27526fc..a4ffdf8dac 100644
--- a/testsuite/tests/parser/should_fail/readFail039.stderr
+++ b/testsuite/tests/parser/should_fail/readFail039.stderr
@@ -2,5 +2,5 @@
 readFail039.hs:8:14:
     Can't make a derived instance of ‛C Foo’:
       ‛C’ is not a derivable class
-      Try -XGeneralizedNewtypeDeriving for GHC's newtype-deriving extension
+      Try GeneralizedNewtypeDeriving for GHC's newtype-deriving extension
     In the newtype declaration for ‛Foo’
diff --git a/testsuite/tests/parser/should_fail/readFail041.stderr b/testsuite/tests/parser/should_fail/readFail041.stderr
index 14903b5b28..f94d2282ed 100644
--- a/testsuite/tests/parser/should_fail/readFail041.stderr
+++ b/testsuite/tests/parser/should_fail/readFail041.stderr
@@ -1,5 +1,5 @@
 
 readFail041.hs:6:1:
     Fundeps in class ‛Foo’
-    (Use -XFunctionalDependencies to allow fundeps)
+    (Use FunctionalDependencies to allow fundeps)
     In the class declaration for ‛Foo’
diff --git a/testsuite/tests/parser/should_fail/readFail042.stderr b/testsuite/tests/parser/should_fail/readFail042.stderr
index 9941cb633c..433397ff11 100644
--- a/testsuite/tests/parser/should_fail/readFail042.stderr
+++ b/testsuite/tests/parser/should_fail/readFail042.stderr
@@ -1,11 +1,11 @@
 
 readFail042.hs:10:9:
     Unexpected transform statement in a list comprehension
-    Use -XTransformListComp
+    Use TransformListComp
 
 readFail042.hs:11:9:
     Unexpected transform statement in a list comprehension
-    Use -XTransformListComp
+    Use TransformListComp
 
 readFail042.hs:11:23: Not in scope: ‛by’
 
diff --git a/testsuite/tests/parser/should_fail/readFail043.stderr b/testsuite/tests/parser/should_fail/readFail043.stderr
index 72981ed3f8..b39f8f87a2 100644
--- a/testsuite/tests/parser/should_fail/readFail043.stderr
+++ b/testsuite/tests/parser/should_fail/readFail043.stderr
@@ -1,7 +1,7 @@
 
 readFail043.hs:10:9:
     Unexpected transform statement in a list comprehension
-    Use -XTransformListComp
+    Use TransformListComp
 
 readFail043.hs:10:20: Not in scope: ‛by’
 
@@ -11,7 +11,7 @@ readFail043.hs:10:25: Not in scope: ‛using’
 
 readFail043.hs:11:9:
     Unexpected transform statement in a list comprehension
-    Use -XTransformListComp
+    Use TransformListComp
 
 readFail043.hs:11:20: Not in scope: ‛by’
 
@@ -21,6 +21,6 @@ readFail043.hs:11:25: Not in scope: ‛using’
 
 readFail043.hs:12:9:
     Unexpected transform statement in a list comprehension
-    Use -XTransformListComp
+    Use TransformListComp
 
 readFail043.hs:12:20: Not in scope: ‛using’
diff --git a/testsuite/tests/parser/should_fail/readFailTraditionalRecords1.stderr b/testsuite/tests/parser/should_fail/readFailTraditionalRecords1.stderr
index 34887ef0b5..34cda9c264 100644
--- a/testsuite/tests/parser/should_fail/readFailTraditionalRecords1.stderr
+++ b/testsuite/tests/parser/should_fail/readFailTraditionalRecords1.stderr
@@ -1,3 +1,3 @@
 
 readFailTraditionalRecords1.hs:6:16:
-    Illegal record syntax (use -XTraditionalRecordSyntax): {i :: Int}
+    Illegal record syntax (use TraditionalRecordSyntax): {i :: Int}
diff --git a/testsuite/tests/parser/should_fail/readFailTraditionalRecords2.stderr b/testsuite/tests/parser/should_fail/readFailTraditionalRecords2.stderr
index a2d6bb3a39..771b345a70 100644
--- a/testsuite/tests/parser/should_fail/readFailTraditionalRecords2.stderr
+++ b/testsuite/tests/parser/should_fail/readFailTraditionalRecords2.stderr
@@ -1,3 +1,3 @@
 
 readFailTraditionalRecords2.hs:6:4:
-    Illegal record syntax (use -XTraditionalRecordSyntax): Foo {i = j}
+    Illegal record syntax (use TraditionalRecordSyntax): Foo {i = j}
diff --git a/testsuite/tests/parser/should_fail/readFailTraditionalRecords3.stderr b/testsuite/tests/parser/should_fail/readFailTraditionalRecords3.stderr
index 678486d0bc..0317935c0b 100644
--- a/testsuite/tests/parser/should_fail/readFailTraditionalRecords3.stderr
+++ b/testsuite/tests/parser/should_fail/readFailTraditionalRecords3.stderr
@@ -1,3 +1,3 @@
 
 readFailTraditionalRecords3.hs:6:7:
-    Illegal record syntax (use -XTraditionalRecordSyntax): x {i = 3}
+    Illegal record syntax (use TraditionalRecordSyntax): x {i = 3}
diff --git a/testsuite/tests/polykinds/T7151.stderr b/testsuite/tests/polykinds/T7151.stderr
index bdefa666d3..61949db94f 100644
--- a/testsuite/tests/polykinds/T7151.stderr
+++ b/testsuite/tests/polykinds/T7151.stderr
@@ -1,4 +1,4 @@
 
 T7151.hs:3:12:
     Illegal type: ‛'[Int, String]’
-      Perhaps you intended to use -XDataKinds
+      Perhaps you intended to use DataKinds
diff --git a/testsuite/tests/polykinds/T7433.stderr b/testsuite/tests/polykinds/T7433.stderr
index 6cb69630e8..97ba56e195 100644
--- a/testsuite/tests/polykinds/T7433.stderr
+++ b/testsuite/tests/polykinds/T7433.stderr
@@ -1,6 +1,6 @@
 
 T7433.hs:2:10:
     Data constructor ‛Z’ cannot be used here
-      (Perhaps you intended to use -XDataKinds)
+      (Perhaps you intended to use DataKinds)
     In the type ‛Z’
     In the type declaration for ‛T’
diff --git a/testsuite/tests/rename/should_compile/rn049.stderr b/testsuite/tests/rename/should_compile/rn049.stderr
index 766c681051..77df012628 100644
--- a/testsuite/tests/rename/should_compile/rn049.stderr
+++ b/testsuite/tests/rename/should_compile/rn049.stderr
@@ -1,4 +1,4 @@
 
-rn049.hs:12:6:
-    Warning: accepting non-standard pattern guards (use -XPatternGuards to suppress this message)
-		 x <- 1 * 2 + 3 * 4
+rn049.hs:12:6: Warning:
+    accepting non-standard pattern guards (use PatternGuards to suppress this message)
+        x <- 1 * 2 + 3 * 4
diff --git a/testsuite/tests/rename/should_fail/T3265.stderr b/testsuite/tests/rename/should_fail/T3265.stderr
index 0a56f4c5d0..185861a9df 100644
--- a/testsuite/tests/rename/should_fail/T3265.stderr
+++ b/testsuite/tests/rename/should_fail/T3265.stderr
@@ -1,8 +1,8 @@
 
 T3265.hs:7:8:
     Illegal declaration of a type or class operator ‛:+:’
-      Use -XTypeOperators to declare operators in type and declarations
+      Use TypeOperators to declare operators in type and declarations
 
 T3265.hs:9:9:
     Illegal declaration of a type or class operator ‛:*:’
-      Use -XTypeOperators to declare operators in type and declarations
+      Use TypeOperators to declare operators in type and declarations
diff --git a/testsuite/tests/rename/should_fail/rnfail052.stderr b/testsuite/tests/rename/should_fail/rnfail052.stderr
index f6d0929bca..1884776392 100644
--- a/testsuite/tests/rename/should_fail/rnfail052.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail052.stderr
@@ -1,5 +1,5 @@
 
 rnfail052.hs:6:14:
     Illegal symbol '.' in type
-    Perhaps you intended -XRankNTypes or similar flag
-    to enable explicit-forall syntax: forall <tvs>. <type>
+    Perhaps you intended to use RankNTypes or a similar language
+    extension to enable explicit-forall syntax: forall <tvs>. <type>
diff --git a/testsuite/tests/rename/should_fail/rnfail053.stderr b/testsuite/tests/rename/should_fail/rnfail053.stderr
index 8dc85ab49e..183c8a72ec 100644
--- a/testsuite/tests/rename/should_fail/rnfail053.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail053.stderr
@@ -1,4 +1,4 @@
 
 rnfail053.hs:5:10:
     Not a data constructor: ‛forall’
-    Perhaps you intended to use -XExistentialQuantification
+    Perhaps you intended to use ExistentialQuantification
diff --git a/testsuite/tests/rename/should_fail/rnfail056.stderr b/testsuite/tests/rename/should_fail/rnfail056.stderr
index 3ddf502dee..19c1188ce4 100644
--- a/testsuite/tests/rename/should_fail/rnfail056.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail056.stderr
@@ -1,4 +1,4 @@
 
-rnfail056.hs:6:7: Illegal tuple section: use -XTupleSections
+rnfail056.hs:6:7: Illegal tuple section: use TupleSections
 
-rnfail056.hs:8:7: Illegal tuple section: use -XTupleSections
+rnfail056.hs:8:7: Illegal tuple section: use TupleSections
diff --git a/testsuite/tests/safeHaskell/ghci/p16.stderr b/testsuite/tests/safeHaskell/ghci/p16.stderr
index 373920e57d..77d3b1bed1 100644
--- a/testsuite/tests/safeHaskell/ghci/p16.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p16.stderr
@@ -5,7 +5,7 @@
 <interactive>:16:29:
     Can't make a derived instance of ‛Op T2’:
       ‛Op’ is not a derivable class
-      Try -XGeneralizedNewtypeDeriving for GHC's newtype-deriving extension
+      Try GeneralizedNewtypeDeriving for GHC's newtype-deriving extension
     In the newtype declaration for ‛T2’
 
 <interactive>:19:9:
diff --git a/testsuite/tests/safeHaskell/safeInfered/Mixed01.stderr b/testsuite/tests/safeHaskell/safeInfered/Mixed01.stderr
index e52f966332..82a78d0bef 100644
--- a/testsuite/tests/safeHaskell/safeInfered/Mixed01.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/Mixed01.stderr
@@ -1,4 +1,4 @@
 
 Mixed01.hs:5:1:
     safe import can't be used as Safe Haskell isn't on!
-    please enable Safe Haskell through either-XSafe, -XTruswrothy or -XUnsafe
+    please enable Safe Haskell through eitherSafe, Trustwrothy or Unsafe
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr
index 117316192f..a275ccc0e3 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr
@@ -1,11 +1,11 @@
 
-SafeLang12.hs:2:14:
-    Warning: -XTemplateHaskell is not allowed in Safe Haskell; ignoring -XTemplateHaskell
+SafeLang12.hs:2:14: Warning:
+    -XTemplateHaskell is not allowed in Safe Haskell; ignoring -XTemplateHaskell
 
-SafeLang12_B.hs:2:14:
-    Warning: -XTemplateHaskell is not allowed in Safe Haskell; ignoring -XTemplateHaskell
+SafeLang12_B.hs:2:14: Warning:
+    -XTemplateHaskell is not allowed in Safe Haskell; ignoring -XTemplateHaskell
 [1 of 3] Compiling SafeLang12_B     ( SafeLang12_B.hs, SafeLang12_B.o )
 
 SafeLang12_B.hs:14:67:
     Syntax error on ''Class
-    Perhaps you intended to use -XTemplateHaskell
+    Perhaps you intended to use TemplateHaskell
diff --git a/testsuite/tests/th/TH_Roles1.stderr b/testsuite/tests/th/TH_Roles1.stderr
index 0b1ac3338c..f8b659e417 100644
--- a/testsuite/tests/th/TH_Roles1.stderr
+++ b/testsuite/tests/th/TH_Roles1.stderr
@@ -1,5 +1,5 @@
 
 TH_Roles1.hs:7:4:
     Illegal role annotation
-    Perhaps you intended to use -XRoleAnnotations
+    Perhaps you intended to use RoleAnnotations
     In the data type declaration for ‛T’
diff --git a/testsuite/tests/typecheck/should_fail/T2538.stderr b/testsuite/tests/typecheck/should_fail/T2538.stderr
index 2e67c878af..9838eb5bff 100644
--- a/testsuite/tests/typecheck/should_fail/T2538.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2538.stderr
@@ -1,12 +1,12 @@
 
 T2538.hs:6:6:
     Illegal polymorphic or qualified type: Eq a => a -> a
-    Perhaps you intended to use -XRankNTypes or -XRank2Types
+    Perhaps you intended to use RankNTypes or Rank2Types
     In the type signature for ‛f’: f :: (Eq a => a -> a) -> Int
 
 T2538.hs:9:6:
     Illegal polymorphic or qualified type: Eq a => a -> a
-    Perhaps you intended to use -XImpredicativeTypes
+    Perhaps you intended to use ImpredicativeTypes
     In the type signature for ‛g’: g :: [Eq a => a -> a] -> Int
 
 T2538.hs:12:6:
diff --git a/testsuite/tests/typecheck/should_fail/T3155.stderr b/testsuite/tests/typecheck/should_fail/T3155.stderr
index d26bb6dd08..85a31c32af 100644
--- a/testsuite/tests/typecheck/should_fail/T3155.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3155.stderr
@@ -1,5 +1,5 @@
 
 T3155.hs:13:18:
     Illegal symbol '.' in type
-    Perhaps you intended -XRankNTypes or similar flag
-    to enable explicit-forall syntax: forall <tvs>. <type>
+    Perhaps you intended to use RankNTypes or a similar language
+    extension to enable explicit-forall syntax: forall <tvs>. <type>
diff --git a/testsuite/tests/typecheck/should_fail/T5051.stderr b/testsuite/tests/typecheck/should_fail/T5051.stderr
index b15c2d9faf..2dae81062f 100644
--- a/testsuite/tests/typecheck/should_fail/T5051.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5051.stderr
@@ -5,7 +5,7 @@ T5051.hs:11:11:
       instance Eq a => Eq [a] -- Defined in ‛GHC.Classes’
       instance [overlap ok] Eq [T] -- Defined at T5051.hs:8:10
     (The choice depends on the instantiation of ‛a’
-     To pick the first instance above, use -XIncoherentInstances
+     To pick the first instance above, use IncoherentInstances
      when compiling the other instance declarations)
     In the expression: x >= x
     In an equation for ‛foo’: foo x = x >= x
diff --git a/testsuite/tests/typecheck/should_fail/T5095.stderr b/testsuite/tests/typecheck/should_fail/T5095.stderr
index 28dd53ae6b..37bfccbf17 100644
--- a/testsuite/tests/typecheck/should_fail/T5095.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5095.stderr
@@ -60,7 +60,7 @@ T5095.hs:9:11:
         -- Defined in ‛Control.Applicative’
       instance Eq Integer -- Defined in ‛integer-gmp:GHC.Integer.Type’
     (The choice depends on the instantiation of ‛a’
-     To pick the first instance above, use -XIncoherentInstances
+     To pick the first instance above, use IncoherentInstances
      when compiling the other instance declarations)
     In the expression: x == y
     In an equation for ‛f’: f x y = x == y
diff --git a/testsuite/tests/typecheck/should_fail/T5957.stderr b/testsuite/tests/typecheck/should_fail/T5957.stderr
index f4300b0633..3b4f5e80d5 100644
--- a/testsuite/tests/typecheck/should_fail/T5957.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5957.stderr
@@ -1,6 +1,6 @@
 
 T5957.hs:3:9:
     Illegal polymorphic or qualified type: Show a => a -> String
-    Perhaps you intended to use -XRankNTypes or -XRank2Types
+    Perhaps you intended to use RankNTypes or Rank2Types
     In the type signature for ‛flex’:
       flex :: Int -> Show a => a -> String
diff --git a/testsuite/tests/typecheck/should_fail/T7220.stderr b/testsuite/tests/typecheck/should_fail/T7220.stderr
index d57e06843e..5dba6b5c28 100644
--- a/testsuite/tests/typecheck/should_fail/T7220.stderr
+++ b/testsuite/tests/typecheck/should_fail/T7220.stderr
@@ -2,7 +2,7 @@
 T7220.hs:24:6:
     Cannot instantiate unification variable ‛b0’
     with a type involving foralls: forall b. (C A b, TF b ~ Y) => b
-      Perhaps you want -XImpredicativeTypes
+      Perhaps you want ImpredicativeTypes
     In the expression: f :: (forall b. (C A b, TF b ~ Y) => b) -> X
     In the expression: (f :: (forall b. (C A b, TF b ~ Y) => b) -> X) u
     In an equation for ‛v’:
diff --git a/testsuite/tests/typecheck/should_fail/T7809.stderr b/testsuite/tests/typecheck/should_fail/T7809.stderr
index b743926889..ebfb3f5804 100644
--- a/testsuite/tests/typecheck/should_fail/T7809.stderr
+++ b/testsuite/tests/typecheck/should_fail/T7809.stderr
@@ -1,5 +1,5 @@
 
 T7809.hs:8:8:
     Illegal polymorphic or qualified type: PolyId
-    Perhaps you intended to use -XImpredicativeTypes
+    Perhaps you intended to use ImpredicativeTypes
     In the type signature for ‛foo’: foo :: F PolyId
diff --git a/testsuite/tests/typecheck/should_fail/TcNoNullaryTC.stderr b/testsuite/tests/typecheck/should_fail/TcNoNullaryTC.stderr
index 9619004988..90ef78718a 100644
--- a/testsuite/tests/typecheck/should_fail/TcNoNullaryTC.stderr
+++ b/testsuite/tests/typecheck/should_fail/TcNoNullaryTC.stderr
@@ -1,5 +1,5 @@
 
 TcNoNullaryTC.hs:3:1:
     No parameters for class ‛A’
-    (Use -XNullaryTypeClasses to allow no-parameter classes)
+    (Use NullaryTypeClasses to allow no-parameter classes)
     In the class declaration for ‛A’
diff --git a/testsuite/tests/typecheck/should_fail/fd-loop.stderr b/testsuite/tests/typecheck/should_fail/fd-loop.stderr
index 37eae5d955..f26bda816d 100644
--- a/testsuite/tests/typecheck/should_fail/fd-loop.stderr
+++ b/testsuite/tests/typecheck/should_fail/fd-loop.stderr
@@ -2,11 +2,11 @@
 fd-loop.hs:12:10:
     Variable ‛b’ occurs more often than in the instance head
       in the constraint: C a b
-    (Use -XUndecidableInstances to permit this)
+    (Use UndecidableInstances to permit this)
     In the instance declaration for ‛Eq (T a)’
 
 fd-loop.hs:12:10:
     Variable ‛b’ occurs more often than in the instance head
       in the constraint: Eq b
-    (Use -XUndecidableInstances to permit this)
+    (Use UndecidableInstances to permit this)
     In the instance declaration for ‛Eq (T a)’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail044.stderr b/testsuite/tests/typecheck/should_fail/tcfail044.stderr
index ab3b94f007..eaf769f8b7 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail044.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail044.stderr
@@ -4,7 +4,7 @@ tcfail044.hs:5:20:
       (All instance types must be of the form (T a1 ... an)
        where a1 ... an are *distinct type variables*,
        and each type variable appears at most once in the instance head.
-       Use -XFlexibleInstances if you want to disable this.)
+       Use FlexibleInstances if you want to disable this.)
     In the instance declaration for ‛Eq (a -> a)’
 
 tcfail044.hs:8:21:
@@ -12,5 +12,5 @@ tcfail044.hs:8:21:
       (All instance types must be of the form (T a1 ... an)
        where a1 ... an are *distinct type variables*,
        and each type variable appears at most once in the instance head.
-       Use -XFlexibleInstances if you want to disable this.)
+       Use FlexibleInstances if you want to disable this.)
     In the instance declaration for ‛Num (a -> a)’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail047.stderr b/testsuite/tests/typecheck/should_fail/tcfail047.stderr
index 5c96920f0e..b9778baf9b 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail047.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail047.stderr
@@ -4,5 +4,5 @@ tcfail047.hs:6:10:
       (All instance types must be of the form (T a1 ... an)
        where a1 ... an are *distinct type variables*,
        and each type variable appears at most once in the instance head.
-       Use -XFlexibleInstances if you want to disable this.)
+       Use FlexibleInstances if you want to disable this.)
     In the instance declaration for ‛A (a, (b, c))’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail094.stderr b/testsuite/tests/typecheck/should_fail/tcfail094.stderr
index c5dcc172d5..c38674bfa1 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail094.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail094.stderr
@@ -1,3 +1,3 @@
 
 tcfail094.hs:7:14:
-    Illegal literal in type (use -XDataKinds to enable): 1
+    Illegal literal in type (use DataKinds to enable): 1
diff --git a/testsuite/tests/typecheck/should_fail/tcfail108.stderr b/testsuite/tests/typecheck/should_fail/tcfail108.stderr
index f3c2415631..e1b8c71824 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail108.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail108.stderr
@@ -1,7 +1,7 @@
 
 tcfail108.hs:7:10:
     Non type-variable argument in the constraint: Eq (f (Rec f))
-    (Use -XFlexibleContexts to permit this)
+    (Use FlexibleContexts to permit this)
     In the context: (Eq (f (Rec f)))
     While checking an instance declaration
     In the instance declaration for ‛Eq (Rec f)’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail117.stderr b/testsuite/tests/typecheck/should_fail/tcfail117.stderr
index 40a14e7f20..3f2248a61f 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail117.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail117.stderr
@@ -3,7 +3,7 @@ tcfail117.hs:5:32:
     Can't make a derived instance of ‛Enum N1’:
       ‛N1’ must be an enumeration type
       (an enumeration consists of one or more nullary, non-GADT constructors)
-      Try -XGeneralizedNewtypeDeriving for GHC's newtype-deriving extension
+      Try GeneralizedNewtypeDeriving for GHC's newtype-deriving extension
     In the newtype declaration for ‛N1’
 
 tcfail117.hs:6:32:
diff --git a/testsuite/tests/typecheck/should_fail/tcfail121.stderr b/testsuite/tests/typecheck/should_fail/tcfail121.stderr
index 7ac388aa16..abad2d4206 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail121.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail121.stderr
@@ -6,7 +6,7 @@ tcfail121.hs:13:9:
         -- Defined at tcfail121.hs:9:10
       instance [overlap ok] Foo [Int] -- Defined at tcfail121.hs:10:10
     (The choice depends on the instantiation of ‛a’
-     To pick the first instance above, use -XIncoherentInstances
+     To pick the first instance above, use IncoherentInstances
      when compiling the other instance declarations)
     In the expression: op x
     In an equation for ‛foo’: foo x = op x
diff --git a/testsuite/tests/typecheck/should_fail/tcfail127.stderr b/testsuite/tests/typecheck/should_fail/tcfail127.stderr
index c7d41534aa..fb91cfb90d 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail127.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail127.stderr
@@ -1,5 +1,5 @@
 
 tcfail127.hs:3:8:
     Illegal polymorphic or qualified type: Num a => a -> a
-    Perhaps you intended to use -XImpredicativeTypes
+    Perhaps you intended to use ImpredicativeTypes
     In the type signature for ‛foo’: foo :: IO (Num a => a -> a)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail139.stderr b/testsuite/tests/typecheck/should_fail/tcfail139.stderr
index bfdc89b4fd..731181ef71 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail139.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail139.stderr
@@ -3,5 +3,5 @@ tcfail139.hs:6:10:
     Illegal instance declaration for ‛Bounded Foo’
       (All instance types must be of the form (T t1 ... tn)
        where T is not a synonym.
-       Use -XTypeSynonymInstances if you want to disable this.)
+       Use TypeSynonymInstances if you want to disable this.)
     In the instance declaration for ‛Bounded Foo’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail154.stderr b/testsuite/tests/typecheck/should_fail/tcfail154.stderr
index 8977eacc74..80eba2d790 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail154.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail154.stderr
@@ -2,5 +2,5 @@
 tcfail154.hs:12:10:
     Variable ‛a’ occurs more often than in the instance head
       in the constraint: C a a
-    (Use -XUndecidableInstances to permit this)
+    (Use UndecidableInstances to permit this)
     In the instance declaration for ‛Eq (T a)’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail157.stderr b/testsuite/tests/typecheck/should_fail/tcfail157.stderr
index cfca878ed0..523d118985 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail157.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail157.stderr
@@ -2,11 +2,11 @@
 tcfail157.hs:27:10:
     Variable ‛b’ occurs more often than in the instance head
       in the constraint: E m a b
-    (Use -XUndecidableInstances to permit this)
+    (Use UndecidableInstances to permit this)
     In the instance declaration for ‛Foo m (a -> ())’
 
 tcfail157.hs:27:10:
     Variable ‛b’ occurs more often than in the instance head
       in the constraint: Foo m b
-    (Use -XUndecidableInstances to permit this)
+    (Use UndecidableInstances to permit this)
     In the instance declaration for ‛Foo m (a -> ())’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail166.stderr b/testsuite/tests/typecheck/should_fail/tcfail166.stderr
index 3907418e10..96229505b0 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail166.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail166.stderr
@@ -1,5 +1,5 @@
 
 tcfail166.hs:5:21:
     Illegal symbol '.' in type
-    Perhaps you intended -XRankNTypes or similar flag
-    to enable explicit-forall syntax: forall <tvs>. <type>
+    Perhaps you intended to use RankNTypes or a similar language
+    extension to enable explicit-forall syntax: forall <tvs>. <type>
diff --git a/testsuite/tests/typecheck/should_fail/tcfail170.stderr b/testsuite/tests/typecheck/should_fail/tcfail170.stderr
index 7e8f0116ec..3f507ae675 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail170.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail170.stderr
@@ -2,5 +2,5 @@
 tcfail170.hs:7:10:
     Illegal instance declaration for ‛C [p] [q]’
       (the Coverage Condition fails for one of the functional dependencies;
-       Use -XUndecidableInstances to permit this)
+       Use UndecidableInstances to permit this)
     In the instance declaration for ‛C [p] [q]’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail173.stderr b/testsuite/tests/typecheck/should_fail/tcfail173.stderr
index 362f3ca288..2c87b91d1b 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail173.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail173.stderr
@@ -1,4 +1,4 @@
 
 tcfail173.hs:5:12:
     Illegal declaration of a type or class operator ‛<.>’
-      Use -XTypeOperators to declare operators in type and declarations
+      Use TypeOperators to declare operators in type and declarations
diff --git a/testsuite/tests/typecheck/should_fail/tcfail183.stderr b/testsuite/tests/typecheck/should_fail/tcfail183.stderr
index fad1ccf736..529a17aa36 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail183.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail183.stderr
@@ -1,5 +1,5 @@
 
 tcfail183.hs:4:38:
     Illegal symbol '.' in type
-    Perhaps you intended -XRankNTypes or similar flag
-    to enable explicit-forall syntax: forall <tvs>. <type>
+    Perhaps you intended to use RankNTypes or a similar language
+    extension to enable explicit-forall syntax: forall <tvs>. <type>
diff --git a/testsuite/tests/typecheck/should_fail/tcfail184.stderr b/testsuite/tests/typecheck/should_fail/tcfail184.stderr
index cfb89422dc..6efa33726a 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail184.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail184.stderr
@@ -2,6 +2,6 @@
 tcfail184.hs:8:19:
     Illegal polymorphic or qualified type:
       forall a. Ord a => [a] -> [a]
-    Perhaps you intended to use -XRankNTypes or -XRank2Types
+    Perhaps you intended to use RankNTypes or Rank2Types
     In the definition of data constructor ‛MkSwizzle’
     In the newtype declaration for ‛Swizzle’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail197.stderr b/testsuite/tests/typecheck/should_fail/tcfail197.stderr
index 30bf9583fa..c2b1602821 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail197.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail197.stderr
@@ -1,5 +1,5 @@
 
 tcfail197.hs:5:8:
     Illegal polymorphic or qualified type: forall a. a
-    Perhaps you intended to use -XImpredicativeTypes
+    Perhaps you intended to use ImpredicativeTypes
     In the type signature for ‛foo’: foo :: [forall a. a] -> Int
diff --git a/testsuite/tests/typecheck/should_fail/tcfail209.stderr b/testsuite/tests/typecheck/should_fail/tcfail209.stderr
index 65bc8de455..7e7e2bd19a 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail209.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail209.stderr
@@ -1,5 +1,5 @@
 
 tcfail209.hs:3:1:
     Illegal constraint synonym of kind: ‛* -> Constraint’
-      (Use -XConstraintKinds to permit this)
+      (Use ConstraintKinds to permit this)
     In the type declaration for ‛Showish’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail209a.stderr b/testsuite/tests/typecheck/should_fail/tcfail209a.stderr
index 9acacaaacf..25721019c7 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail209a.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail209a.stderr
@@ -1,6 +1,6 @@
 
 tcfail209a.hs:3:6:
     Illegal tuple constraint: (Show a, Num a)
-      (Use -XConstraintKinds to permit this)
+      (Use ConstraintKinds to permit this)
     In the type signature for ‛g’:
       g :: ((Show a, Num a), Eq a) => a -> a
diff --git a/testsuite/tests/typecheck/should_fail/tcfail213.stderr b/testsuite/tests/typecheck/should_fail/tcfail213.stderr
index bef0507b8b..14c330be87 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail213.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail213.stderr
@@ -1,7 +1,7 @@
 
 tcfail213.hs:8:1:
     Illegal constraint ‛F a’ in a superclass/instance context
-      (Use -XUndecidableInstances to permit this)
+      (Use UndecidableInstances to permit this)
     In the context: (F a)
     While checking the super-classes of class ‛C’
     In the class declaration for ‛C’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail214.stderr b/testsuite/tests/typecheck/should_fail/tcfail214.stderr
index 983d4b39a1..f3d90784db 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail214.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail214.stderr
@@ -1,7 +1,7 @@
 
 tcfail214.hs:9:10:
     Illegal constraint ‛F a’ in a superclass/instance context
-      (Use -XUndecidableInstances to permit this)
+      (Use UndecidableInstances to permit this)
     In the context: (F a)
     While checking an instance declaration
     In the instance declaration for ‛C [a]’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail218.stderr b/testsuite/tests/typecheck/should_fail/tcfail218.stderr
index 66a85156ea..2afa201652 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail218.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail218.stderr
@@ -5,7 +5,7 @@ tcfail218.hs:10:5:
       instance [incoherent] C [a] b -- Defined at tcfail218.hs:5:10
       instance C [Int] b -- Defined at Tcfail218_Help.hs:7:10
     (The choice depends on the instantiation of ‛a, b’
-     To pick the first instance above, use -XIncoherentInstances
+     To pick the first instance above, use IncoherentInstances
      when compiling the other instance declarations)
     In the expression: foo
     In an equation for ‛x’: x = foo