diff --git a/.appveyor.yml b/.appveyor.yml
index 6dbf9ef91e..7aa31411d8 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,7 +5,6 @@ install:
 branches:
   only:
   - dev
-  - feature/0.1.0
   - /^release\/.*$/
   - /^(.*\/)?ci-.*$/
 environment:
diff --git a/.travis.yml b/.travis.yml
index 69592e6a5a..5f90edbad7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,6 @@ osx_image: xcode8.2
 branches:
   only:
   - dev
-  - feature/0.1.0
   - /^release\/.*$/
   - /^(.*\/)?ci-.*$/
 before_install:
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/targets/RazorCompilation.targets b/src/Microsoft.AspNetCore.Blazor.Build/targets/RazorCompilation.targets
index 54992ac00a..8113f28477 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/targets/RazorCompilation.targets
+++ b/src/Microsoft.AspNetCore.Blazor.Build/targets/RazorCompilation.targets
@@ -24,7 +24,15 @@
     <!-- Deactivates the Razor SDK's build-time compilation. We do our own -->
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
 
-    <RazorDefaultConfiguration>Blazor-0.1</RazorDefaultConfiguration>
+    <!-- 
+      This version is used to build our RazorConfiguration, and is hardcoded into the tools in VS. If you change
+      This to a value that doesn't match VS, then the Blazor Razor experience won't work for those documents.
+    -->
+    <BlazorLanguageVersion>0.1</BlazorLanguageVersion>
+    <BlazorDefinitionConfiguration>Blazor-$(BlazorLanguageVersion)</BlazorDefinitionConfiguration>
+    <BlazorDeclarationConfiguration>BlazorDeclaration-$(BlazorLanguageVersion)</BlazorDeclarationConfiguration>
+    <RazorDefaultConfiguration>$(BlazorDefinitionConfiguration)</RazorDefaultConfiguration>
+    
   </PropertyGroup>
 
   <!-- Something quick for input/output tracking - the assumptions here should match what the CLI does -->
@@ -39,18 +47,18 @@
     <ProjectCapability Include="Blazor" />
     <ProjectCapability Include="DotNetCoreRazorConfiguration" />
     
-    <RazorConfiguration Include="Blazor-0.1">
-      <Extensions>Blazor-0.1;Blazor.AngleSharp-0.1;$(CustomRazorExtension)</Extensions>
+    <RazorConfiguration Include="$(BlazorDefinitionConfiguration)">
+      <Extensions>Blazor-$(BlazorLanguageVersion);Blazor.AngleSharp-$(BlazorLanguageVersion);$(CustomRazorExtension)</Extensions>
     </RazorConfiguration>
-    <RazorConfiguration Include="BlazorDeclaration-0.1">
-      <Extensions>Blazor-0.1;Blazor.AngleSharp-0.1;$(CustomRazorExtension)</Extensions>
+    <RazorConfiguration Include="$(BlazorDeclarationConfiguration)">
+      <Extensions>Blazor-$(BlazorLanguageVersion)Blazor.AngleSharp-$(BlazorLanguageVersion);$(CustomRazorExtension)</Extensions>
     </RazorConfiguration>
 
-    <RazorExtension Include="Blazor.AngleSharp-0.1">
+    <RazorExtension Include="Blazor.AngleSharp-$(BlazorLanguageVersion)">
       <AssemblyName>Microsoft.AspNetCore.Blazor.AngleSharp</AssemblyName>
       <AssemblyFilePath>$(_BlazorAngleSharpAssemblyPath)</AssemblyFilePath>
     </RazorExtension>
-    <RazorExtension Include="Blazor-0.1">
+    <RazorExtension Include="Blazor-$(BlazorLanguageVersion)">
       <AssemblyName>Microsoft.AspNetCore.Blazor.Razor.Extensions</AssemblyName>
       <AssemblyFilePath>$(_BlazorExtensionAssemblyPath)</AssemblyFilePath>
     </RazorExtension>
@@ -171,7 +179,7 @@
       <_BlazorGenerateDeclarationWithTargetPath Include="@(BlazorGenerateWithTargetPath)">
         <GeneratedOutput>%(GeneratedDeclaration)</GeneratedOutput>
       </_BlazorGenerateDeclarationWithTargetPath>
-      <_BlazorDeclarationConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', 'BlazorDeclaration-0.1'))" />
+      <_BlazorDeclarationConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', '$(BlazorDeclarationConfiguration)'))" />
     </ItemGroup>
 
     <MakeDir Directories="%(BlazorDeclaration.RelativeDir)" />
@@ -212,7 +220,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <_BlazorDeclarationConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', 'BlazorDeclaration-0.1'))" />
+      <_BlazorDeclarationConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', '$(BlazorDeclarationConfiguration)'))" />
     </ItemGroup>
 
     <!-- 
@@ -265,7 +273,7 @@
       <_BlazorGenerateDefinitionWithTargetPath Include="@(BlazorGenerateWithTargetPath)">
         <GeneratedOutput>%(GeneratedDefinition)</GeneratedOutput>
       </_BlazorGenerateDefinitionWithTargetPath>
-      <_BlazorDefinitionConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', 'Blazor-0.1'))" />
+      <_BlazorDefinitionConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', '$(BlazorDefinitionConfiguration)'))" />
     </ItemGroup>
 
     <MakeDir Directories="%(BlazorDefinition.RelativeDir)" />
