diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/InjectChunkVisitor.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/InjectChunkVisitor.cs
index 95116832cd..1304e76823 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/InjectChunkVisitor.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/InjectChunkVisitor.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Mvc.Razor
         private readonly string _activateAttribute;
 
         public InjectChunkVisitor([NotNull] CSharpCodeWriter writer,
-                                  [NotNull] CodeGeneratorContext context,
+                                  [NotNull] CodeBuilderContext context,
                                   [NotNull] string activateAttributeName)
             : base(writer, context)
         {
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/ModelChunkVisitor.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/ModelChunkVisitor.cs
index 78eb748e5c..942f1003c5 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/ModelChunkVisitor.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/ModelChunkVisitor.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Mvc.Razor
     public class ModelChunkVisitor : MvcCSharpCodeVisitor
     {
         public ModelChunkVisitor([NotNull] CSharpCodeWriter writer,
-                                 [NotNull] CodeGeneratorContext context)
+                                 [NotNull] CodeBuilderContext context)
             : base(writer, context)
         {
         }
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcCSharpChunkVisitor.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcCSharpChunkVisitor.cs
index a61a9c999f..ac0cfd8bf2 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcCSharpChunkVisitor.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcCSharpChunkVisitor.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Mvc.Razor
     public abstract class MvcCSharpChunkVisitor : CodeVisitor<CSharpCodeWriter>
     {
         public MvcCSharpChunkVisitor([NotNull] CSharpCodeWriter writer,
-                                     [NotNull] CodeGeneratorContext context)
+                                     [NotNull] CodeBuilderContext context)
             : base(writer, context)
         {
         }
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcCSharpCodeBuilder.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcCSharpCodeBuilder.cs
index 87b6a6f90b..ada4b74ac6 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcCSharpCodeBuilder.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcCSharpCodeBuilder.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Mvc.Razor
         private readonly string _defaultModel;
         private readonly string _activateAttribute;
 
-        public MvcCSharpCodeBuilder([NotNull] CodeGeneratorContext context,
+        public MvcCSharpCodeBuilder([NotNull] CodeBuilderContext context,
                                     [NotNull] string defaultModel,
                                     [NotNull] string activateAttribute)
             : base(context)
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcCSharpCodeVistor.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcCSharpCodeVistor.cs
index 8ec35bc986..a2e0436c8b 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcCSharpCodeVistor.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcCSharpCodeVistor.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Mvc.Razor
     public abstract class MvcCSharpCodeVisitor : MvcCSharpChunkVisitor
     {
         public MvcCSharpCodeVisitor([NotNull] CSharpCodeWriter writer,
-                                    [NotNull] CodeGeneratorContext context)
+                                    [NotNull] CodeBuilderContext context)
             : base(writer, context)
         {
         }
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs
index 598cf8cfd7..7f9e816876 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs
@@ -142,7 +142,7 @@ namespace Microsoft.AspNet.Mvc.Razor
 
         /// <inheritdoc />
         public override CodeBuilder DecorateCodeBuilder([NotNull] CodeBuilder incomingBuilder,
-                                                        [NotNull] CodeGeneratorContext context)
+                                                        [NotNull] CodeBuilderContext context)
         {
             UpdateCodeBuilder(context);
             return new MvcCSharpCodeBuilder(context, DefaultModel, ActivateAttribute);
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InjectChunkVisitorTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InjectChunkVisitorTest.cs
index 65b9aaf818..c5e9c2322a 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InjectChunkVisitorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InjectChunkVisitorTest.cs
@@ -142,13 +142,14 @@ MyType1
             Assert.Equal(expected, code);
         }
 
-        private static CodeGeneratorContext CreateContext()
+        private static CodeBuilderContext CreateContext()
         {
-            return CodeGeneratorContext.Create(new MvcRazorHost(new TestFileSystem()),
-                                              "MyClass",
-                                              "MyNamespace",
-                                              string.Empty,
-                                              shouldGenerateLinePragmas: true);
+            return new CodeBuilderContext(
+                new CodeGeneratorContext(new MvcRazorHost(new TestFileSystem()),
+                                         "MyClass",
+                                         "MyNamespace",
+                                         string.Empty,
+                                         shouldGenerateLinePragmas: true));
         }
     }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelChunkVisitorTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelChunkVisitorTest.cs
index f52f9e7727..a5dbf0cf28 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelChunkVisitorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelChunkVisitorTest.cs
@@ -98,13 +98,14 @@ Environment.NewLine +
             Assert.Equal(expected, code);
         }
 
-        private static CodeGeneratorContext CreateContext()
+        private static CodeBuilderContext CreateContext()
         {
-            return CodeGeneratorContext.Create(new MvcRazorHost(new TestFileSystem()),
-                                              "MyClass",
-                                              "MyNamespace",
-                                              string.Empty,
-                                              shouldGenerateLinePragmas: true);
+            return new CodeBuilderContext(
+                new CodeGeneratorContext(new MvcRazorHost(new TestFileSystem()),
+                                         "MyClass",
+                                         "MyNamespace",
+                                         string.Empty,
+                                         shouldGenerateLinePragmas: true));
         }
     }
 }
\ No newline at end of file