diff --git a/CHANGES.md b/CHANGES.md
index 39480c0..410a00e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2021.2] - 2021-06-20
+
+### Changed
+
+  - Change name to VSColorOutput64 to deal with Marketplace naming restrictions 
+
 ## [2021.1] - 2021-06-20
 
 ### Added
diff --git a/VSColorOutput/Properties/AssemblyInfo.cs b/VSColorOutput/Properties/AssemblyInfo.cs
index f628d7e..f320714 100644
--- a/VSColorOutput/Properties/AssemblyInfo.cs
+++ b/VSColorOutput/Properties/AssemblyInfo.cs
@@ -1,15 +1,15 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("VSColorOutput")]
+[assembly: AssemblyTitle("VSColorOutput64")]
 [assembly: AssemblyDescription("Color output for build and debug windows")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Mike Ward")]
-[assembly: AssemblyProduct("VSColorOutput")]
+[assembly: AssemblyProduct("VSColorOutput64")]
 [assembly: AssemblyCopyright("Copyright (c) Mike Ward")]
 [assembly: AssemblyTrademark("VSColorOutput is a trademark of Mike Ward")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2021.1")]
-[assembly: AssemblyFileVersion("2021.1")]
+[assembly: AssemblyVersion("2021.2")]
+[assembly: AssemblyFileVersion("2021.2")]
 [assembly: Guid("9D5A1B6F-D173-424E-B126-7A459F13DB7A")]
\ No newline at end of file
diff --git a/VSColorOutput/State/Settings.cs b/VSColorOutput/State/Settings.cs
index 59f8eb4..4adfe7c 100644
--- a/VSColorOutput/State/Settings.cs
+++ b/VSColorOutput/State/Settings.cs
@@ -89,7 +89,7 @@ public class Settings
         [DataMember(Order = 21)]
         public String TimeStampDifference { get; set; } = DefaultTimeStampFormat;
 
-        private static readonly string ProgramDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "VSColorOutput");
+        private static readonly string ProgramDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "VSColorOutput64");
 
         public static event EventHandler SettingsUpdated;
 
diff --git a/VSColorOutput/State/VsColorOutputOptionsDialog.cs b/VSColorOutput/State/VsColorOutputOptionsDialog.cs
index 2e7e56c..6115088 100644
--- a/VSColorOutput/State/VsColorOutputOptionsDialog.cs
+++ b/VSColorOutput/State/VsColorOutputOptionsDialog.cs
@@ -9,7 +9,7 @@ namespace VSColorOutput.State
     [Guid("BE905985-26BB-492B-9453-743E26F4E8BB")]
     public class VsColorOutputOptionsDialog : DialogPage
     {
-        public const string Category = "VSColorOutput";
+        public const string Category = "VSColorOutput64";
         public const string SubCategory = "General";
 
         private const string PatternsSubCategory = "Classifier Patterns";
diff --git a/VSColorOutput/VSColorOutput.csproj b/VSColorOutput/VSColorOutput.csproj
index 59982e1..c556ee0 100644
--- a/VSColorOutput/VSColorOutput.csproj
+++ b/VSColorOutput/VSColorOutput.csproj
@@ -14,7 +14,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>VSColorOutput</RootNamespace>
-    <AssemblyName>VSColorOutput</AssemblyName>
+    <AssemblyName>VSColorOutput64</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <UseCodebase>true</UseCodebase>
diff --git a/VSColorOutput/VsColorOutputPackage.cs b/VSColorOutput/VsColorOutputPackage.cs
index 57470c2..fcd6f8a 100644
--- a/VSColorOutput/VsColorOutputPackage.cs
+++ b/VSColorOutput/VsColorOutputPackage.cs
@@ -11,10 +11,10 @@ namespace VSColorOutput
     [Guid(VSColorOutputPackage.PackageGuidString)]
     [ProvideOptionPage(typeof(VsColorOutputOptionsDialog), VsColorOutputOptionsDialog.Category, VsColorOutputOptionsDialog.SubCategory, 1000, 1001, true)]
     [ProvideProfile(typeof(VsColorOutputOptionsDialog), VsColorOutputOptionsDialog.Category, VsColorOutputOptionsDialog.SubCategory, 1000, 1001, true)]
-    [InstalledProductRegistration("VSColorOutput", "Color output for build and debug windows - https://mike-ward.net/vscoloroutput", "2021.1")]
+    [InstalledProductRegistration("VSColorOutput64", "Color output for build and debug windows - https://mike-ward.net/vscoloroutput", "2021.2")]
     public sealed class VSColorOutputPackage : AsyncPackage
     {
-        public const string PackageGuidString = "CD56B219-38CB-482A-9B2D-7582DF4AAF1E";
+        public const string PackageGuidString = "65dd734b-180a-4c67-b245-56de889637e1";
 
         protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
diff --git a/VSColorOutput/source.extension.vsixmanifest b/VSColorOutput/source.extension.vsixmanifest
index 79d9d6b..7dbe05c 100644
--- a/VSColorOutput/source.extension.vsixmanifest
+++ b/VSColorOutput/source.extension.vsixmanifest
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="CD56B219-38CB-482A-9B2D-7582DF4AAF1E" Version="2021.1" Language="en-US" Publisher="Mike Ward" />
-    <DisplayName>VSColorOutput</DisplayName>
+    <Identity Id="CD56B219-38CB-482A-9B2D-7582DF4AAF1E" Version="2021.2" Language="en-US" Publisher="Mike Ward" />
+    <DisplayName>VSColorOutput64</DisplayName>
     <Description xml:space="preserve">Color output for build and debug windows</Description>
     <MoreInfo>https://mike-ward.net/vscoloroutput</MoreInfo>
     <License>Assets\License.txt</License>