diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcCSharpRazorCodeParserTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcCSharpRazorCodeParserTest.cs
index be52271698..9c1b903fce 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcCSharpRazorCodeParserTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcCSharpRazorCodeParserTest.cs
@@ -45,7 +45,7 @@ namespace Microsoft.AspNet.Mvc.Razor
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("   Foo")
-                    .As(new SetBaseTypeCodeGenerator("RazorView<Foo>"))
+                    .As(new ModelCodeGenerator("RazorView", "Foo"))
             };
 
             // Act
@@ -57,11 +57,11 @@ namespace Microsoft.AspNet.Mvc.Razor
         }
 
         [Theory]
-        [InlineData("Foo?", "RazorView<Foo?>")]
-        [InlineData("Foo[[]][]", "RazorView<Foo[[]][]>")]
-        [InlineData("$rootnamespace$.MyModel", "RazorView<$rootnamespace$.MyModel>")]
+        [InlineData("Foo?", "Foo?")]
+        [InlineData("Foo[[]][]", "Foo[[]][]")]
+        [InlineData("$rootnamespace$.MyModel", "$rootnamespace$.MyModel")]
         public void ParseModelKeyword_InfersBaseType_FromModelName(string modelName,
-                                                                   string expectedBaseType)
+                                                                   string expectedModel)
         {
             // Arrange
             var documentContent = "@model " + modelName + Environment.NewLine + "Bar";
@@ -75,7 +75,7 @@ namespace Microsoft.AspNet.Mvc.Razor
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code(modelName + "\r\n")
-                    .As(new SetBaseTypeCodeGenerator(expectedBaseType)),
+                    .As(new ModelCodeGenerator("RazorView", expectedModel)),
                 factory.Markup("Bar")
                     .With(new MarkupCodeGenerator())
             };
@@ -106,7 +106,7 @@ namespace Microsoft.AspNet.Mvc.Razor
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("  ")
-                    .As(new SetBaseTypeCodeGenerator("RazorView")),
+                    .As(new ModelCodeGenerator("RazorView", string.Empty)),
             };
             var expectedErrors = new[]
             {
@@ -135,13 +135,13 @@ namespace Microsoft.AspNet.Mvc.Razor
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("Foo\r\n")
-                    .As(new SetBaseTypeCodeGenerator("RazorView<Foo>")),
+                    .As(new ModelCodeGenerator("RazorView", "Foo")),
                 factory.CodeTransition(SyntaxConstants.TransitionString)
                     .Accepts(AcceptedCharacters.None),
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("Bar")
-                    .As(new SetBaseTypeCodeGenerator("RazorView<Bar>"))
+                    .As(new ModelCodeGenerator("RazorView", "Bar"))
             };
 
             var expectedErrors = new[]
@@ -176,7 +176,7 @@ namespace Microsoft.AspNet.Mvc.Razor
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("Foo\r\n")
-                    .As(new SetBaseTypeCodeGenerator("RazorView<Foo>")),
+                    .As(new ModelCodeGenerator("RazorView", "Foo")),
                 factory.CodeTransition(SyntaxConstants.TransitionString)
                     .Accepts(AcceptedCharacters.None),
                 factory.MetaCode("inherits ")
@@ -223,7 +223,7 @@ namespace Microsoft.AspNet.Mvc.Razor
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("Foo")
-                    .As(new SetBaseTypeCodeGenerator("RazorView<Foo>"))
+                    .As(new ModelCodeGenerator("RazorView", "Foo"))
             };
 
             var expectedErrors = new[]
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/MvcRazorCodeParserTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/MvcRazorCodeParserTest.cs
index 51326200c2..825a5ea300 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/MvcRazorCodeParserTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/MvcRazorCodeParserTest.cs
@@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Host.Test
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("   Foo")
-                    .As(new SetBaseTypeCodeGenerator(DefaultBaseType + "<Foo>"))
+                    .As(new ModelCodeGenerator(DefaultBaseType, "Foo"))
             };
             Assert.Equal(expectedSpans, spans.ToArray());
         }
@@ -64,7 +64,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Host.Test
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("Foo?\r\n")
-                    .As(new SetBaseTypeCodeGenerator(DefaultBaseType + "<Foo?>")),
+                    .As(new ModelCodeGenerator(DefaultBaseType, "Foo?")),
                 factory.Markup("Bar")
                     .With(new MarkupCodeGenerator())
             };
@@ -88,7 +88,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Host.Test
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("Foo[[]][]\r\n")
-                    .As(new SetBaseTypeCodeGenerator(DefaultBaseType + "<Foo[[]][]>")),
+                    .As(new ModelCodeGenerator(DefaultBaseType, "Foo[[]][]")),
                 factory.Markup("Bar")
                     .With(new MarkupCodeGenerator())
             };
@@ -112,7 +112,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Host.Test
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("$rootnamespace$.MyModel")
-                    .As(new SetBaseTypeCodeGenerator(DefaultBaseType + "<$rootnamespace$.MyModel>"))
+                    .As(new ModelCodeGenerator(DefaultBaseType, "$rootnamespace$.MyModel"))
             };
             Assert.Equal(expectedSpans, spans.ToArray());
         }
@@ -135,7 +135,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Host.Test
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("  ")
-                    .As(new SetBaseTypeCodeGenerator(DefaultBaseType)),
+                    .As(new ModelCodeGenerator(DefaultBaseType, string.Empty)),
             };
             var expectedErrors = new[]
             {
@@ -165,13 +165,13 @@ namespace Microsoft.AspNet.Mvc.Razor.Host.Test
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("Foo\r\n")
-                    .As(new SetBaseTypeCodeGenerator(DefaultBaseType + "<Foo>")),
+                    .As(new ModelCodeGenerator(DefaultBaseType, "Foo")),
                 factory.CodeTransition(SyntaxConstants.TransitionString)
                     .Accepts(AcceptedCharacters.None),
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("Bar")
-                    .As(new SetBaseTypeCodeGenerator(DefaultBaseType + "<Bar>"))
+                    .As(new ModelCodeGenerator(DefaultBaseType, "Bar"))
             };
 
             var expectedErrors = new[]
@@ -203,7 +203,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Host.Test
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("Foo\r\n")
-                    .As(new SetBaseTypeCodeGenerator(DefaultBaseType + "<Foo>")),
+                    .As(new ModelCodeGenerator(DefaultBaseType, "Foo")),
                 factory.CodeTransition(SyntaxConstants.TransitionString)
                     .Accepts(AcceptedCharacters.None),
                 factory.MetaCode("inherits ")
@@ -247,7 +247,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Host.Test
                 factory.MetaCode("model ")
                     .Accepts(AcceptedCharacters.None),
                 factory.Code("Foo")
-                    .As(new SetBaseTypeCodeGenerator(DefaultBaseType + "<Foo>"))
+                    .As(new ModelCodeGenerator(DefaultBaseType, "Foo"))
             };
 
             var expectedErrors = new[]