Replace Rank2Types and PolymorphicComponents by RankNTypes

78 files changed, 80 insertions, 80 deletions

diff --git a/testsuite/tests/deSugar/should_compile/ds050.hs b/testsuite/tests/deSugar/should_compile/ds050.hs
index be88654d7e..b3b7c8715e 100644
--- a/testsuite/tests/deSugar/should_compile/ds050.hs
+++ b/testsuite/tests/deSugar/should_compile/ds050.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/gadt/doaitse.hs b/testsuite/tests/gadt/doaitse.hs
index 51525bb573..02237b5154 100644
--- a/testsuite/tests/gadt/doaitse.hs
+++ b/testsuite/tests/gadt/doaitse.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE GADTs, ExistentialQuantification, ScopedTypeVariables,
-             Rank2Types #-}
+             RankNTypes #-}
 
 -- Here's an example from Doaitse Swiestra (Sept 06)
 -- which requires use of scoped type variables
diff --git a/testsuite/tests/gadt/gadt1.hs b/testsuite/tests/gadt/gadt1.hs
index 3412d90cf2..d930094143 100644
--- a/testsuite/tests/gadt/gadt1.hs
+++ b/testsuite/tests/gadt/gadt1.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GADTs, Rank2Types #-}
+{-# LANGUAGE GADTs, RankNTypes #-}
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/gadt/gadt21.hs b/testsuite/tests/gadt/gadt21.hs
index b452d083c1..abc36d93d2 100644
--- a/testsuite/tests/gadt/gadt21.hs
+++ b/testsuite/tests/gadt/gadt21.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GADTs, ExistentialQuantification, KindSignatures, Rank2Types #-}
+{-# LANGUAGE GADTs, ExistentialQuantification, KindSignatures, RankNTypes #-}
 
 -- Fails (needs the (Ord a) in TypeSet 
 -- c.f. gadt22.hs
diff --git a/testsuite/tests/gadt/gadt22.hs b/testsuite/tests/gadt/gadt22.hs
index f456198ff1..67d17c7a67 100644
--- a/testsuite/tests/gadt/gadt22.hs
+++ b/testsuite/tests/gadt/gadt22.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GADTs, ExistentialQuantification, KindSignatures, Rank2Types #-}
+{-# LANGUAGE GADTs, ExistentialQuantification, KindSignatures, RankNTypes #-}
 
 -- Succeeds (needs the (Ord a) in TypeSet 
 -- c.f. gadt21.hs
diff --git a/testsuite/tests/gadt/nbe.hs b/testsuite/tests/gadt/nbe.hs
index 0547131df9..82b7b83259 100644
--- a/testsuite/tests/gadt/nbe.hs
+++ b/testsuite/tests/gadt/nbe.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GADTs, Rank2Types #-}
+{-# LANGUAGE GADTs, RankNTypes #-}
 
 module Main where
 
diff --git a/testsuite/tests/gadt/termination.hs b/testsuite/tests/gadt/termination.hs
index be2431b812..f290322fa5 100644
--- a/testsuite/tests/gadt/termination.hs
+++ b/testsuite/tests/gadt/termination.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GADTs, Rank2Types #-}
+{-# LANGUAGE GADTs, RankNTypes #-}
 
 module Termination where
 
diff --git a/testsuite/tests/ghci.debugger/scripts/print012.script b/testsuite/tests/ghci.debugger/scripts/print012.script
index bda9a8fbe7..a24a6a610e 100644
--- a/testsuite/tests/ghci.debugger/scripts/print012.script
+++ b/testsuite/tests/ghci.debugger/scripts/print012.script
@@ -1,4 +1,4 @@
-:set -XGADTs -XRank2Types -XExistentialQuantification -XDeriveDataTypeable -XGeneralizedNewtypeDeriving
+:set -XGADTs -XRankNTypes -XExistentialQuantification -XDeriveDataTypeable -XGeneralizedNewtypeDeriving
 :l ../GADT
 :a ../Test
 :m +Main
diff --git a/testsuite/tests/ghci.debugger/scripts/print013.script b/testsuite/tests/ghci.debugger/scripts/print013.script
index 334e6050ca..cc80c29c63 100644
--- a/testsuite/tests/ghci.debugger/scripts/print013.script
+++ b/testsuite/tests/ghci.debugger/scripts/print013.script
@@ -1,6 +1,6 @@
 -- Test handling of extra fields in the representation due to dictionaries
 
-:set -XGADTs -XRank2Types
+:set -XGADTs -XRankNTypes
 :l ../GADT
 
 let d = DictN (1 :: Integer)
diff --git a/testsuite/tests/ghci.debugger/scripts/print014.script b/testsuite/tests/ghci.debugger/scripts/print014.script
index 40c8bec9db..e6d595871a 100644
--- a/testsuite/tests/ghci.debugger/scripts/print014.script
+++ b/testsuite/tests/ghci.debugger/scripts/print014.script
@@ -1,6 +1,6 @@
 -- Test handling of extra fields in the representation due to existentials.
 
-:set -XGADTs -XRank2Types
+:set -XGADTs -XRankNTypes
 :l ../GADT
 
 let e = Exist 1
diff --git a/testsuite/tests/ghci.debugger/scripts/print034.script b/testsuite/tests/ghci.debugger/scripts/print034.script
index 95bcfde0a6..39f2743719 100644
--- a/testsuite/tests/ghci.debugger/scripts/print034.script
+++ b/testsuite/tests/ghci.debugger/scripts/print034.script
@@ -1,6 +1,6 @@
 -- More GADT goodness
 
-:set -XGADTs -XRank2Types -XDeriveDataTypeable -XGeneralizedNewtypeDeriving
+:set -XGADTs -XRankNTypes -XDeriveDataTypeable -XGeneralizedNewtypeDeriving
 :l ../GADT
 :a ../Test
 :m +Main
diff --git a/testsuite/tests/ghci/prog008/A.hs b/testsuite/tests/ghci/prog008/A.hs
index 0be5e1270d..6a85ca70ce 100644
--- a/testsuite/tests/ghci/prog008/A.hs
+++ b/testsuite/tests/ghci/prog008/A.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, MultiParamTypeClasses #-}
+{-# LANGUAGE RankNTypes, MultiParamTypeClasses #-}
 
 -- Tests a bug spotted by Claus in which the type
 -- of c3 was wrongly displayed in GHCi as
diff --git a/testsuite/tests/ghci/scripts/ghci025.hs b/testsuite/tests/ghci/scripts/ghci025.hs
index 0e1bc7e2c5..d5e2673113 100644
--- a/testsuite/tests/ghci/scripts/ghci025.hs
+++ b/testsuite/tests/ghci/scripts/ghci025.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, MultiParamTypeClasses #-}
+{-# LANGUAGE RankNTypes, MultiParamTypeClasses #-}
 

 module T where

 

diff --git a/testsuite/tests/haddock/haddock_examples/test.T b/testsuite/tests/haddock/haddock_examples/test.T
index 856bf73bfd..c60933d156 100644
--- a/testsuite/tests/haddock/haddock_examples/test.T
+++ b/testsuite/tests/haddock/haddock_examples/test.T
@@ -3,4 +3,4 @@ test('haddock.Test',
       extra_clean(['Test.hi', 'Test.o', 'Hidden.hi', 'Hidden.o',
                    'Visible.hi', 'Visible.o'])],
      multimod_compile,
-     ['Test Hidden Visible', '-XRank2Types -XExistentialQuantification -haddock -ddump-parsed'])
+     ['Test Hidden Visible', '-XRankNTypes -XExistentialQuantification -haddock -ddump-parsed'])
diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/all.T b/testsuite/tests/haddock/should_compile_flag_haddock/all.T
index ed77310fd5..61b6c6c1e0 100644
--- a/testsuite/tests/haddock/should_compile_flag_haddock/all.T
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/all.T
@@ -23,8 +23,8 @@ test('haddockA022', normal, compile, ['-haddock -ddump-parsed'])
 test('haddockA023', normal, compile, ['-haddock -ddump-parsed'])
 test('haddockA024', normal, compile, ['-haddock -ddump-parsed'])
 test('haddockA025', normal, compile, ['-haddock -ddump-parsed'])
-test('haddockA026', normal, compile, ['-haddock -ddump-parsed -XRank2Types'])
-test('haddockA027', normal, compile, ['-haddock -ddump-parsed -XRank2Types'])
+test('haddockA026', normal, compile, ['-haddock -ddump-parsed -XRankNTypes'])
+test('haddockA027', normal, compile, ['-haddock -ddump-parsed -XRankNTypes'])
 test('haddockA028', normal, compile, ['-haddock -ddump-parsed -XTypeOperators'])
 test('haddockA029', normal, compile, ['-haddock -ddump-parsed'])
 test('haddockA030', normal, compile, ['-haddock -ddump-parsed'])
diff --git a/testsuite/tests/haddock/should_compile_noflag_haddock/all.T b/testsuite/tests/haddock/should_compile_noflag_haddock/all.T
index dbc7d17d9a..77aed59ba0 100644
--- a/testsuite/tests/haddock/should_compile_noflag_haddock/all.T
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/all.T
@@ -23,8 +23,8 @@ test('haddockC022', normal, compile, [''])
 test('haddockC023', normal, compile, [''])
 test('haddockC024', normal, compile, [''])
 test('haddockC025', normal, compile, [''])
-test('haddockC026', normal, compile, ['-XRank2Types'])
-test('haddockC027', normal, compile, ['-XRank2Types'])
+test('haddockC026', normal, compile, ['-XRankNTypes'])
+test('haddockC027', normal, compile, ['-XRankNTypes'])
 test('haddockC028', normal, compile, ['-XTypeOperators'])
 test('haddockC029', normal, compile, [''])
 test('haddockC030', normal, compile, [''])
diff --git a/testsuite/tests/indexed-types/should_compile/Roman1.hs b/testsuite/tests/indexed-types/should_compile/Roman1.hs
index 491fee04c5..4d8fd14da5 100644
--- a/testsuite/tests/indexed-types/should_compile/Roman1.hs
+++ b/testsuite/tests/indexed-types/should_compile/Roman1.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeFamilies, Rank2Types #-}
+{-# LANGUAGE TypeFamilies, RankNTypes #-}
 
 -- This test made the type checker produce an
 -- ill-kinded coercion term.
diff --git a/testsuite/tests/indexed-types/should_compile/T3787.hs b/testsuite/tests/indexed-types/should_compile/T3787.hs
index 955b6a1cdd..a52c27f4d5 100644
--- a/testsuite/tests/indexed-types/should_compile/T3787.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3787.hs
@@ -16,7 +16,7 @@
 
 -- | Module "Trampoline" defines the trampoline computations and their basic building blocks.
 
-{-# LANGUAGE ScopedTypeVariables, Rank2Types, MultiParamTypeClasses, TypeFamilies, KindSignatures,
+{-# LANGUAGE ScopedTypeVariables, RankNTypes, MultiParamTypeClasses, TypeFamilies, KindSignatures,
              FlexibleContexts, FlexibleInstances, OverlappingInstances, UndecidableInstances
  #-}
 
diff --git a/testsuite/tests/indexed-types/should_compile/T4120.hs b/testsuite/tests/indexed-types/should_compile/T4120.hs
index 57dd21a39b..3b1475916d 100644
--- a/testsuite/tests/indexed-types/should_compile/T4120.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4120.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, TypeFamilies #-}
+{-# LANGUAGE RankNTypes, TypeFamilies #-}
 
 -- Unification yielding a coercion under a forall
 
diff --git a/testsuite/tests/indexed-types/should_compile/T4178.hs b/testsuite/tests/indexed-types/should_compile/T4178.hs
index b0a34b28e1..97dfbed328 100644
--- a/testsuite/tests/indexed-types/should_compile/T4178.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4178.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE
 	FlexibleContexts,
-	Rank2Types,
+	RankNTypes,
 	TypeFamilies,
 	MultiParamTypeClasses,
 	FlexibleInstances #-}
diff --git a/testsuite/tests/indexed-types/should_compile/T4358.hs b/testsuite/tests/indexed-types/should_compile/T4358.hs
index 92ac3a743b..0c05576812 100644
--- a/testsuite/tests/indexed-types/should_compile/T4358.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4358.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeFamilies, Rank2Types, FlexibleContexts #-}
+{-# LANGUAGE TypeFamilies, RankNTypes, FlexibleContexts #-}
 
 module T4358 where
 
diff --git a/testsuite/tests/indexed-types/should_compile/T4935.hs b/testsuite/tests/indexed-types/should_compile/T4935.hs
index 2c9d16a9b8..739019c837 100644
--- a/testsuite/tests/indexed-types/should_compile/T4935.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4935.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeFamilies, Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE TypeFamilies, RankNTypes, ScopedTypeVariables #-}
 module T4935 where
 
 import Control.Applicative
diff --git a/testsuite/tests/indexed-types/should_compile/T7280.hs b/testsuite/tests/indexed-types/should_compile/T7280.hs
index daa391b4c7..2cb7a09bb4 100644
--- a/testsuite/tests/indexed-types/should_compile/T7280.hs
+++ b/testsuite/tests/indexed-types/should_compile/T7280.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, MultiParamTypeClasses, FlexibleContexts,
+{-# LANGUAGE RankNTypes, MultiParamTypeClasses, FlexibleContexts,
    TypeFamilies, ScopedTypeVariables #-}
 
 module T7280 where
diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail12.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail12.hs
index 0c8ffefefe..d23cd7ad7e 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail12.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail12.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeFamilies, Rank2Types #-}
+{-# LANGUAGE TypeFamilies, RankNTypes #-}
 
 
 module ShouldFail where
diff --git a/testsuite/tests/indexed-types/should_fail/T5439.hs b/testsuite/tests/indexed-types/should_fail/T5439.hs
index eb4c89c602..396a5436c4 100644
--- a/testsuite/tests/indexed-types/should_fail/T5439.hs
+++ b/testsuite/tests/indexed-types/should_fail/T5439.hs
@@ -3,7 +3,7 @@
 {-# LANGUAGE EmptyDataDecls #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
diff --git a/testsuite/tests/rebindable/rebindable6.hs b/testsuite/tests/rebindable/rebindable6.hs
index 74d861cda8..ffd69f904b 100644
--- a/testsuite/tests/rebindable/rebindable6.hs
+++ b/testsuite/tests/rebindable/rebindable6.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE RebindableSyntax, NPlusKPatterns, Rank2Types,
+{-# LANGUAGE RebindableSyntax, NPlusKPatterns, RankNTypes,
              ScopedTypeVariables, FlexibleInstances #-}
 module Main where
 	{
diff --git a/testsuite/tests/rename/should_fail/mc13.hs b/testsuite/tests/rename/should_fail/mc13.hs
index 2686005f7f..6069e0f080 100644
--- a/testsuite/tests/rename/should_fail/mc13.hs
+++ b/testsuite/tests/rename/should_fail/mc13.hs
@@ -2,7 +2,7 @@
 --
 -- Test trying to use a function bound in the list comprehension as the transform function
 
-{-# OPTIONS_GHC -XRank2Types -XMonadComprehensions -XTransformListComp #-}
+{-# OPTIONS_GHC -XRankNTypes -XMonadComprehensions -XTransformListComp #-}
 
 module RnFail048 where
 
diff --git a/testsuite/tests/rename/should_fail/mc14.hs b/testsuite/tests/rename/should_fail/mc14.hs
index e2cf74cbf5..71ccbf98fe 100644
--- a/testsuite/tests/rename/should_fail/mc14.hs
+++ b/testsuite/tests/rename/should_fail/mc14.hs
@@ -2,7 +2,7 @@
 --
 -- Test trying to use a function bound in the list comprehension as the group function
 
-{-# OPTIONS_GHC -XRank2Types -XMonadComprehensions -XTransformListComp #-}
+{-# OPTIONS_GHC -XRankNTypes -XMonadComprehensions -XTransformListComp #-}
 
 module RnFail049 where
 
diff --git a/testsuite/tests/rename/should_fail/rnfail026.hs b/testsuite/tests/rename/should_fail/rnfail026.hs
index 3256876e68..d09d9fc22f 100644
--- a/testsuite/tests/rename/should_fail/rnfail026.hs
+++ b/testsuite/tests/rename/should_fail/rnfail026.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, FlexibleInstances #-}
+{-# LANGUAGE RankNTypes, FlexibleInstances #-}
 
 -- This one made ghc-4.08 crash 
 -- rename/RnEnv.lhs:239: Non-exhaustive patterns in function get_tycon_key
diff --git a/testsuite/tests/rename/should_fail/rnfail049.hs b/testsuite/tests/rename/should_fail/rnfail049.hs
index 7f4b6c7842..6123856d2c 100644
--- a/testsuite/tests/rename/should_fail/rnfail049.hs
+++ b/testsuite/tests/rename/should_fail/rnfail049.hs
@@ -1,6 +1,6 @@
 -- Test trying to use a function bound in the list comprehension as the group function

 

-{-# OPTIONS_GHC -XRank2Types -XTransformListComp #-}

+{-# OPTIONS_GHC -XRankNTypes -XTransformListComp #-}

 

 module RnFail049 where

 

diff --git a/testsuite/tests/rename/should_fail/rnfail050.hs b/testsuite/tests/rename/should_fail/rnfail050.hs
index 0c3b262a0f..b148acb754 100644
--- a/testsuite/tests/rename/should_fail/rnfail050.hs
+++ b/testsuite/tests/rename/should_fail/rnfail050.hs
@@ -1,6 +1,6 @@
 -- Test trying to use a function bound in the list comprehension as the transform function
 
-{-# OPTIONS_GHC -XRank2Types -XTransformListComp #-}
+{-# OPTIONS_GHC -XRankNTypes -XTransformListComp #-}
 
 module RnFail048 where
 
diff --git a/testsuite/tests/simplCore/should_compile/T5359a.hs b/testsuite/tests/simplCore/should_compile/T5359a.hs
index 058b2af08a..993fbabd54 100644
--- a/testsuite/tests/simplCore/should_compile/T5359a.hs
+++ b/testsuite/tests/simplCore/should_compile/T5359a.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE BangPatterns, Rank2Types, MagicHash, UnboxedTuples #-}
+{-# LANGUAGE BangPatterns, RankNTypes, MagicHash, UnboxedTuples #-}
 
 module T5359a (linesT) where
 
diff --git a/testsuite/tests/simplCore/should_compile/simpl009.hs b/testsuite/tests/simplCore/should_compile/simpl009.hs
index c66587d3e3..2ffceb6283 100644
--- a/testsuite/tests/simplCore/should_compile/simpl009.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl009.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 {-# OPTIONS_GHC -dcore-lint #-}
 
 -- This one killed GHC 6.0, with a "panic: applyTys"
diff --git a/testsuite/tests/simplCore/should_compile/simpl011.hs b/testsuite/tests/simplCore/should_compile/simpl011.hs
index 63d1ad9a22..b31ea0a6b3 100644
--- a/testsuite/tests/simplCore/should_compile/simpl011.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl011.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP, Rank2Types, ScopedTypeVariables, KindSignatures,
+{-# LANGUAGE CPP, RankNTypes, ScopedTypeVariables, KindSignatures,
              MultiParamTypeClasses, FunctionalDependencies #-}
 
 -- This one triggered a bug in the indirection-shorting 
diff --git a/testsuite/tests/simplCore/should_compile/simpl014.hs b/testsuite/tests/simplCore/should_compile/simpl014.hs
index c610df527a..bb96547a67 100644
--- a/testsuite/tests/simplCore/should_compile/simpl014.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl014.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, GADTs, FlexibleContexts #-}
+{-# LANGUAGE RankNTypes, GADTs, FlexibleContexts #-}
 {-# OPTIONS_GHC -O2 #-}
 
 -- This one make SpecConstr generate bogus code (hence -O2), 
diff --git a/testsuite/tests/typecheck/should_compile/T2494-2.hs b/testsuite/tests/typecheck/should_compile/T2494-2.hs
index b672cb0a47..543f8f47fe 100644
--- a/testsuite/tests/typecheck/should_compile/T2494-2.hs
+++ b/testsuite/tests/typecheck/should_compile/T2494-2.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 -- Trac #2494, should compile ok
 
diff --git a/testsuite/tests/typecheck/should_compile/T2494.hs b/testsuite/tests/typecheck/should_compile/T2494.hs
index 55d80a23eb..3e6c09c39c 100644
--- a/testsuite/tests/typecheck/should_compile/T2494.hs
+++ b/testsuite/tests/typecheck/should_compile/T2494.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 -- Trac #2494, should generate an error message
 
diff --git a/testsuite/tests/typecheck/should_compile/T2683.hs b/testsuite/tests/typecheck/should_compile/T2683.hs
index 3e8e9e5892..c36eaad9bc 100644
--- a/testsuite/tests/typecheck/should_compile/T2683.hs
+++ b/testsuite/tests/typecheck/should_compile/T2683.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE ExistentialQuantification, MultiParamTypeClasses,

-             FunctionalDependencies, Rank2Types #-}

+             FunctionalDependencies, RankNTypes #-}

 

 module Q where

 

diff --git a/testsuite/tests/typecheck/should_compile/T3018.hs b/testsuite/tests/typecheck/should_compile/T3018.hs
index ffecfc2788..a0868afa24 100644
--- a/testsuite/tests/typecheck/should_compile/T3018.hs
+++ b/testsuite/tests/typecheck/should_compile/T3018.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverlappingInstances , UndecidableInstances, EmptyDataDecls #-}
-{-# LANGUAGE Rank2Types, KindSignatures, MultiParamTypeClasses, FlexibleInstances #-}
+{-# LANGUAGE RankNTypes, KindSignatures, MultiParamTypeClasses, FlexibleInstances #-}
 
 -- Works with new constraint solver
 
diff --git a/testsuite/tests/typecheck/should_compile/T4355.hs b/testsuite/tests/typecheck/should_compile/T4355.hs
index 8eff366cdc..712430d4f0 100644
--- a/testsuite/tests/typecheck/should_compile/T4355.hs
+++ b/testsuite/tests/typecheck/should_compile/T4355.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE DeriveDataTypeable, ExistentialQuantification, Rank2Types, MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, FlexibleContexts, PatternGuards, DatatypeContexts #-}
+{-# LANGUAGE DeriveDataTypeable, ExistentialQuantification, RankNTypes, MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, FlexibleContexts, PatternGuards, DatatypeContexts #-}
 
 module T4355 where
 
diff --git a/testsuite/tests/typecheck/should_compile/T5655.hs b/testsuite/tests/typecheck/should_compile/T5655.hs
index 429f50e56a..232ea6bec2 100644
--- a/testsuite/tests/typecheck/should_compile/T5655.hs
+++ b/testsuite/tests/typecheck/should_compile/T5655.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeFamilies, GADTs, ConstraintKinds, Rank2Types #-}
+{-# LANGUAGE TypeFamilies, GADTs, ConstraintKinds, RankNTypes #-}
 module T5655 where
 
 import GHC.Prim (Constraint)
diff --git a/testsuite/tests/typecheck/should_compile/faxen.hs b/testsuite/tests/typecheck/should_compile/faxen.hs
index c7310529c6..ddc8f7b90d 100644
--- a/testsuite/tests/typecheck/should_compile/faxen.hs
+++ b/testsuite/tests/typecheck/should_compile/faxen.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 

 -- A classic test for type inference

 -- Taken from "Haskell and principal types", Section 3

diff --git a/testsuite/tests/typecheck/should_compile/tc087.hs b/testsuite/tests/typecheck/should_compile/tc087.hs
index f70472b57c..8ea1901489 100644
--- a/testsuite/tests/typecheck/should_compile/tc087.hs
+++ b/testsuite/tests/typecheck/should_compile/tc087.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 module ShouldSucceed where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc092.hs b/testsuite/tests/typecheck/should_compile/tc092.hs
index 2f129026a7..b421809b8f 100644
--- a/testsuite/tests/typecheck/should_compile/tc092.hs
+++ b/testsuite/tests/typecheck/should_compile/tc092.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 module ShouldSucceed where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc097.hs b/testsuite/tests/typecheck/should_compile/tc097.hs
index a65d529dd3..4ec2a17395 100644
--- a/testsuite/tests/typecheck/should_compile/tc097.hs
+++ b/testsuite/tests/typecheck/should_compile/tc097.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 -- !!! Local universal quantification.
 module ShouldSucceed where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc102.hs b/testsuite/tests/typecheck/should_compile/tc102.hs
index c71b2d0ec0..0bfa55114f 100644
--- a/testsuite/tests/typecheck/should_compile/tc102.hs
+++ b/testsuite/tests/typecheck/should_compile/tc102.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 -- !!! Caused ghc-4.04proto to report a bogus type error
 -- !!! (as reported by Keith)
diff --git a/testsuite/tests/typecheck/should_compile/tc105.hs b/testsuite/tests/typecheck/should_compile/tc105.hs
index 6f35fff7fb..b7b8df2fad 100644
--- a/testsuite/tests/typecheck/should_compile/tc105.hs
+++ b/testsuite/tests/typecheck/should_compile/tc105.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc124.hs b/testsuite/tests/typecheck/should_compile/tc124.hs
index cd2362be4f..fcf3c5e48f 100644
--- a/testsuite/tests/typecheck/should_compile/tc124.hs
+++ b/testsuite/tests/typecheck/should_compile/tc124.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 

 -- !!! Rank 2 polymorphism

 -- Both f and g are rejected by Hugs [April 2001]

diff --git a/testsuite/tests/typecheck/should_compile/tc140.hs b/testsuite/tests/typecheck/should_compile/tc140.hs
index 6536e3d47d..23709fb617 100644
--- a/testsuite/tests/typecheck/should_compile/tc140.hs
+++ b/testsuite/tests/typecheck/should_compile/tc140.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- Make sure for-alls can occur in data types
 
diff --git a/testsuite/tests/typecheck/should_compile/tc144.hs b/testsuite/tests/typecheck/should_compile/tc144.hs
index 29185c8bc4..bb55310415 100644
--- a/testsuite/tests/typecheck/should_compile/tc144.hs
+++ b/testsuite/tests/typecheck/should_compile/tc144.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ImplicitParams, Rank2Types #-}
+{-# LANGUAGE ImplicitParams, RankNTypes #-}
 
 -- Rank-2 types with implicit parameters.
 -- GHC 5.02 erroneously rejected this
diff --git a/testsuite/tests/typecheck/should_compile/tc146.hs b/testsuite/tests/typecheck/should_compile/tc146.hs
index 4f44e908cf..bc50069983 100644
--- a/testsuite/tests/typecheck/should_compile/tc146.hs
+++ b/testsuite/tests/typecheck/should_compile/tc146.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- The interesting thign about this one is that
 -- there's an unbound type variable of kind *->*
diff --git a/testsuite/tests/typecheck/should_compile/tc148.hs b/testsuite/tests/typecheck/should_compile/tc148.hs
index c66f723550..2874426413 100644
--- a/testsuite/tests/typecheck/should_compile/tc148.hs
+++ b/testsuite/tests/typecheck/should_compile/tc148.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- This program tickled a bug in 5.02.2's forall-lifting
 
diff --git a/testsuite/tests/typecheck/should_compile/tc157.hs b/testsuite/tests/typecheck/should_compile/tc157.hs
index 5e4b711393..ae6faf95de 100644
--- a/testsuite/tests/typecheck/should_compile/tc157.hs
+++ b/testsuite/tests/typecheck/should_compile/tc157.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- Test silly type synonyms
 
diff --git a/testsuite/tests/typecheck/should_compile/tc160.hs b/testsuite/tests/typecheck/should_compile/tc160.hs
index bf88fc3159..2425221aee 100644
--- a/testsuite/tests/typecheck/should_compile/tc160.hs
+++ b/testsuite/tests/typecheck/should_compile/tc160.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 --Tests alpha-renaming in with extended type-synonyms
 
diff --git a/testsuite/tests/typecheck/should_compile/tc161.hs b/testsuite/tests/typecheck/should_compile/tc161.hs
index 44f41a57b4..7cb1272b6e 100644
--- a/testsuite/tests/typecheck/should_compile/tc161.hs
+++ b/testsuite/tests/typecheck/should_compile/tc161.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 -- Blew up GHC 5.04, with:
 --    Ambiguous type variable(s) `q' in the constraint `Foo q'
 --    arising from a function with an overloaded argument type at Foo.hs:7
diff --git a/testsuite/tests/typecheck/should_compile/tc162.hs b/testsuite/tests/typecheck/should_compile/tc162.hs
index 91a3272a92..88da03fe0b 100644
--- a/testsuite/tests/typecheck/should_compile/tc162.hs
+++ b/testsuite/tests/typecheck/should_compile/tc162.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- These ones failed with 5.04.  They need a coercion
 -- in the pattern matching compiler, so they are a bit
diff --git a/testsuite/tests/typecheck/should_compile/tc166.hs b/testsuite/tests/typecheck/should_compile/tc166.hs
index 2e69c3ad56..75ea65c650 100644
--- a/testsuite/tests/typecheck/should_compile/tc166.hs
+++ b/testsuite/tests/typecheck/should_compile/tc166.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies,
-             ExistentialQuantification, Rank2Types,
+             ExistentialQuantification, RankNTypes,
              FlexibleInstances #-}
 
 -- Arguably, the type signature for f1 should be enough to make
diff --git a/testsuite/tests/typecheck/should_compile/tc183.hs b/testsuite/tests/typecheck/should_compile/tc183.hs
index 5015af3c91..a565ab04ab 100644
--- a/testsuite/tests/typecheck/should_compile/tc183.hs
+++ b/testsuite/tests/typecheck/should_compile/tc183.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ExistentialQuantification, Rank2Types #-}
+{-# LANGUAGE ExistentialQuantification, RankNTypes #-}
 
 -- An interesting interaction of universals and existentials, prompted by 
 -- http://www.haskell.org/pipermail/haskell-cafe/2004-October/007160.html
diff --git a/testsuite/tests/typecheck/should_compile/tc194.hs b/testsuite/tests/typecheck/should_compile/tc194.hs
index 07b0ed4f02..c9eae1e4cf 100644
--- a/testsuite/tests/typecheck/should_compile/tc194.hs
+++ b/testsuite/tests/typecheck/should_compile/tc194.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 -- Tests the special case of
 -- 	non-recursive, function binding, 
diff --git a/testsuite/tests/typecheck/should_compile/tc198.hs b/testsuite/tests/typecheck/should_compile/tc198.hs
index e931ac5cb8..9df5d9f483 100644
--- a/testsuite/tests/typecheck/should_compile/tc198.hs
+++ b/testsuite/tests/typecheck/should_compile/tc198.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 -- This should work, because the type sig and the type
 -- in the pattern match exactly
diff --git a/testsuite/tests/typecheck/should_compile/tc203.hs b/testsuite/tests/typecheck/should_compile/tc203.hs
index 2579896458..a2a361514a 100644
--- a/testsuite/tests/typecheck/should_compile/tc203.hs
+++ b/testsuite/tests/typecheck/should_compile/tc203.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- Check that we can have a forall after a forall
 
diff --git a/testsuite/tests/typecheck/should_compile/tc206.hs b/testsuite/tests/typecheck/should_compile/tc206.hs
index c54618950a..68e751c0de 100644
--- a/testsuite/tests/typecheck/should_compile/tc206.hs
+++ b/testsuite/tests/typecheck/should_compile/tc206.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- This one showed up a bug in pre-subsumption
 
diff --git a/testsuite/tests/typecheck/should_compile/tc208.hs b/testsuite/tests/typecheck/should_compile/tc208.hs
index 0bfb1d4e81..0874d0249b 100644
--- a/testsuite/tests/typecheck/should_compile/tc208.hs
+++ b/testsuite/tests/typecheck/should_compile/tc208.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ImplicitParams, Rank2Types #-}
+{-# LANGUAGE ImplicitParams, RankNTypes #-}
 
 -- This program failed to typecheck in an early version of
 -- GHC with impredicative polymorphism, but it was fixed by
diff --git a/testsuite/tests/typecheck/should_compile/tc210.hs b/testsuite/tests/typecheck/should_compile/tc210.hs
index a2cc717122..b4a377f761 100644
--- a/testsuite/tests/typecheck/should_compile/tc210.hs
+++ b/testsuite/tests/typecheck/should_compile/tc210.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc213.hs b/testsuite/tests/typecheck/should_compile/tc213.hs
index e9e3069e7b..1f0b46449a 100644
--- a/testsuite/tests/typecheck/should_compile/tc213.hs
+++ b/testsuite/tests/typecheck/should_compile/tc213.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables, FlexibleInstances,
+{-# LANGUAGE RankNTypes, ScopedTypeVariables, FlexibleInstances,
              MultiParamTypeClasses, FunctionalDependencies #-}
 
 -- This tests scoped type variables, used in an expression 
diff --git a/testsuite/tests/typecheck/should_compile/tc222.hs b/testsuite/tests/typecheck/should_compile/tc222.hs
index 4c418ca232..ee8fb1cb6f 100644
--- a/testsuite/tests/typecheck/should_compile/tc222.hs
+++ b/testsuite/tests/typecheck/should_compile/tc222.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ImplicitParams, Rank2Types #-}
+{-# LANGUAGE ImplicitParams, RankNTypes #-}
 
 -- Tests impredivative polymorphism with left-to-right
 -- flow information; see the uses of "$"
diff --git a/testsuite/tests/typecheck/should_compile/tc229.hs b/testsuite/tests/typecheck/should_compile/tc229.hs
index bf48342ee9..5c879fd89b 100644
--- a/testsuite/tests/typecheck/should_compile/tc229.hs
+++ b/testsuite/tests/typecheck/should_compile/tc229.hs
@@ -2,7 +2,7 @@
 -- trac #1406: Constraint doesn't reduce in the presence of quantified
 --             type variables
 
-{-# LANGUAGE FlexibleInstances, UndecidableInstances, Rank2Types,
+{-# LANGUAGE FlexibleInstances, UndecidableInstances, RankNTypes,
              MultiParamTypeClasses, FunctionalDependencies #-}
 
 module Problem where
diff --git a/testsuite/tests/typecheck/should_compile/tc233.hs b/testsuite/tests/typecheck/should_compile/tc233.hs
index 6421ae7a82..0f031e0fcf 100644
--- a/testsuite/tests/typecheck/should_compile/tc233.hs
+++ b/testsuite/tests/typecheck/should_compile/tc233.hs
@@ -1,5 +1,5 @@
 
-{-# OPTIONS_GHC -XPolymorphicComponents #-}
+{-# LANGUAGE RankNTypes #-}
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc236.hs b/testsuite/tests/typecheck/should_compile/tc236.hs
index c555cec38a..11edebc17c 100644
--- a/testsuite/tests/typecheck/should_compile/tc236.hs
+++ b/testsuite/tests/typecheck/should_compile/tc236.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/typecheck/should_fail/T7019.hs b/testsuite/tests/typecheck/should_fail/T7019.hs
index 45df18ef92..ea482f0301 100644
--- a/testsuite/tests/typecheck/should_fail/T7019.hs
+++ b/testsuite/tests/typecheck/should_fail/T7019.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE FlexibleInstances    #-}
 {-# LANGUAGE TypeFamilies         #-}
-{-# LANGUAGE Rank2Types           #-}
+{-# LANGUAGE RankNTypes           #-}
 {-# LANGUAGE ConstraintKinds      #-}
 {-# LANGUAGE UndecidableInstances #-}
 
diff --git a/testsuite/tests/typecheck/should_fail/T7019a.hs b/testsuite/tests/typecheck/should_fail/T7019a.hs
index a4fb4df252..a0143d7fd3 100644
--- a/testsuite/tests/typecheck/should_fail/T7019a.hs
+++ b/testsuite/tests/typecheck/should_fail/T7019a.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE FlexibleInstances    #-}
 {-# LANGUAGE TypeFamilies         #-}
-{-# LANGUAGE Rank2Types           #-}
+{-# LANGUAGE RankNTypes           #-}
 
 module T7019a where
 
diff --git a/testsuite/tests/typecheck/should_fail/tcfail076.hs b/testsuite/tests/typecheck/should_fail/tcfail076.hs
index abe96c5640..e8a34558b6 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail076.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail076.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 {- 
 	From: Ralf Hinze <ralf@uran.informatik.uni-bonn.de>
diff --git a/testsuite/tests/typecheck/should_fail/tcfail088.hs b/testsuite/tests/typecheck/should_fail/tcfail088.hs
index 6b9f50751e..4b8dcd7e39 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail088.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail088.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, FlexibleInstances #-}
+{-# LANGUAGE RankNTypes, FlexibleInstances #-}
 
 -- !!! Check that forall types can't be arguments
 module ShouldFail where
diff --git a/testsuite/tests/typecheck/should_fail/tcfail104.hs b/testsuite/tests/typecheck/should_fail/tcfail104.hs
index 292780541c..7a6a50547c 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail104.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail104.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
 -- Test the handling of conditionals in rank-n stuff
 -- Should fail, regardless of branch ordering
diff --git a/testsuite/tests/typecheck/should_fail/tcfail110.hs b/testsuite/tests/typecheck/should_fail/tcfail110.hs
index 92aeb56c06..f9d1bb9c58 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail110.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail110.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/typecheck/should_fail/tcfail122.hs b/testsuite/tests/typecheck/should_fail/tcfail122.hs
index ae2bef8bea..0576f5f9d0 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail122.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail122.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, KindSignatures #-}
+{-# LANGUAGE RankNTypes, KindSignatures #-}
 
 module ShouldFail where
 
diff --git a/testsuite/tests/typecheck/should_fail/tcfail188.hs b/testsuite/tests/typecheck/should_fail/tcfail188.hs
index a79087d90d..d9b3058e19 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail188.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail188.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types, KindSignatures #-}
+{-# LANGUAGE RankNTypes, KindSignatures #-}
 {-# OPTIONS_GHC -Werror #-}
 
 -- Trac #959
diff --git a/testsuite/tests/typecheck/should_fail/tcfail201.hs b/testsuite/tests/typecheck/should_fail/tcfail201.hs
index 276efd05ae..f9d3188682 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail201.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail201.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE RankNTypes #-}
 
 
 -- Claus reported by email that