diff --git a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/BlazorExtensionInitializer.cs b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/BlazorExtensionInitializer.cs
index d596f33446..0e859d1943 100644
--- a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/BlazorExtensionInitializer.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/BlazorExtensionInitializer.cs
@@ -17,6 +17,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor
 
         static BlazorExtensionInitializer()
         {
+            // The configuration names here need to match what we put in the MSBuild configuration
             DeclarationConfiguration = RazorConfiguration.Create(
                 RazorLanguageVersion.Version_2_1, // Cannot use experimental until 15.7p4
                 "BlazorDeclaration-0.1",
diff --git a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/BlazorMetadata.cs b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/BlazorMetadata.cs
index ae48701754..11899e3c9f 100644
--- a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/BlazorMetadata.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/BlazorMetadata.cs
@@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor
         {
             public static readonly string RuntimeName = "Blazor.None";
 
-            public readonly static string TagHelperKind = "Blazor.Bind-0.1";
+            public readonly static string TagHelperKind = "Blazor.Bind";
 
             public readonly static string FallbackKey = "Blazor.Bind.Fallback";
 
@@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor
 
             public static readonly string RuntimeName = "Blazor.IComponent";
 
-            public readonly static string TagHelperKind = "Blazor.Component-0.1";
+            public readonly static string TagHelperKind = "Blazor.Component";
         }
 
         public static class EventHandler
@@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor
 
             public static readonly string RuntimeName = "Blazor.None";
 
-            public readonly static string TagHelperKind = "Blazor.EventHandler-0.1";
+            public readonly static string TagHelperKind = "Blazor.EventHandler";
         }
     }
 }
diff --git a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ComponentDocumentClassifierPass.cs b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ComponentDocumentClassifierPass.cs
index 35151fcac9..85cc4774e5 100644
--- a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ComponentDocumentClassifierPass.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ComponentDocumentClassifierPass.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor
 {
     public class ComponentDocumentClassifierPass : DocumentClassifierPassBase, IRazorDocumentClassifierPass
     {
-        public static readonly string ComponentDocumentKind = "Blazor.Component-0.1";
+        public static readonly string ComponentDocumentKind = "Blazor.Component";
 
         private static readonly char[] PathSeparators = new char[] { '/', '\\' };
 
diff --git a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/Properties/AssemblyInfo.cs
index 2b56c392ae..83c97ef09b 100644
--- a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.Blazor.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 
+// These should match the configuration names specified by the Blazor MSBuild files.
 [assembly: ProvideRazorExtensionInitializer("Blazor-0.1", typeof(BlazorExtensionInitializer))]
 [assembly: ProvideRazorExtensionInitializer("BlazorDeclaration-0.1", typeof(BlazorExtensionInitializer))]
 
diff --git a/test/Microsoft.AspNetCore.Blazor.Razor.Extensions.Test/ComponentTagHelperDescriptorProviderTest.cs b/test/Microsoft.AspNetCore.Blazor.Razor.Extensions.Test/ComponentTagHelperDescriptorProviderTest.cs
index a415a2de4a..967f68789d 100644
--- a/test/Microsoft.AspNetCore.Blazor.Razor.Extensions.Test/ComponentTagHelperDescriptorProviderTest.cs
+++ b/test/Microsoft.AspNetCore.Blazor.Razor.Extensions.Test/ComponentTagHelperDescriptorProviderTest.cs
@@ -93,7 +93,7 @@ namespace Test
             // Invariants
             Assert.Empty(attribute.Diagnostics);
             Assert.False(attribute.HasErrors);
-            Assert.Equal("Blazor.Component-0.1", attribute.Kind);
+            Assert.Equal("Blazor.Component", attribute.Kind);
             Assert.False(attribute.IsDefaultKind());
 
             // Related to dictionaries/indexers, not supported currently, not sure if we ever will
diff --git a/tooling/Microsoft.VisualStudio.BlazorExtension/Templates.pkgdef b/tooling/Microsoft.VisualStudio.BlazorExtension/Templates.pkgdef
index 16742c8c06..82cbd7d9f0 100644
--- a/tooling/Microsoft.VisualStudio.BlazorExtension/Templates.pkgdef
+++ b/tooling/Microsoft.VisualStudio.BlazorExtension/Templates.pkgdef
@@ -1,2 +1,2 @@
-[$RootKey$\TemplateEngine\Templates\Blazor\0.1.0]
+[$RootKey$\TemplateEngine\Templates\Blazor\0.2.0]
 "InstalledPath"="$PackageFolder$\ProjectTemplates"
\ No newline at end of file
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/BlazorProjectEngineFactory.cs b/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/BlazorProjectEngineFactory.cs
index e9b51245ae..eb46f9dca1 100644
--- a/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/BlazorProjectEngineFactory.cs
+++ b/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/BlazorProjectEngineFactory.cs
@@ -9,6 +9,8 @@ using Microsoft.CodeAnalysis.Razor;
 
 namespace Microsoft.VisualStudio.LanguageServices.Blazor
 {
+    // This factory is wired up based on a match of the $(DefaultRazorConfiguration) property is MSBuild
+    // keep this in sync with the supported runtime/build version.
     [ExportCustomProjectEngineFactory("Blazor-0.1", SupportsSerialization = false)]
     internal class BlazorProjectEngineFactory : IProjectEngineFactory
     {