6 files changed, 13 insertions, 14 deletions
diff --git a/ghc/compiler/rename/Rename.lhs b/ghc/compiler/rename/Rename.lhs
index 76575cdb6c..25b86e747b 100644
--- a/ghc/compiler/rename/Rename.lhs
+++ b/ghc/compiler/rename/Rename.lhs
@@ -43,9 +43,9 @@ import Module           ( Module, ModuleName, WhereFrom(..),
 			  moduleEnvElts
 			)
 import Name		( Name, nameIsLocalOrFrom, nameModule )
-import Name		( mkNameEnv, nameEnvElts, extendNameEnv )
-import RdrName		( foldRdrEnv, isQual )
+import NameEnv
 import NameSet
+import RdrName		( foldRdrEnv, isQual )
 import PrelNames	( SyntaxMap, pRELUDE_Name )
 import ErrUtils		( dumpIfSet, dumpIfSet_dyn, showPass, 
 			  printErrorsAndWarnings, errorsFound )
diff --git a/ghc/compiler/rename/RnEnv.lhs b/ghc/compiler/rename/RnEnv.lhs
index 5884c3480a..c8090f9ccf 100644
--- a/ghc/compiler/rename/RnEnv.lhs
+++ b/ghc/compiler/rename/RnEnv.lhs
@@ -29,9 +29,9 @@ import Name		( Name,
 			  getSrcLoc, 
 			  mkLocalName, mkGlobalName,
 			  mkIPName, nameOccName, nameModule_maybe,
-			  setNameModuleAndLoc, mkNameEnv
+			  setNameModuleAndLoc
 			)
-import Name		( extendNameEnv_C, plusNameEnv_C, nameEnvElts )
+import NameEnv
 import NameSet
 import OccName		( OccName, occNameUserString, occNameFlavour )
 import Module		( ModuleName, moduleName, mkVanillaModule, 
diff --git a/ghc/compiler/rename/RnHiFiles.lhs b/ghc/compiler/rename/RnHiFiles.lhs
index 690795bced..4477e89df4 100644
--- a/ghc/compiler/rename/RnHiFiles.lhs
+++ b/ghc/compiler/rename/RnHiFiles.lhs
@@ -42,7 +42,7 @@ import ParseIface	( parseIface )
 import Name		( Name {-instance NamedThing-}, 
 			  nameModule, isLocalName, nameIsLocalOrFrom
 			 )
-import Name		( mkNameEnv, extendNameEnv )
+import NameEnv
 import Module		( Module, 
 			  moduleName, isHomeModule,
 			  ModuleName, WhereFrom(..),
diff --git a/ghc/compiler/rename/RnIfaces.lhs b/ghc/compiler/rename/RnIfaces.lhs
index e72c059f1d..bb279370e2 100644
--- a/ghc/compiler/rename/RnIfaces.lhs
+++ b/ghc/compiler/rename/RnIfaces.lhs
@@ -40,7 +40,8 @@ import TyCon		( isSynTyCon, getSynTyConDefn )
 import Name		( Name {-instance NamedThing-}, nameOccName,
 			  nameModule, isLocalName, NamedThing(..)
 			 )
-import Name 		( elemNameEnv, delFromNameEnv )
+import NameEnv 		( elemNameEnv, delFromNameEnv, lookupNameEnv )
+import NameSet
 import Module		( Module, ModuleEnv, 
 			  moduleName, isHomeModule,
 			  ModuleName, WhereFrom(..),
@@ -48,7 +49,6 @@ import Module		( Module, ModuleEnv,
 			  extendModuleEnv_C, foldModuleEnv, lookupModuleEnv,
 			  elemModuleSet, extendModuleSet
 			)
-import NameSet
 import PrelInfo		( wiredInThingEnv )
 import Maybes		( orElse )
 import FiniteMap
diff --git a/ghc/compiler/rename/RnMonad.lhs b/ghc/compiler/rename/RnMonad.lhs
index 9f3bb3ec71..22badd8ffe 100644
--- a/ghc/compiler/rename/RnMonad.lhs
+++ b/ghc/compiler/rename/RnMonad.lhs
@@ -58,7 +58,7 @@ import Name		( Name, OccName, NamedThing(..),
 			  nameOccName,
 			  decode, mkLocalName, mkKnownKeyGlobal
 			)
-import Name		( NameEnv, lookupNameEnv, emptyNameEnv, unitNameEnv, extendNameEnvList )
+import NameEnv		( NameEnv, lookupNameEnv, emptyNameEnv, unitNameEnv, extendNameEnvList )
 import Module		( Module, ModuleName, ModuleSet, emptyModuleSet )
 import NameSet		
 import CmdLineOpts	( DynFlags, DynFlag(..), dopt )
diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs
index df1925d945..51918dea1e 100644
--- a/ghc/compiler/rename/RnNames.lhs
+++ b/ghc/compiler/rename/RnNames.lhs
@@ -26,10 +26,10 @@ import RnMonad
 
 import FiniteMap
 import PrelNames	( pRELUDE_Name, mAIN_Name, main_RDR_Unqual, isUnboundName )
-import UniqFM		( lookupUFM )
 import Module		( ModuleName, moduleName, WhereFrom(..) )
+import Name		( Name, nameSrcLoc, nameOccName )
 import NameSet
-import Name		( Name, nameSrcLoc, nameOccName,  nameEnvElts )
+import NameEnv
 import HscTypes		( Provenance(..), ImportReason(..), GlobalRdrEnv,
 			  GenAvailInfo(..), AvailInfo, Avails, AvailEnv, 
 			  Deprecations(..), ModIface(..)
@@ -39,7 +39,6 @@ import OccName		( setOccNameSpace, dataName )
 import NameSet		( elemNameSet, emptyNameSet )
 import Outputable
 import Maybes		( maybeToBool, catMaybes, mapMaybe )
-import UniqFM		( emptyUFM, listToUFM )
 import ListSetOps	( removeDups )
 import Util		( sortLt )
 import List		( partition )
@@ -370,7 +369,7 @@ filterImports mod from (Just (want_hiding, import_items)) total_avails
 
 \begin{code}
 mkEmptyExportAvails :: ModuleName -> ExportAvails
-mkEmptyExportAvails mod_name = (unitFM mod_name [], emptyUFM)
+mkEmptyExportAvails mod_name = (unitFM mod_name [], emptyNameEnv)
 
 mkExportAvails :: ModuleName -> Bool -> GlobalRdrEnv -> [AvailInfo] -> ExportAvails
 mkExportAvails mod_name unqual_imp gbl_env avails
@@ -396,7 +395,7 @@ mkExportAvails mod_name unqual_imp gbl_env avails
 
     unqual_in_scope n = unQualInScope gbl_env n
 
-    entity_avail_env = listToUFM [ (name,avail) | avail <- avails, 
+    entity_avail_env = mkNameEnv [ (name,avail) | avail <- avails, 
 			  	   		  name  <- availNames avail]
 
 plusExportAvails ::  ExportAvails ->  ExportAvails ->  ExportAvails
@@ -491,7 +490,7 @@ exportsFromAvail this_mod (Just export_items)
 	= lookupSrcName global_name_env (ieName ie)	`thenRn` \ name -> 
 
 		-- See what's available in the current environment
-	  case lookupUFM entity_avail_env name of {
+	  case lookupNameEnv entity_avail_env name of {
 	    Nothing -> 	-- Presumably this happens because lookupSrcName didn't find
 			-- the name and returned an unboundName, which won't be in
 			-- the entity_avail_env, of course