5 files changed, 12 insertions, 12 deletions
diff --git a/compiler/prelude/PrelInfo.hs b/compiler/prelude/PrelInfo.hs
index 204b7ce9f9..7d2aa3a163 100644
--- a/compiler/prelude/PrelInfo.hs
+++ b/compiler/prelude/PrelInfo.hs
@@ -100,7 +100,7 @@ Note [About wired-in things]
   checker sees if the Name is wired in before looking up the name in
   the type environment.
 
-* MkIface prunes out wired-in things before putting them in an interface file.
+* GHC.Iface.Utils prunes out wired-in things before putting them in an interface file.
   So interface files never contain wired-in things.
 -}
 
diff --git a/compiler/prelude/PrelNames.hs b/compiler/prelude/PrelNames.hs
index 3bcc8670ff..8c0d25de46 100644
--- a/compiler/prelude/PrelNames.hs
+++ b/compiler/prelude/PrelNames.hs
@@ -64,8 +64,8 @@ This is accomplished through a combination of mechanisms:
   2. The knownKeyNames (which consist of the basicKnownKeyNames from
      the module, and those names reachable via the wired-in stuff from
      TysWiredIn) are used to initialise the "OrigNameCache" in
-     IfaceEnv.  This initialization ensures that when the type checker
-     or renamer (both of which use IfaceEnv) look up an original name
+     GHC.Iface.Env.  This initialization ensures that when the type checker
+     or renamer (both of which use GHC.Iface.Env) look up an original name
      (i.e. a pair of a Module and an OccName) for a known-key name
      they get the correct Unique.
 
@@ -95,17 +95,17 @@ things,
      looked up in the orig-name cache)
 
   b) The known infinite families of names are specially serialised by
-     BinIface.putName, with that special treatment detected when we read back to
-     ensure that we get back to the correct uniques. See Note [Symbol table
-     representation of names] in BinIface and Note [How tuples work] in
-     TysWiredIn.
+     GHC.Iface.Binary.putName, with that special treatment detected when we read
+     back to ensure that we get back to the correct uniques. See Note [Symbol
+     table representation of names] in GHC.Iface.Binary and Note [How tuples
+     work] in TysWiredIn.
 
 Most of the infinite families cannot occur in source code, so mechanisms (a) and (b)
 suffice to ensure that they always have the right Unique. In particular,
 implicit param TyCon names, constraint tuples and Any TyCons cannot be mentioned
 by the user. For those things that *can* appear in source programs,
 
-  c) IfaceEnv.lookupOrigNameCache uses isBuiltInOcc_maybe to map built-in syntax
+  c) GHC.Iface.Env.lookupOrigNameCache uses isBuiltInOcc_maybe to map built-in syntax
      directly onto the corresponding name, rather than trying to find it in the
      original-name cache.
 
diff --git a/compiler/prelude/PrimOp.hs b/compiler/prelude/PrimOp.hs
index 55a8bf339f..81220140bb 100644
--- a/compiler/prelude/PrimOp.hs
+++ b/compiler/prelude/PrimOp.hs
@@ -581,7 +581,7 @@ function definition. This caused quite some trouble as we would be forced to
 eta expand unsaturated primop applications very late in the Core pipeline. Not
 only would this produce unnecessary thunks, but it would also result in nasty
 inconsistencies in CAFfy-ness determinations (see #16846 and
-Note [CAFfyness inconsistencies due to late eta expansion] in TidyPgm).
+Note [CAFfyness inconsistencies due to late eta expansion] in GHC.Iface.Tidy).
 
 However, it was quite unnecessary for hasNoBinding to claim this; primops in
 fact *do* have curried definitions which are found in GHC.PrimopWrappers, which
diff --git a/compiler/prelude/TysWiredIn.hs b/compiler/prelude/TysWiredIn.hs
index f4db7572c0..eb9c04fdc9 100644
--- a/compiler/prelude/TysWiredIn.hs
+++ b/compiler/prelude/TysWiredIn.hs
@@ -685,7 +685,7 @@ Note [How tuples work]  See also Note [Known-key names] in PrelNames
   E.g. tupleTyCon has a Boxity argument
 
 * When looking up an OccName in the original-name cache
-  (IfaceEnv.lookupOrigNameCache), we spot the tuple OccName to make sure
+  (GHC.Iface.Env.lookupOrigNameCache), we spot the tuple OccName to make sure
   we get the right wired-in name.  This guy can't tell the difference
   between BoxedTuple and ConstraintTuple (same OccName!), so tuples
   are not serialised into interface files using OccNames at all.
diff --git a/compiler/prelude/primops.txt.pp b/compiler/prelude/primops.txt.pp
index f22a94614c..4180152460 100644
--- a/compiler/prelude/primops.txt.pp
+++ b/compiler/prelude/primops.txt.pp
@@ -204,7 +204,7 @@ primtype (->) a b
   }
   with fixity = infixr -1
          -- This fixity is only the one picked up by Haddock. If you
-         -- change this, do update 'ghcPrimIface' in 'LoadIface.hs'.
+         -- change this, do update 'ghcPrimIface' in 'GHC.Iface.Load'.
 
 ------------------------------------------------------------------------
 section "Char#"
@@ -3367,7 +3367,7 @@ pseudoop   "seq"
      you must use the function {\tt pseq} from the "parallel" package. }
    with fixity = infixr 0
          -- This fixity is only the one picked up by Haddock. If you
-         -- change this, do update 'ghcPrimIface' in 'LoadIface.hs'.
+         -- change this, do update 'ghcPrimIface' in 'GHC.Iface.Load'.
 
 pseudoop   "unsafeCoerce#"
    a -> b