diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index cadf53dc27d..2e476c7ec47 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -3605,7 +3605,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
                   ILScopeRef = ilScopeRef;
                   ILAssemblyRefs = ilAssemblyRefs }
             tcImports.RegisterDll(dllinfo);
-            let ccuData = 
+            let ccuData : CcuData = 
               { IsFSharp=false;
                 UsesFSharp20PlusQuotations=false;
                 InvalidateEvent=(new Event<_>()).Publish
diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi
index 96b69303c74..a522c743ef1 100644
--- a/src/fsharp/TastOps.fsi
+++ b/src/fsharp/TastOps.fsi
@@ -1212,13 +1212,13 @@ val TryFindFSharpInt32Attribute    : TcGlobals -> BuiltinAttribInfo -> Attribs -
 /// Try to find a specific attribute on a type definition, where the attribute accepts a string argument.
 ///
 /// This is used to detect the 'DefaultMemberAttribute' and 'ConditionalAttribute' attributes (on type definitions)
-val TryFindTyconRefStringAttribute : TcGlobals -> range -> Env.BuiltinAttribInfo -> TyconRef -> string option
+val TryFindTyconRefStringAttribute : TcGlobals -> range -> BuiltinAttribInfo -> TyconRef -> string option
 
 /// Try to find a specific attribute on a type definition, where the attribute accepts a bool argument.
-val TryFindTyconRefBoolAttribute : TcGlobals -> range -> Env.BuiltinAttribInfo -> TyconRef -> bool option
+val TryFindTyconRefBoolAttribute : TcGlobals -> range -> BuiltinAttribInfo -> TyconRef -> bool option
 
 /// Try to find a specific attribute on a type definition
-val TyconRefHasAttribute : TcGlobals -> range -> Env.BuiltinAttribInfo -> TyconRef -> bool
+val TyconRefHasAttribute : TcGlobals -> range -> BuiltinAttribInfo -> TyconRef -> bool
 
 /// Try to find the AttributeUsage attribute, looking for the value of the AllowMultiple named parameter
 val TryFindAttributeUsageAttribute : TcGlobals -> range -> TyconRef -> bool option
diff --git a/src/fsharp/TypeRelations.fs b/src/fsharp/TypeRelations.fs
index d78b015f2ae..ca5e5274d3c 100644
--- a/src/fsharp/TypeRelations.fs
+++ b/src/fsharp/TypeRelations.fs
@@ -25,7 +25,7 @@ open Microsoft.FSharp.Compiler.Lib
 open Microsoft.FSharp.Compiler.Infos
 open Microsoft.FSharp.Compiler.PrettyNaming
 open Microsoft.FSharp.Compiler.Infos.AccessibilityLogic
-open Microsoft.FSharp.Compiler.Nameres
+open Microsoft.FSharp.Compiler.NameResolution
 
 #if EXTENSIONTYPING
 open Microsoft.FSharp.Compiler.ExtensionTyping
@@ -1649,7 +1649,7 @@ let MakeCalledArgs amap m (minfo:MethInfo) minst =
 /// and returns a CalledMeth object for further analysis.
 type CalledMeth<'T>
       (infoReader:InfoReader,
-       nameEnv: Microsoft.FSharp.Compiler.Nameres.NameResolutionEnv option,
+       nameEnv: NameResolutionEnv option,
        isCheckingAttributeCall, 
        freshenMethInfo,// a function to help generate fresh type variables the property setters methods in generic classes 
        m, 
diff --git a/src/fsharp/autobox.fs b/src/fsharp/autobox.fs
index d665133dd15..f576b61e5a8 100644
--- a/src/fsharp/autobox.fs
+++ b/src/fsharp/autobox.fs
@@ -10,8 +10,8 @@ open Microsoft.FSharp.Compiler.ErrorLogger
 open Microsoft.FSharp.Compiler.Tast
 open Microsoft.FSharp.Compiler.Tastops
 open Microsoft.FSharp.Compiler.Lib
-open Microsoft.FSharp.Compiler.Env
-open Microsoft.FSharp.Compiler.Typrelns
+open Microsoft.FSharp.Compiler.TcGlobals
+open Microsoft.FSharp.Compiler.TypeRelations
 
 //----------------------------------------------------------------------------
 // Decide the set of mutable locals to promote to heap-allocated reference cells
diff --git a/src/fsharp/fsc.fs b/src/fsharp/fsc.fs
index 8f35d50ec35..01deaab0a22 100644
--- a/src/fsharp/fsc.fs
+++ b/src/fsharp/fsc.fs
@@ -495,7 +495,7 @@ let ProcessCommandLineArgsAndImportAssemblies
 
 module InterfaceFileWriter =
 
-    let BuildInitialDisplayEnvForDocGeneration tcGlobals = 
+    let BuildInitialDisplayEnvForSigFileGeneration tcGlobals = 
         let denv = DisplayEnv.Empty tcGlobals
         let denv = 
             { denv with 
diff --git a/src/fsharp/fsi/fsi.fs b/src/fsharp/fsi/fsi.fs
index c4a9dd766f4..9a9b7e3477a 100644
--- a/src/fsharp/fsi/fsi.fs
+++ b/src/fsharp/fsi/fsi.fs
@@ -229,7 +229,7 @@ type internal FsiValuePrinter(ilGlobals, generateDebugInfo, resolvePath, outWrit
           Layout.wordL ""
             
     /// Display the signature of an F# value declaration, along with its actual value.
-    member valuePrinter.InvokeDeclLayout (emEnv, ilxGenerator: IlxGen.IlxAssemblyGenerator, v:Val) =
+    member valuePrinter.InvokeDeclLayout (emEnv, ilxGenerator: IlxAssemblyGenerator, v:Val) =
         // Implemented via a lookup from v to a concrete (System.Object,System.Type).
         // This (obj,objTy) pair can then be fed to the fsi value printer.
         // Note: The value may be (null:Object).