Unit: split and rename modules

Introduce GHC.Unit.* hierarchy for everything concerning units, packages
and modules.

Update Haddock submodule

23 files changed, 112 insertions, 230 deletions

diff --git a/testsuite/tests/ghc-api/T8628.hs b/testsuite/tests/ghc-api/T8628.hs
index 9e8fd84fcb..fa23bc5218 100644
--- a/testsuite/tests/ghc-api/T8628.hs
+++ b/testsuite/tests/ghc-api/T8628.hs
@@ -4,7 +4,7 @@ import System.IO
 import GHC.Driver.Session
 import GHC
 import GHC.Utils.Exception
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Data.FastString
 import GHC.Utils.Monad
 import GHC.Utils.Outputable
diff --git a/testsuite/tests/ghc-api/T9595.hs b/testsuite/tests/ghc-api/T9595.hs
index 0080ae9bc5..3910a20115 100644
--- a/testsuite/tests/ghc-api/T9595.hs
+++ b/testsuite/tests/ghc-api/T9595.hs
@@ -1,12 +1,12 @@
 module Main where
 
 import GHC
-import GHC.Driver.Packages
+import GHC.Unit.State
 import GHC.Driver.Monad
 import GHC.Utils.Outputable
 import System.Environment
 import GHC.Driver.Session
-import GHC.Types.Module
+import GHC.Unit.Module
 
 main =
   do [libdir] <- getArgs
diff --git a/testsuite/tests/ghci/linking/dyn/all.T b/testsuite/tests/ghci/linking/dyn/all.T
index 9a54670732..127c9707a7 100644
--- a/testsuite/tests/ghci/linking/dyn/all.T
+++ b/testsuite/tests/ghci/linking/dyn/all.T
@@ -52,6 +52,6 @@ test('T3372',
       unless(config.have_RTS_linker, skip),
       # Concurrent GHC sessions is fragile on Windows since we must lock the
       # package database even for read-only access.
-      # See Note [Locking package database on Windows] in GHC.PackageDb
+      # See Note [Locking package database on Windows] in GHC.Unit.Database
       when(opsys('mingw32'), fragile(16773))],
      compile_and_run, ['-package ghc'])
diff --git a/testsuite/tests/parser/should_run/CountParserDeps.hs b/testsuite/tests/parser/should_run/CountParserDeps.hs
index ced0cde750..fdc44fe09c 100644
--- a/testsuite/tests/parser/should_run/CountParserDeps.hs
+++ b/testsuite/tests/parser/should_run/CountParserDeps.hs
@@ -11,7 +11,7 @@ module Main(main) where
 -- need exists to produce ASTs and nothing more.
 
 import GHC.Driver.Types
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Driver.Session
 import GHC.Driver.Main
 import GHC
@@ -30,7 +30,7 @@ main = do
   let num = sizeUniqSet modules
 --  print num
 --  print (map moduleNameString $ nonDetEltsUniqSet modules)
-  unless (num < 190) $ exitWith (ExitFailure num)
+  unless (num < 195) $ exitWith (ExitFailure num)
 
 parserDeps :: FilePath -> IO (UniqSet ModuleName)
 parserDeps libdir =
diff --git a/testsuite/tests/regalloc/regalloc_unit_tests.hs b/testsuite/tests/regalloc/regalloc_unit_tests.hs
index 4c34a065ca..b4495f5d34 100644
--- a/testsuite/tests/regalloc/regalloc_unit_tests.hs
+++ b/testsuite/tests/regalloc/regalloc_unit_tests.hs
@@ -33,7 +33,7 @@ import GHC.Cmm.Pipeline
 import GHC.Cmm.Parser
 import GHC.Cmm.Info
 import GHC.Cmm
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Cmm.DebugBlock
 import GHC
 import GHC.Driver.Monad
diff --git a/testsuite/tests/roles/should_compile/Roles1.stderr b/testsuite/tests/roles/should_compile/Roles1.stderr
index defc6e8c3a..e4f1683ee9 100644
--- a/testsuite/tests/roles/should_compile/Roles1.stderr
+++ b/testsuite/tests/roles/should_compile/Roles1.stderr
@@ -20,122 +20,66 @@ DATA CONSTRUCTORS
   K2 :: forall a. a -> T2 a
   K1 :: forall a. a -> T1 a
 Dependent modules: []
-Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1,
-                     integer-gmp-1.0.2.0]
+Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1,
+                     integer-gmp-1.0.3.0]
 
 ==================== Typechecker ====================
 Roles1.$tcT7
   = GHC.Types.TyCon
-      178606230775360129##
-      14564382578551945561##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "T7"#)
-      1
-      $krep
+      178606230775360129## 14564382578551945561## Roles1.$trModule
+      (GHC.Types.TrNameS "T7"#) 1 $krep
 Roles1.$tc'K7
   = GHC.Types.TyCon
-      15901479081375327280##
-      4842873210599704617##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "'K7"#)
-      3
-      $krep
+      15901479081375327280## 4842873210599704617## Roles1.$trModule
+      (GHC.Types.TrNameS "'K7"#) 3 $krep
 Roles1.$tcT6
   = GHC.Types.TyCon
-      7244893995195634045##
-      6882827069359931041##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "T6"#)
-      1
-      $krep
+      7244893995195634045## 6882827069359931041## Roles1.$trModule
+      (GHC.Types.TrNameS "T6"#) 1 $krep
 Roles1.$tc'K6
   = GHC.Types.TyCon
-      13928703131159360198##
-      9274401506945696896##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "'K6"#)
-      2
-      $krep
+      13928703131159360198## 9274401506945696896## Roles1.$trModule
+      (GHC.Types.TrNameS "'K6"#) 2 $krep
 Roles1.$tcT5
   = GHC.Types.TyCon
-      12033401645911719002##
-      6369139038321702301##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "T5"#)
-      0
-      GHC.Types.krep$*Arr*
+      12033401645911719002## 6369139038321702301## Roles1.$trModule
+      (GHC.Types.TrNameS "T5"#) 0 GHC.Types.krep$*Arr*
 Roles1.$tc'K5
   = GHC.Types.TyCon
-      5548842497263642061##
-      18349261927117571882##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "'K5"#)
-      1
-      $krep
+      5548842497263642061## 18349261927117571882## Roles1.$trModule
+      (GHC.Types.TrNameS "'K5"#) 1 $krep
 Roles1.$tcT4
   = GHC.Types.TyCon
-      15834077582937152787##
-      17059037094835388922##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "T4"#)
-      0
-      $krep
+      15834077582937152787## 17059037094835388922## Roles1.$trModule
+      (GHC.Types.TrNameS "T4"#) 0 $krep
 Roles1.$tc'K4
   = GHC.Types.TyCon
-      10188453925450404995##
-      4762093850599364042##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "'K4"#)
-      2
-      $krep
+      10188453925450404995## 4762093850599364042## Roles1.$trModule
+      (GHC.Types.TrNameS "'K4"#) 2 $krep
 Roles1.$tcT3
   = GHC.Types.TyCon
-      13341737262627465733##
-      14527452670364737316##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "T3"#)
-      1
-      $krep
+      13341737262627465733## 14527452670364737316## Roles1.$trModule
+      (GHC.Types.TrNameS "T3"#) 1 $krep
 Roles1.$tc'K3
   = GHC.Types.TyCon
-      14534968069054730342##
-      6860808298964464185##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "'K3"#)
-      2
-      $krep
+      14534968069054730342## 6860808298964464185## Roles1.$trModule
+      (GHC.Types.TrNameS "'K3"#) 2 $krep
 Roles1.$tcT2
   = GHC.Types.TyCon
-      12900773996789723956##
-      9313087549503346504##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "T2"#)
-      0
-      GHC.Types.krep$*Arr*
+      12900773996789723956## 9313087549503346504## Roles1.$trModule
+      (GHC.Types.TrNameS "T2"#) 0 GHC.Types.krep$*Arr*
 Roles1.$tc'K2
   = GHC.Types.TyCon
-      11054915488163123841##
-      10799789256744079155##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "'K2"#)
-      1
-      $krep
+      11054915488163123841## 10799789256744079155## Roles1.$trModule
+      (GHC.Types.TrNameS "'K2"#) 1 $krep
 Roles1.$tcT1
   = GHC.Types.TyCon
-      13228660854624297872##
-      14494320157476678712##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "T1"#)
-      0
-      GHC.Types.krep$*Arr*
+      13228660854624297872## 14494320157476678712## Roles1.$trModule
+      (GHC.Types.TrNameS "T1"#) 0 GHC.Types.krep$*Arr*
 Roles1.$tc'K1
   = GHC.Types.TyCon
-      1265606750138351672##
-      7033043930969109074##
-      Roles1.$trModule
-      (GHC.Types.TrNameS "'K1"#)
-      1
-      $krep
+      1265606750138351672## 7033043930969109074## Roles1.$trModule
+      (GHC.Types.TrNameS "'K1"#) 1 $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 1
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 0
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 0
@@ -172,3 +116,4 @@ Roles1.$trModule
   = GHC.Types.Module
       (GHC.Types.TrNameS "main"#) (GHC.Types.TrNameS "Roles1"#)
 
+
diff --git a/testsuite/tests/roles/should_compile/Roles14.stderr b/testsuite/tests/roles/should_compile/Roles14.stderr
index a55e57f080..54e01992be 100644
--- a/testsuite/tests/roles/should_compile/Roles14.stderr
+++ b/testsuite/tests/roles/should_compile/Roles14.stderr
@@ -6,26 +6,18 @@ TYPE CONSTRUCTORS
 COERCION AXIOMS
   axiom Roles12.N:C2 :: C2 a = a -> a
 Dependent modules: []
-Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1,
-                     integer-gmp-1.0.2.0]
+Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1,
+                     integer-gmp-1.0.3.0]
 
 ==================== Typechecker ====================
 Roles12.$tcC2
   = GHC.Types.TyCon
-      7996680154108933333##
-      9454227235464419996##
-      Roles12.$trModule
-      (GHC.Types.TrNameS "C2"#)
-      0
-      $krep
+      7996680154108933333## 9454227235464419996## Roles12.$trModule
+      (GHC.Types.TrNameS "C2"#) 0 $krep
 Roles12.$tc'C:C2
   = GHC.Types.TyCon
-      7087988437584478859##
-      11477953550142401435##
-      Roles12.$trModule
-      (GHC.Types.TrNameS "'C:C2"#)
-      1
-      $krep
+      7087988437584478859## 11477953550142401435## Roles12.$trModule
+      (GHC.Types.TrNameS "'C:C2"#) 1 $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 0
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
@@ -39,3 +31,4 @@ Roles12.$trModule
   = GHC.Types.Module
       (GHC.Types.TrNameS "main"#) (GHC.Types.TrNameS "Roles12"#)
 
+
diff --git a/testsuite/tests/roles/should_compile/Roles2.stderr b/testsuite/tests/roles/should_compile/Roles2.stderr
index c1d6cc3870..7d721f2c12 100644
--- a/testsuite/tests/roles/should_compile/Roles2.stderr
+++ b/testsuite/tests/roles/should_compile/Roles2.stderr
@@ -6,42 +6,26 @@ DATA CONSTRUCTORS
   K2 :: forall a. FunPtr a -> T2 a
   K1 :: forall a. IO a -> T1 a
 Dependent modules: []
-Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1,
-                     integer-gmp-1.0.2.0]
+Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1,
+                     integer-gmp-1.0.3.0]
 
 ==================== Typechecker ====================
 Roles2.$tcT2
   = GHC.Types.TyCon
-      9065817229114433861##
-      13399581642971864140##
-      Roles2.$trModule
-      (GHC.Types.TrNameS "T2"#)
-      0
-      GHC.Types.krep$*Arr*
+      9065817229114433861## 13399581642971864140## Roles2.$trModule
+      (GHC.Types.TrNameS "T2"#) 0 GHC.Types.krep$*Arr*
 Roles2.$tc'K2
   = GHC.Types.TyCon
-      17395957229042313563##
-      12263882107019815181##
-      Roles2.$trModule
-      (GHC.Types.TrNameS "'K2"#)
-      1
-      $krep
+      17395957229042313563## 12263882107019815181## Roles2.$trModule
+      (GHC.Types.TrNameS "'K2"#) 1 $krep
 Roles2.$tcT1
   = GHC.Types.TyCon
-      10310640733256438505##
-      9162099558816022096##
-      Roles2.$trModule
-      (GHC.Types.TrNameS "T1"#)
-      0
-      GHC.Types.krep$*Arr*
+      10310640733256438505## 9162099558816022096## Roles2.$trModule
+      (GHC.Types.TrNameS "T1"#) 0 GHC.Types.krep$*Arr*
 Roles2.$tc'K1
   = GHC.Types.TyCon
-      16530009231990968394##
-      11761390951471299534##
-      Roles2.$trModule
-      (GHC.Types.TrNameS "'K1"#)
-      1
-      $krep
+      16530009231990968394## 11761390951471299534## Roles2.$trModule
+      (GHC.Types.TrNameS "'K1"#) 1 $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 0
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
@@ -57,3 +41,4 @@ Roles2.$trModule
   = GHC.Types.Module
       (GHC.Types.TrNameS "main"#) (GHC.Types.TrNameS "Roles2"#)
 
+
diff --git a/testsuite/tests/roles/should_compile/Roles3.stderr b/testsuite/tests/roles/should_compile/Roles3.stderr
index 255f2ed773..a7fb7a06c9 100644
--- a/testsuite/tests/roles/should_compile/Roles3.stderr
+++ b/testsuite/tests/roles/should_compile/Roles3.stderr
@@ -21,58 +21,34 @@ COERCION AXIOMS
   axiom Roles3.N:C3 :: C3 a b = a -> F3 b -> F3 b
   axiom Roles3.N:C4 :: C4 a b = a -> F4 b -> F4 b
 Dependent modules: []
-Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1,
-                     integer-gmp-1.0.2.0]
+Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1,
+                     integer-gmp-1.0.3.0]
 
 ==================== Typechecker ====================
 Roles3.$tcC4
   = GHC.Types.TyCon
-      6800596812149592130##
-      15513203864133461281##
-      Roles3.$trModule
-      (GHC.Types.TrNameS "C4"#)
-      0
-      $krep
+      6800596812149592130## 15513203864133461281## Roles3.$trModule
+      (GHC.Types.TrNameS "C4"#) 0 $krep
 Roles3.$tcC3
   = GHC.Types.TyCon
-      5076086601454991970##
-      10299714674904836194##
-      Roles3.$trModule
-      (GHC.Types.TrNameS "C3"#)
-      0
-      $krep
+      5076086601454991970## 10299714674904836194## Roles3.$trModule
+      (GHC.Types.TrNameS "C3"#) 0 $krep
 Roles3.$tcC2
   = GHC.Types.TyCon
-      7902873224172523979##
-      11840994447152209031##
-      Roles3.$trModule
-      (GHC.Types.TrNameS "C2"#)
-      0
-      $krep
+      7902873224172523979## 11840994447152209031## Roles3.$trModule
+      (GHC.Types.TrNameS "C2"#) 0 $krep
 Roles3.$tc'C:C2
   = GHC.Types.TyCon
-      11218882737915989529##
-      9454910899374397367##
-      Roles3.$trModule
-      (GHC.Types.TrNameS "'C:C2"#)
-      2
-      $krep
+      11218882737915989529## 9454910899374397367## Roles3.$trModule
+      (GHC.Types.TrNameS "'C:C2"#) 2 $krep
 Roles3.$tcC1
   = GHC.Types.TyCon
-      11013585501375994163##
-      16371608655219610659##
-      Roles3.$trModule
-      (GHC.Types.TrNameS "C1"#)
-      0
-      $krep
+      11013585501375994163## 16371608655219610659## Roles3.$trModule
+      (GHC.Types.TrNameS "C1"#) 0 $krep
 Roles3.$tc'C:C1
   = GHC.Types.TyCon
-      4508088879886988796##
-      13962145553903222779##
-      Roles3.$trModule
-      (GHC.Types.TrNameS "'C:C1"#)
-      1
-      $krep
+      4508088879886988796## 13962145553903222779## Roles3.$trModule
+      (GHC.Types.TrNameS "'C:C1"#) 1 $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 0
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 1
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
@@ -97,3 +73,4 @@ Roles3.$trModule
   = GHC.Types.Module
       (GHC.Types.TrNameS "main"#) (GHC.Types.TrNameS "Roles3"#)
 
+
diff --git a/testsuite/tests/roles/should_compile/Roles4.stderr b/testsuite/tests/roles/should_compile/Roles4.stderr
index 8a8851a0a2..8f1d58183b 100644
--- a/testsuite/tests/roles/should_compile/Roles4.stderr
+++ b/testsuite/tests/roles/should_compile/Roles4.stderr
@@ -9,42 +9,26 @@ COERCION AXIOMS
   axiom Roles4.N:C1 :: C1 a = a -> a
   axiom Roles4.N:C3 :: C3 a = a -> Syn1 a
 Dependent modules: []
-Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1,
-                     integer-gmp-1.0.2.0]
+Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1,
+                     integer-gmp-1.0.3.0]
 
 ==================== Typechecker ====================
 Roles4.$tcC3
   = GHC.Types.TyCon
-      7508642517340826358##
-      16938219270597865136##
-      Roles4.$trModule
-      (GHC.Types.TrNameS "C3"#)
-      0
-      $krep
+      7508642517340826358## 16938219270597865136## Roles4.$trModule
+      (GHC.Types.TrNameS "C3"#) 0 $krep
 Roles4.$tc'C:C3
   = GHC.Types.TyCon
-      3133378316178104365##
-      15809386433947157376##
-      Roles4.$trModule
-      (GHC.Types.TrNameS "'C:C3"#)
-      1
-      $krep
+      3133378316178104365## 15809386433947157376## Roles4.$trModule
+      (GHC.Types.TrNameS "'C:C3"#) 1 $krep
 Roles4.$tcC1
   = GHC.Types.TyCon
-      13392243382482428602##
-      1780037961948725012##
-      Roles4.$trModule
-      (GHC.Types.TrNameS "C1"#)
-      0
-      $krep
+      13392243382482428602## 1780037961948725012## Roles4.$trModule
+      (GHC.Types.TrNameS "C1"#) 0 $krep
 Roles4.$tc'C:C1
   = GHC.Types.TyCon
-      3870707671502302648##
-      10631907186261837450##
-      Roles4.$trModule
-      (GHC.Types.TrNameS "'C:C1"#)
-      1
-      $krep
+      3870707671502302648## 10631907186261837450## Roles4.$trModule
+      (GHC.Types.TrNameS "'C:C1"#) 1 $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 0
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepFun $krep $krep
@@ -64,3 +48,4 @@ Roles4.$trModule
   = GHC.Types.Module
       (GHC.Types.TrNameS "main"#) (GHC.Types.TrNameS "Roles4"#)
 
+
diff --git a/testsuite/tests/roles/should_compile/T8958.stderr b/testsuite/tests/roles/should_compile/T8958.stderr
index f498b9b009..07d0496799 100644
--- a/testsuite/tests/roles/should_compile/T8958.stderr
+++ b/testsuite/tests/roles/should_compile/T8958.stderr
@@ -17,7 +17,7 @@ CLASS INSTANCES
   instance [incoherent] Nominal a -- Defined at T8958.hs:7:10
 Dependent modules: []
 Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1,
-                     integer-gmp-1.0.2.0]
+                     integer-gmp-1.0.3.0]
 
 ==================== Typechecker ====================
 T8958.$tcMap
diff --git a/testsuite/tests/simplCore/should_compile/T14137.stderr b/testsuite/tests/simplCore/should_compile/T14137.stderr
index 602a74072d..71fee02df4 100644
--- a/testsuite/tests/simplCore/should_compile/T14137.stderr
+++ b/testsuite/tests/simplCore/should_compile/T14137.stderr
@@ -55,9 +55,9 @@ $trModule4 :: GHC.Types.TrName
 $trModule4 = GHC.Types.TrNameS $trModule3
 
 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
-T14137.$trModule :: GHC.Types.Module
+T14137.$trModule :: GHC.Unit.Module
 [GblId, Caf=NoCafRefs]
-T14137.$trModule = GHC.Types.Module $trModule2 $trModule4
+T14137.$trModule = GHC.Unit.Module $trModule2 $trModule4
 
 
 
diff --git a/testsuite/tests/simplCore/should_compile/T14152.stderr b/testsuite/tests/simplCore/should_compile/T14152.stderr
index c782d84fc3..cc025625b9 100644
--- a/testsuite/tests/simplCore/should_compile/T14152.stderr
+++ b/testsuite/tests/simplCore/should_compile/T14152.stderr
@@ -116,14 +116,14 @@ T14152.$trModule1 :: GHC.Types.TrName
 T14152.$trModule1 = GHC.Types.TrNameS T14152.$trModule2
 
 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
-T14152.$trModule :: GHC.Types.Module
+T14152.$trModule :: GHC.Unit.Module
 [GblId,
  Caf=NoCafRefs,
  Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
 T14152.$trModule
-  = GHC.Types.Module T14152.$trModule3 T14152.$trModule1
+  = GHC.Unit.Module T14152.$trModule3 T14152.$trModule1
 
 
 
diff --git a/testsuite/tests/simplCore/should_compile/T14152a.stderr b/testsuite/tests/simplCore/should_compile/T14152a.stderr
index d4b2ed39b8..0196c3695d 100644
--- a/testsuite/tests/simplCore/should_compile/T14152a.stderr
+++ b/testsuite/tests/simplCore/should_compile/T14152a.stderr
@@ -209,14 +209,14 @@ T14152.$trModule1 :: GHC.Types.TrName
 T14152.$trModule1 = GHC.Types.TrNameS T14152.$trModule2
 
 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
-T14152.$trModule :: GHC.Types.Module
+T14152.$trModule :: GHC.Unit.Module
 [GblId,
  Caf=NoCafRefs,
  Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
 T14152.$trModule
-  = GHC.Types.Module T14152.$trModule3 T14152.$trModule1
+  = GHC.Unit.Module T14152.$trModule3 T14152.$trModule1
 
 
 
diff --git a/testsuite/tests/simplCore/should_compile/T14186.stderr b/testsuite/tests/simplCore/should_compile/T14186.stderr
index 17ccc2c07d..41701fd4d9 100644
--- a/testsuite/tests/simplCore/should_compile/T14186.stderr
+++ b/testsuite/tests/simplCore/should_compile/T14186.stderr
@@ -106,14 +106,14 @@ T14186.$trModule1 :: GHC.Types.TrName
 T14186.$trModule1 = GHC.Types.TrNameS T14186.$trModule2
 
 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
-T14186.$trModule :: GHC.Types.Module
+T14186.$trModule :: GHC.Unit.Module
 [GblId,
  Caf=NoCafRefs,
  Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
 T14186.$trModule
-  = GHC.Types.Module T14186.$trModule3 T14186.$trModule1
+  = GHC.Unit.Module T14186.$trModule3 T14186.$trModule1
 
 
 
diff --git a/testsuite/tests/simplCore/should_compile/spec004.stderr b/testsuite/tests/simplCore/should_compile/spec004.stderr
index 8d53785b68..f140da9977 100644
--- a/testsuite/tests/simplCore/should_compile/spec004.stderr
+++ b/testsuite/tests/simplCore/should_compile/spec004.stderr
@@ -67,11 +67,11 @@ $trModule :: GHC.Types.TrName
 $trModule = GHC.Types.TrNameS $trModule
 
 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
-ShouldCompile.$trModule :: GHC.Types.Module
+ShouldCompile.$trModule :: GHC.Unit.Module
 [LclIdX,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
-ShouldCompile.$trModule = GHC.Types.Module $trModule $trModule
+ShouldCompile.$trModule = GHC.Unit.Module $trModule $trModule
 
 -- RHS size: {terms: 5, types: 1, coercions: 0, joins: 0/0}
 bar :: String
diff --git a/testsuite/tests/simplStg/should_compile/T13588.stderr b/testsuite/tests/simplStg/should_compile/T13588.stderr
index 15075cd3fc..4c9c6dd006 100644
--- a/testsuite/tests/simplStg/should_compile/T13588.stderr
+++ b/testsuite/tests/simplStg/should_compile/T13588.stderr
@@ -40,9 +40,9 @@ T13588.$trModule1 :: GHC.Types.TrName
 [GblId, Caf=NoCafRefs, Str=m1, Unf=OtherCon []] =
     NO_CCS GHC.Types.TrNameS! [T13588.$trModule2];
 
-T13588.$trModule :: GHC.Types.Module
+T13588.$trModule :: GHC.Unit.Module
 [GblId, Caf=NoCafRefs, Str=m, Unf=OtherCon []] =
-    NO_CCS GHC.Types.Module! [T13588.$trModule3 T13588.$trModule1];
+    NO_CCS GHC.Unit.Module! [T13588.$trModule3 T13588.$trModule1];
 
 $krep_rWb :: GHC.Types.KindRep
 [GblId, Caf=NoCafRefs, Str=m2, Unf=OtherCon []] =
@@ -137,9 +137,9 @@ T13588.$trModule1 :: GHC.Types.TrName
 [GblId, Caf=NoCafRefs, Str=m1, Unf=OtherCon []] =
     NO_CCS GHC.Types.TrNameS! [T13588.$trModule2];
 
-T13588.$trModule :: GHC.Types.Module
+T13588.$trModule :: GHC.Unit.Module
 [GblId, Caf=NoCafRefs, Str=m, Unf=OtherCon []] =
-    NO_CCS GHC.Types.Module! [T13588.$trModule3 T13588.$trModule1];
+    NO_CCS GHC.Unit.Module! [T13588.$trModule3 T13588.$trModule1];
 
 $krep_rWb :: GHC.Types.KindRep
 [GblId, Caf=NoCafRefs, Str=m2, Unf=OtherCon []] =
diff --git a/testsuite/tests/stranal/should_compile/T10482.stderr b/testsuite/tests/stranal/should_compile/T10482.stderr
index af81b81bab..2c2f7ca067 100644
--- a/testsuite/tests/stranal/should_compile/T10482.stderr
+++ b/testsuite/tests/stranal/should_compile/T10482.stderr
@@ -48,11 +48,11 @@ T10482.$trModule1 :: GHC.Types.TrName
 T10482.$trModule1 = GHC.Types.TrNameS T10482.$trModule2
 
 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
-T10482.$trModule :: GHC.Types.Module
+T10482.$trModule :: GHC.Unit.Module
 [GblId,
  Cpr=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
-T10482.$trModule = GHC.Types.Module T10482.$trModule3 T10482.$trModule1
+T10482.$trModule = GHC.Unit.Module T10482.$trModule3 T10482.$trModule1
 
 -- RHS size: {terms: 3, types: 1, coercions: 0, joins: 0/0}
 $krep_r1Gw :: GHC.Types.KindRep
diff --git a/testsuite/tests/stranal/should_compile/T10482a.stderr b/testsuite/tests/stranal/should_compile/T10482a.stderr
index 8d6fd7d877..369694a870 100644
--- a/testsuite/tests/stranal/should_compile/T10482a.stderr
+++ b/testsuite/tests/stranal/should_compile/T10482a.stderr
@@ -57,11 +57,11 @@ Foo.$trModule1 :: GHC.Types.TrName
 Foo.$trModule1 = GHC.Types.TrNameS Foo.$trModule2
 
 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
-Foo.$trModule :: GHC.Types.Module
+Foo.$trModule :: GHC.Unit.Module
 [GblId,
  Cpr=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
-Foo.$trModule = GHC.Types.Module Foo.$trModule3 Foo.$trModule1
+Foo.$trModule = GHC.Unit.Module Foo.$trModule3 Foo.$trModule1
 
 -- RHS size: {terms: 3, types: 1, coercions: 0, joins: 0/0}
 $krep_r1x7 :: GHC.Types.KindRep
diff --git a/testsuite/tests/stranal/should_compile/T10694.stderr b/testsuite/tests/stranal/should_compile/T10694.stderr
index 5eb2c186ad..66a337ab24 100644
--- a/testsuite/tests/stranal/should_compile/T10694.stderr
+++ b/testsuite/tests/stranal/should_compile/T10694.stderr
@@ -75,11 +75,11 @@ T10694.$trModule1 :: GHC.Types.TrName
 T10694.$trModule1 = GHC.Types.TrNameS T10694.$trModule2
 
 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
-T10694.$trModule :: GHC.Types.Module
+T10694.$trModule :: GHC.Unit.Module
 [GblId,
  Cpr=m1,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
-T10694.$trModule = GHC.Types.Module T10694.$trModule3 T10694.$trModule1
+T10694.$trModule = GHC.Unit.Module T10694.$trModule3 T10694.$trModule1
 
 
 
diff --git a/testsuite/tests/stranal/should_compile/T11770.stderr b/testsuite/tests/stranal/should_compile/T11770.stderr
index 82f6a9d1f9..2c9c149d7d 100644
--- a/testsuite/tests/stranal/should_compile/T11770.stderr
+++ b/testsuite/tests/stranal/should_compile/T11770.stderr
@@ -21,14 +21,14 @@ T11770.$trModule1 :: GHC.Types.TrName
 T11770.$trModule1 = GHC.Types.TrNameS "T11770"#
 
 -- RHS size: {terms: 3, types: 0, coercions: 0}
-T11770.$trModule :: GHC.Types.Module
+T11770.$trModule :: GHC.Unit.Module
 [GblId,
  Caf=NoCafRefs,
  Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True,
          WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
 T11770.$trModule =
-  GHC.Types.Module T11770.$trModule2 T11770.$trModule1
+  GHC.Unit.Module T11770.$trModule2 T11770.$trModule1
 
 Rec {
 -- RHS size: {terms: 32, types: 11, coercions: 0}
diff --git a/testsuite/tests/stranal/should_compile/T15627.stderr b/testsuite/tests/stranal/should_compile/T15627.stderr
index 91f51b4ba8..38c054da17 100644
--- a/testsuite/tests/stranal/should_compile/T15627.stderr
+++ b/testsuite/tests/stranal/should_compile/T15627.stderr
@@ -34,12 +34,12 @@ Unlifted.$trModule1 :: GHC.Types.TrName
 Unlifted.$trModule1 = GHC.Types.TrNameS Unlifted.$trModule2
 
 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0}
-Unlifted.$trModule :: GHC.Types.Module
+Unlifted.$trModule :: GHC.Unit.Module
 [GblId,
  Caf=NoCafRefs,
  Str=m,
  Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 30}]
-Unlifted.$trModule = GHC.Types.Module Unlifted.$trModule3 Unlifted.$trModule1
+Unlifted.$trModule = GHC.Unit.Module Unlifted.$trModule3 Unlifted.$trModule1
 
 -- RHS size: {terms: 3, types: 1, coercions: 0, joins: 0/0}
 $krep_r2Xd :: GHC.Types.KindRep
diff --git a/testsuite/tests/th/TH_Roles2.stderr b/testsuite/tests/th/TH_Roles2.stderr
index 81866fdf6f..a536e4b62c 100644
--- a/testsuite/tests/th/TH_Roles2.stderr
+++ b/testsuite/tests/th/TH_Roles2.stderr
@@ -2,19 +2,15 @@ TYPE CONSTRUCTORS
   data type T{2} :: forall k. k -> *
     roles nominal representational
 Dependent modules: []
-Dependent packages: [array-0.5.2.0, base-4.12.0.0, deepseq-1.4.4.0,
-                     ghc-boot-th-8.7, ghc-prim-0.6.1, integer-gmp-1.0.2.0,
+Dependent packages: [array-0.5.4.0, base-4.14.0.0, deepseq-1.4.4.0,
+                     ghc-boot-th-8.11.0.20200416, ghc-prim-0.6.1, integer-gmp-1.0.3.0,
                      pretty-1.1.3.6, template-haskell-2.16.0.0]
 
 ==================== Typechecker ====================
 TH_Roles2.$tcT
   = GHC.Types.TyCon
-      11651627537942629178##
-      11503899791410937231##
-      TH_Roles2.$trModule
-      (GHC.Types.TrNameS "T"#)
-      1
-      $krep
+      11651627537942629178## 11503899791410937231## TH_Roles2.$trModule
+      (GHC.Types.TrNameS "T"#) 1 $krep
 $krep [InlPrag=NOUSERINLINE[~]] = GHC.Types.KindRepVar 0
 $krep [InlPrag=NOUSERINLINE[~]]
   = GHC.Types.KindRepFun $krep GHC.Types.krep$*
@@ -22,3 +18,4 @@ TH_Roles2.$trModule
   = GHC.Types.Module
       (GHC.Types.TrNameS "main"#) (GHC.Types.TrNameS "TH_Roles2"#)
 
+