Set up legacy release2.10

Change-Id: I368564fc3263753da944c000f93340e9ac1d2f1d
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

30 files changed, 124 insertions, 146 deletions

diff --git a/QtVsTools.Package/Editors/Editor.QtDesigner.cs b/QtVsTools.Package/Editors/Editor.QtDesigner.cs
index b6cee8a6..af707e6b 100644
--- a/QtVsTools.Package/Editors/Editor.QtDesigner.cs
+++ b/QtVsTools.Package/Editors/Editor.QtDesigner.cs
@@ -90,6 +90,6 @@ namespace QtVsTools.Editors
             });
         }
 
-        protected override bool Detached => QtVsToolsPackage.Instance.Options.DesignerDetached;
+        protected override bool Detached => QtVsToolsLegacyPackage.Instance.Options.DesignerDetached;
     }
 }
diff --git a/QtVsTools.Package/Editors/Editor.QtLinguist.cs b/QtVsTools.Package/Editors/Editor.QtLinguist.cs
index bd793d2c..6958e6b6 100644
--- a/QtVsTools.Package/Editors/Editor.QtLinguist.cs
+++ b/QtVsTools.Package/Editors/Editor.QtLinguist.cs
@@ -51,6 +51,6 @@ namespace QtVsTools.Editors
             return Title;
         }
 
-        protected override bool Detached => QtVsToolsPackage.Instance.Options.LinguistDetached;
+        protected override bool Detached => QtVsToolsLegacyPackage.Instance.Options.LinguistDetached;
     }
 }
diff --git a/QtVsTools.Package/Editors/Editor.QtResourceEditor.cs b/QtVsTools.Package/Editors/Editor.QtResourceEditor.cs
index 115d51c8..2d8c7699 100644
--- a/QtVsTools.Package/Editors/Editor.QtResourceEditor.cs
+++ b/QtVsTools.Package/Editors/Editor.QtResourceEditor.cs
@@ -45,13 +45,13 @@ namespace QtVsTools.Editors
         public override string ExecutableName => "QrcEditor.exe";
 
         protected override string GetToolsPath() =>
-            QtVsToolsPackage.Instance?.PkgInstallPath;
+            QtVsToolsLegacyPackage.Instance?.PkgInstallPath;
 
         public override Func<string, bool> WindowFilter =>
             caption => caption.StartsWith(Title);
 
         protected override string GetTitle(Process editorProcess) => Title;
 
-        protected override bool Detached => QtVsToolsPackage.Instance.Options.ResourceEditorDetached;
+        protected override bool Detached => QtVsToolsLegacyPackage.Instance.Options.ResourceEditorDetached;
     }
 }
diff --git a/QtVsTools.Package/Legacy/FormChangeQtVersion.cs b/QtVsTools.Package/Legacy/FormChangeQtVersion.cs
index a01aa99a..cddffb82 100644
--- a/QtVsTools.Package/Legacy/FormChangeQtVersion.cs
+++ b/QtVsTools.Package/Legacy/FormChangeQtVersion.cs
@@ -79,14 +79,14 @@ namespace QtVsTools.Legacy
             lbQtVersions.Items.Add("$(DefaultQtVersion)");
             if (change == ChangeFor.Solution) {
                 var qtVer = Legacy.QtVersionManager
-                    .GetSolutionQtVersion(QtVsToolsPackage.Instance.Dte.Solution);
+                    .GetSolutionQtVersion(QtVsToolsLegacyPackage.Instance.Dte.Solution);
                 if (qtVer == null)
                     qtVer = vm.GetDefaultVersion();
                 if (qtVer != null)
                     lbQtVersions.SelectedItem = qtVer;
                 Text = "Set Solution's Qt Version";
             } else {
-                var pro = Core.HelperFunctions.GetSelectedProject(QtVsToolsPackage.Instance.Dte);
+                var pro = Core.HelperFunctions.GetSelectedProject(QtVsToolsLegacyPackage.Instance.Dte);
                 var qtVer = vm.GetProjectQtVersion(pro);
                 if (qtVer == null)
                     qtVer = vm.GetDefaultVersion();
diff --git a/QtVsTools.Package/Legacy/QtMenu.cs b/QtVsTools.Package/Legacy/QtMenu.cs
index 69da8ff6..54f9df03 100644
--- a/QtVsTools.Package/Legacy/QtMenu.cs
+++ b/QtVsTools.Package/Legacy/QtMenu.cs
@@ -44,7 +44,7 @@ namespace QtVsTools.Legacy
 
             using (var form = new FormProjectQtSettings(project)) {
                 form.StartPosition = FormStartPosition.CenterParent;
-                form.ShowDialog(new MainWinWrapper(QtVsToolsPackage.Instance.Dte));
+                form.ShowDialog(new MainWinWrapper(QtVsToolsLegacyPackage.Instance.Dte));
             }
         }
 
@@ -52,13 +52,13 @@ namespace QtVsTools.Legacy
         {
             ThreadHelper.ThrowIfNotOnUIThread();
 
-            var pro = HelperFunctions.GetSelectedQtProject(QtVsToolsPackage.Instance.Dte);
+            var pro = HelperFunctions.GetSelectedQtProject(QtVsToolsLegacyPackage.Instance.Dte);
             if (!HelperFunctions.IsQtProject(pro))
                 return;
 
             using (var formChangeQtVersion = new FormChangeQtVersion()) {
                 formChangeQtVersion.UpdateContent(ChangeFor.Project);
-                var ww = new MainWinWrapper(QtVsToolsPackage.Instance.Dte);
+                var ww = new MainWinWrapper(QtVsToolsLegacyPackage.Instance.Dte);
                 if (formChangeQtVersion.ShowDialog(ww) == DialogResult.OK) {
                     var qtVersion = formChangeQtVersion.GetSelectedQtVersion();
                     HelperFunctions.SetDebuggingEnvironment(pro, "PATH=" + QtVersionManager
@@ -82,7 +82,7 @@ namespace QtVsTools.Legacy
                 return;
 
             string platform = null;
-            var dte = QtVsToolsPackage.Instance.Dte;
+            var dte = QtVsToolsLegacyPackage.Instance.Dte;
             try {
                 platform = (dte.Solution.SolutionBuild.ActiveConfiguration as SolutionConfiguration2)
                     .PlatformName;
diff --git a/QtVsTools.Package/Options/QtVersionsPage.cs b/QtVsTools.Package/Options/QtVersionsPage.cs
index 80754de2..7fb10a9d 100644
--- a/QtVsTools.Package/Options/QtVersionsPage.cs
+++ b/QtVsTools.Package/Options/QtVersionsPage.cs
@@ -185,7 +185,7 @@ namespace QtVsTools.Options
                 var errorMessage = "Invalid Qt versions:\r\n"
                     + $"{string.Join("\r\n", errorMessages.Select(errMsg => " * " + errMsg))}";
                 VsShellUtilities.ShowMessageBox(
-                    QtVsToolsPackage.Instance,
+                    QtVsToolsLegacyPackage.Instance,
                     errorMessage,
                     "Qt VS Tools",
                     OLEMSGICON.OLEMSGICON_WARNING,
diff --git a/QtVsTools.Package/Package/DteEventsHandler.cs b/QtVsTools.Package/Package/DteEventsHandler.cs
index 6f4da698..09483019 100644
--- a/QtVsTools.Package/Package/DteEventsHandler.cs
+++ b/QtVsTools.Package/Package/DteEventsHandler.cs
@@ -115,7 +115,7 @@ namespace QtVsTools
             if (dte.MainWindow?.Visible == true) {
                 windowEvents.WindowActivated -= WindowEvents_WindowActivated;
                 windowEvents = null;
-                QtVsToolsPackage.Instance.VsMainWindowActivated();
+                QtVsToolsLegacyPackage.Instance.VsMainWindowActivated();
             }
         }
 
@@ -123,7 +123,7 @@ namespace QtVsTools
             string Guid, int ID, object CustomIn, object CustomOut, ref bool CancelDefault)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
-            if (QtVsToolsPackage.Instance.Options.TryQtHelpOnF1Pressed) {
+            if (QtVsToolsLegacyPackage.Instance.Options.TryQtHelpOnF1Pressed) {
                 if (!QtHelp.ShowEditorContextHelp()) {
                     Messages.Print("No help match was found. You can still try to search online at "
                         + "https://doc.qt.io" + ".", false, true);
@@ -152,7 +152,7 @@ namespace QtVsTools
             var qtVersion = qtProject?.GetQtVersion();
             var versionInfo = QtVersionManager.The().GetVersionInfo(qtVersion);
             if (!string.IsNullOrEmpty(versionInfo?.Namespace()))
-                QtVsToolsPackage.Instance.CopyNatvisFiles(versionInfo.Namespace());
+                QtVsToolsLegacyPackage.Instance.CopyNatvisFiles(versionInfo.Namespace());
 
             if (QtProject.GetFormatVersion(selectedProject) < Resources.qtMinFormatVersion_Settings)
                 qtProject?.SetQtEnvironment();
@@ -214,7 +214,7 @@ namespace QtVsTools
         {
             ThreadHelper.ThrowIfNotOnUIThread();
 
-            if (!QtVsToolsPackage.Instance.LegacyOptions.PreBuildSetup)
+            if (!QtVsToolsLegacyPackage.Instance.LegacyOptions.PreBuildSetup)
                 return;
 
             if (currentBuildAction != vsBuildAction.vsBuildActionBuild &&
@@ -361,7 +361,7 @@ namespace QtVsTools
         {
             ThreadHelper.ThrowIfNotOnUIThread();
 
-            var project = HelperFunctions.GetSelectedQtProject(QtVsToolsPackage.Instance.Dte);
+            var project = HelperFunctions.GetSelectedQtProject(QtVsToolsLegacyPackage.Instance.Dte);
             var qtPro = QtProject.Create(project);
             if (!HelperFunctions.IsVsToolsProject(project))
                 return;
@@ -421,7 +421,7 @@ namespace QtVsTools
         {
             ThreadHelper.ThrowIfNotOnUIThread();
 
-            var pro = HelperFunctions.GetSelectedQtProject(QtVsToolsPackage.Instance.Dte);
+            var pro = HelperFunctions.GetSelectedQtProject(QtVsToolsLegacyPackage.Instance.Dte);
             if (pro == null)
                 return;
 
@@ -435,7 +435,7 @@ namespace QtVsTools
 
             if (OldName == null)
                 return;
-            var pro = HelperFunctions.GetSelectedQtProject(QtVsToolsPackage.Instance.Dte);
+            var pro = HelperFunctions.GetSelectedQtProject(QtVsToolsLegacyPackage.Instance.Dte);
             if (pro == null)
                 return;
 
@@ -493,7 +493,7 @@ namespace QtVsTools
                 QtProjectIntellisense.Refresh(project);
             }
             if (formatVersion >= 100 && formatVersion < Resources.qtProjectFormatVersion) {
-                if (QtVsToolsPackage.Instance.Options.UpdateProjectFormat)
+                if (QtVsToolsLegacyPackage.Instance.Options.UpdateProjectFormat)
                     Notifications.UpdateProjectFormat.Show();
             }
         }
@@ -506,15 +506,15 @@ namespace QtVsTools
         {
             ThreadHelper.ThrowIfNotOnUIThread();
 
-            QtProjectTracker.SolutionPath = QtVsToolsPackage.Instance.Dte.Solution.FullName;
-            foreach (var p in HelperFunctions.ProjectsInSolution(QtVsToolsPackage.Instance.Dte)) {
+            QtProjectTracker.SolutionPath = QtVsToolsLegacyPackage.Instance.Dte.Solution.FullName;
+            foreach (var p in HelperFunctions.ProjectsInSolution(QtVsToolsLegacyPackage.Instance.Dte)) {
                 var formatVersion = QtProject.GetFormatVersion(p);
                 if (formatVersion >= Resources.qtMinFormatVersion_Settings) {
                     InitializeVCProject(p);
                     QtProjectTracker.Add(p);
                 }
                 if (formatVersion >= 100 && formatVersion < Resources.qtProjectFormatVersion) {
-                    if (QtVsToolsPackage.Instance.Options.UpdateProjectFormat)
+                    if (QtVsToolsLegacyPackage.Instance.Options.UpdateProjectFormat)
                         Notifications.UpdateProjectFormat.Show();
                 }
             }
diff --git a/QtVsTools.Package/Package/ExtLoader.cs b/QtVsTools.Package/Package/ExtLoader.cs
index b1496809..25ef278a 100644
--- a/QtVsTools.Package/Package/ExtLoader.cs
+++ b/QtVsTools.Package/Package/ExtLoader.cs
@@ -56,8 +56,8 @@ namespace QtVsTools
                 Messages.DisplayErrorMessage(SR.GetString("NoVSSupport"));
                 return;
             }
-            if (QtVsToolsPackage.Instance.Dte != null) {
-                var proFileImporter = new ProjectImporter(QtVsToolsPackage.Instance.Dte);
+            if (QtVsToolsLegacyPackage.Instance.Dte != null) {
+                var proFileImporter = new ProjectImporter(QtVsToolsLegacyPackage.Instance.Dte);
                 proFileImporter.ImportProFile(qtVersion);
             }
         }
@@ -184,15 +184,15 @@ namespace QtVsTools
 
         public static void ExportProFile()
         {
-            if (QtVsToolsPackage.Instance.Dte != null) {
-                var proFileExporter = new ProjectExporter(QtVsToolsPackage.Instance.Dte);
+            if (QtVsToolsLegacyPackage.Instance.Dte != null) {
+                var proFileExporter = new ProjectExporter(QtVsToolsLegacyPackage.Instance.Dte);
                 proFileExporter.ExportToProFile();
             }
         }
 
         public static void ExportPriFile()
         {
-            var dte = QtVsToolsPackage.Instance.Dte;
+            var dte = QtVsToolsLegacyPackage.Instance.Dte;
             if (dte != null) {
                 var proFileExporter = new ProjectExporter(dte);
                 proFileExporter.ExportToPriFile(HelperFunctions.GetSelectedQtProject
diff --git a/QtVsTools.Package/Package/Notifications.cs b/QtVsTools.Package/Package/Notifications.cs
index 34f18849..7b2a10ac 100644
--- a/QtVsTools.Package/Package/Notifications.cs
+++ b/QtVsTools.Package/Package/Notifications.cs
@@ -69,7 +69,7 @@ namespace QtVsTools
                 Text = "Select Qt version...",
                 CloseInfoBar = false,
                 OnClicked = () =>
-                    QtVsToolsPackage.Instance.ShowOptionPage(typeof(Options.QtVersionsPage))
+                    QtVsToolsLegacyPackage.Instance.ShowOptionPage(typeof(Options.QtVersionsPage))
             }
         };
     }
@@ -84,7 +84,7 @@ namespace QtVsTools
             new TextSpacer(2),
             "\u2014", // Em dash
             new TextSpacer(2),
-            $"Version {Version.USER_VERSION} was recently installed."
+            $"LEGACY version {Version.USER_VERSION} was recently installed."
         };
 
         protected override Hyperlink[] Hyperlinks => new Hyperlink[]
@@ -105,8 +105,8 @@ namespace QtVsTools
                 CloseInfoBar = true,
                 OnClicked = () =>
                 {
-                    QtVsToolsPackage.Instance.Options.NotifyInstalled = false;
-                    QtVsToolsPackage.Instance.Options.SaveSettingsToStorage();
+                    QtVsToolsLegacyPackage.Instance.Options.NotifyInstalled = false;
+                    QtVsToolsLegacyPackage.Instance.Options.SaveSettingsToStorage();
                 }
             }
         };
@@ -143,8 +143,8 @@ namespace QtVsTools
                 CloseInfoBar = true,
                 OnClicked = () =>
                 {
-                    QtVsToolsPackage.Instance.Options.UpdateProjectFormat = false;
-                    QtVsToolsPackage.Instance.Options.SaveSettingsToStorage();
+                    QtVsToolsLegacyPackage.Instance.Options.UpdateProjectFormat = false;
+                    QtVsToolsLegacyPackage.Instance.Options.SaveSettingsToStorage();
                 }
             }
         };
diff --git a/QtVsTools.Package/Package/QMakeWrapper.cs b/QtVsTools.Package/Package/QMakeWrapper.cs
index 528aae2f..045ba351 100644
--- a/QtVsTools.Package/Package/QMakeWrapper.cs
+++ b/QtVsTools.Package/Package/QMakeWrapper.cs
@@ -48,7 +48,7 @@ namespace QtVsTools
         {
             string output;
             try {
-                var exeFilePath = QtVsToolsPackage.Instance.QMakeFileReaderPath;
+                var exeFilePath = QtVsToolsLegacyPackage.Instance.QMakeFileReaderPath;
                 if (!System.IO.File.Exists(exeFilePath))
                     return false;
 
diff --git a/QtVsTools.Package/Package/QtHelp.cs b/QtVsTools.Package/Package/QtHelp.cs
index 0989eceb..a8291c2c 100644
--- a/QtVsTools.Package/Package/QtHelp.cs
+++ b/QtVsTools.Package/Package/QtHelp.cs
@@ -182,7 +182,7 @@ namespace QtVsTools
                 if (qchFiles.Length == 0)
                     return TryShowGenericSearchResultsOnline(keyword, info.qtMajor);
 
-                var offline = QtVsToolsPackage.Instance.Options.HelpPreference == SourcePreference.Offline;
+                var offline = QtVsToolsLegacyPackage.Instance.Options.HelpPreference == SourcePreference.Offline;
 
                 var linksForKeyword = string.Format("SELECT d.Title, f.Name, e.Name, "
                     + "d.Name, a.Anchor FROM IndexTable a, FileNameTable d, FolderTable e, "
@@ -199,7 +199,7 @@ namespace QtVsTools
                     using (var connection = new SQLiteConnection(builder.ToString())) {
                         connection.Open();
                         using (var command = new SQLiteCommand(linksForKeyword, connection)) {
-                            var reader = QtVsToolsPackage.Instance.JoinableTaskFactory
+                            var reader = QtVsToolsLegacyPackage.Instance.JoinableTaskFactory
                                 .Run(async () => await command.ExecuteReaderAsync());
                             using (reader) {
                                 while (reader.Read()) {
@@ -246,7 +246,7 @@ namespace QtVsTools
                 uri = HelperFunctions.FromNativeSeparators(uri);
                 var helpUri = new Uri(uri);
                 if (helpUri.IsFile && !File.Exists(helpUri.LocalPath)) {
-                    VsShellUtilities.ShowMessageBox(QtVsToolsPackage.Instance,
+                    VsShellUtilities.ShowMessageBox(QtVsToolsLegacyPackage.Instance,
                         "Your search - " + keyword + " - did match a document, but it could "
                         + "not be found on disk. To use the online help, select: "
                         + "Tools | Options | Qt | Preferred source | Online",
@@ -263,7 +263,7 @@ namespace QtVsTools
 
         private static bool TryShowGenericSearchResultsOnline(string keyword, uint version)
         {
-            if (QtVsToolsPackage.Instance.Options.HelpPreference != SourcePreference.Online)
+            if (QtVsToolsLegacyPackage.Instance.Options.HelpPreference != SourcePreference.Online)
                 return false;
 
             VsShellUtilities.OpenSystemBrowser(HelperFunctions.FromNativeSeparators(
diff --git a/QtVsTools.Package/Package/QtItemContextMenu.cs b/QtVsTools.Package/Package/QtItemContextMenu.cs
index b7e8addb..153d6ea2 100644
--- a/QtVsTools.Package/Package/QtItemContextMenu.cs
+++ b/QtVsTools.Package/Package/QtItemContextMenu.cs
@@ -101,10 +101,10 @@ namespace QtVsTools
 
             switch (command.CommandID.ID) {
             case lUpdateOnItemId:
-                Translation.RunlUpdate(HelperFunctions.GetSelectedFiles(QtVsToolsPackage.Instance.Dte));
+                Translation.RunlUpdate(HelperFunctions.GetSelectedFiles(QtVsToolsLegacyPackage.Instance.Dte));
                 break;
             case lReleaseOnItemId:
-                Translation.RunlRelease(HelperFunctions.GetSelectedFiles(QtVsToolsPackage.Instance.Dte));
+                Translation.RunlRelease(HelperFunctions.GetSelectedFiles(QtVsToolsLegacyPackage.Instance.Dte));
                 break;
             }
         }
@@ -120,11 +120,11 @@ namespace QtVsTools
             command.Enabled = false;
             command.Visible = false;
 
-            var prj = HelperFunctions.GetSelectedProject(QtVsToolsPackage.Instance.Dte);
-            if (!HelperFunctions.IsVsToolsProject(prj) || QtVsToolsPackage.Instance.Dte.SelectedItems.Count <= 0)
+            var prj = HelperFunctions.GetSelectedProject(QtVsToolsLegacyPackage.Instance.Dte);
+            if (!HelperFunctions.IsVsToolsProject(prj) || QtVsToolsLegacyPackage.Instance.Dte.SelectedItems.Count <= 0)
                 return;
 
-            foreach (SelectedItem si in QtVsToolsPackage.Instance.Dte.SelectedItems) {
+            foreach (SelectedItem si in QtVsToolsLegacyPackage.Instance.Dte.SelectedItems) {
                 if (!HelperFunctions.IsTranslationFile(si.Name))
                     return; // Don't display commands if one of the selected files is not a .ts file.
             }
diff --git a/QtVsTools.Package/Package/QtMainMenu.cs b/QtVsTools.Package/Package/QtMainMenu.cs
index a0305ed6..c42223b6 100644
--- a/QtVsTools.Package/Package/QtMainMenu.cs
+++ b/QtVsTools.Package/Package/QtMainMenu.cs
@@ -121,16 +121,16 @@ namespace QtVsTools
                 VsShellUtilities.OpenSystemBrowser("https://doc.qt.io/qtvstools/qtvstools-getting-started.html");
                 break;
             case CommandId.LaunchDesignerId:
-                QtVsToolsPackage.Instance.QtDesigner.Start(hideWindow: false);
+                QtVsToolsLegacyPackage.Instance.QtDesigner.Start(hideWindow: false);
                 break;
             case CommandId.LaunchLinguistId:
-                QtVsToolsPackage.Instance.QtLinguist.Start(hideWindow: false);
+                QtVsToolsLegacyPackage.Instance.QtLinguist.Start(hideWindow: false);
                 break;
             case CommandId.OpenProFileId:
                 ExtLoader.ImportProFile();
                 break;
             case CommandId.ImportPriFileId:
-                ExtLoader.ImportPriFile(HelperFunctions.GetSelectedQtProject(QtVsToolsPackage.Instance.Dte));
+                ExtLoader.ImportPriFile(HelperFunctions.GetSelectedQtProject(QtVsToolsLegacyPackage.Instance.Dte));
                 break;
             case CommandId.ExportPriFileId:
                 ExtLoader.ExportPriFile();
@@ -142,10 +142,10 @@ namespace QtVsTools
                 QtMsBuildConverter.SolutionToQtMsBuild();
                 break;
             case CommandId.QtProjectSettingsId: {
-                    var pro = HelperFunctions.GetSelectedQtProject(QtVsToolsPackage.Instance.Dte);
+                    var pro = HelperFunctions.GetSelectedQtProject(QtVsToolsLegacyPackage.Instance.Dte);
                     int projectVersion = QtProject.GetFormatVersion(pro);
                     if (projectVersion >= Resources.qtMinFormatVersion_Settings) {
-                        QtVsToolsPackage.Instance.Dte.ExecuteCommand("Project.Properties");
+                        QtVsToolsLegacyPackage.Instance.Dte.ExecuteCommand("Project.Properties");
                     } else if (pro != null) {
                         Legacy.QtMenu.ShowFormProjectQtSettings(pro);
                     } else {
@@ -157,10 +157,10 @@ namespace QtVsTools
                 Legacy.QtMenu.ShowFormChangeProjectQtVersion();
                 break;
             case CommandId.QtOptionsId:
-                QtVsToolsPackage.Instance.ShowOptionPage(typeof(Options.QtOptionsPage));
+                QtVsToolsLegacyPackage.Instance.ShowOptionPage(typeof(Options.QtOptionsPage));
                 break;
             case CommandId.QtVersionsId:
-                QtVsToolsPackage.Instance.ShowOptionPage(typeof(Options.QtVersionsPage));
+                QtVsToolsLegacyPackage.Instance.ShowOptionPage(typeof(Options.QtVersionsPage));
                 break;
             }
         }
@@ -173,7 +173,7 @@ namespace QtVsTools
             if (command == null)
                 return;
 
-            var project = HelperFunctions.GetSelectedProject(QtVsToolsPackage.Instance.Dte);
+            var project = HelperFunctions.GetSelectedProject(QtVsToolsLegacyPackage.Instance.Dte);
 
             switch ((CommandId)command.CommandID.ID) {
             case CommandId.ViewQtHelpId:
@@ -181,7 +181,7 @@ namespace QtVsTools
                 command.Visible = command.Enabled = true;
                 break;
             case CommandId.QtVersionId:
-                command.Text = "Qt Visual Studio Tools version " + Version.USER_VERSION;
+                command.Text = "LEGACY Qt Visual Studio Tools version " + Version.USER_VERSION;
                 command.Visible = true;
                 command.Enabled = false;
                 break;
@@ -225,9 +225,9 @@ namespace QtVsTools
                 break;
             case CommandId.ConvertToQtMsBuild: {
                     command.Visible = true;
-                    command.Enabled = (QtVsToolsPackage.Instance.Dte.Solution != null
-                        && QtVsToolsPackage.Instance.Dte.Solution.Projects != null
-                        && QtVsToolsPackage.Instance.Dte.Solution.Projects.Count > 0);
+                    command.Enabled = (QtVsToolsLegacyPackage.Instance.Dte.Solution != null
+                        && QtVsToolsLegacyPackage.Instance.Dte.Solution.Projects != null
+                        && QtVsToolsLegacyPackage.Instance.Dte.Solution.Projects.Count > 0);
                 }
                 break;
             }
diff --git a/QtVsTools.Package/Package/QtMsBuildConverter.cs b/QtVsTools.Package/Package/QtMsBuildConverter.cs
index 319e5635..d5df445c 100644
--- a/QtVsTools.Package/Package/QtMsBuildConverter.cs
+++ b/QtVsTools.Package/Package/QtMsBuildConverter.cs
@@ -47,7 +47,7 @@ namespace QtVsTools
         {
             ThreadHelper.ThrowIfNotOnUIThread();
 
-            var allProjects = HelperFunctions.ProjectsInSolution(QtVsToolsPackage.Instance.Dte);
+            var allProjects = HelperFunctions.ProjectsInSolution(QtVsToolsLegacyPackage.Instance.Dte);
             if (allProjects.Count == 0)
                 return WarningMessage(SR.GetString("NoProjectsToConvert"));
 
@@ -91,7 +91,7 @@ namespace QtVsTools
                 })
                 .ToList();
 
-            var solution = QtVsToolsPackage.Instance.Dte.Solution;
+            var solution = QtVsToolsLegacyPackage.Instance.Dte.Solution;
             string solutionPath = solution.FileName;
             solution.Close(true);
 
@@ -114,7 +114,7 @@ namespace QtVsTools
                 }
                 if (!ConvertProject(projectPath)) {
                     waitDialog?.Stop();
-                    QtVsToolsPackage.Instance.Dte.Solution.Open(solutionPath);
+                    QtVsToolsLegacyPackage.Instance.Dte.Solution.Open(solutionPath);
                     return ErrorMessage(string.Format(SR.GetString("ErrorConvertingProject"),
                         Path.GetFileName(projectPath)));
                 }
@@ -123,7 +123,7 @@ namespace QtVsTools
 
             waitDialog?.Stop();
 
-            QtVsToolsPackage.Instance.Dte.Solution.Open(solutionPath);
+            QtVsToolsLegacyPackage.Instance.Dte.Solution.Open(solutionPath);
             if (canceled && projCount < projectPaths.Count) {
                 MessageBox.Show(string.Format(SR.GetString("ConvertCanceled"),
                     projectPaths.Count - projCount), SR.GetString("Resources_QtVsTools"),
diff --git a/QtVsTools.Package/Package/QtProjectContextMenu.cs b/QtVsTools.Package/Package/QtProjectContextMenu.cs
index bc86c4fe..c732e06e 100644
--- a/QtVsTools.Package/Package/QtProjectContextMenu.cs
+++ b/QtVsTools.Package/Package/QtProjectContextMenu.cs
@@ -110,7 +110,7 @@ namespace QtVsTools
 
             switch ((CommandId)command.CommandID.ID) {
             case CommandId.ImportPriFileProjectId:
-                ExtLoader.ImportPriFile(HelperFunctions.GetSelectedQtProject(QtVsToolsPackage.Instance.Dte));
+                ExtLoader.ImportPriFile(HelperFunctions.GetSelectedQtProject(QtVsToolsLegacyPackage.Instance.Dte));
                 break;
             case CommandId.ExportPriFileProjectId:
                 ExtLoader.ExportPriFile();
@@ -119,16 +119,16 @@ namespace QtVsTools
                 ExtLoader.ExportProFile();
                 break;
             case CommandId.lUpdateOnProjectId:
-                Translation.RunlUpdate(HelperFunctions.GetSelectedQtProject(QtVsToolsPackage.Instance.Dte));
+                Translation.RunlUpdate(HelperFunctions.GetSelectedQtProject(QtVsToolsLegacyPackage.Instance.Dte));
                 break;
             case CommandId.lReleaseOnProjectId:
-                Translation.RunlRelease(HelperFunctions.GetSelectedQtProject(QtVsToolsPackage.Instance.Dte));
+                Translation.RunlRelease(HelperFunctions.GetSelectedQtProject(QtVsToolsLegacyPackage.Instance.Dte));
                 break;
             case CommandId.QtProjectSettingsProjectId: {
-                    var pro = HelperFunctions.GetSelectedQtProject(QtVsToolsPackage.Instance.Dte);
+                    var pro = HelperFunctions.GetSelectedQtProject(QtVsToolsLegacyPackage.Instance.Dte);
                     int projectVersion = QtProject.GetFormatVersion(pro);
                     if (projectVersion >= Resources.qtMinFormatVersion_Settings) {
-                        QtVsToolsPackage.Instance.Dte.ExecuteCommand("Project.Properties");
+                        QtVsToolsLegacyPackage.Instance.Dte.ExecuteCommand("Project.Properties");
                     } else if (pro != null) {
                         Legacy.QtMenu.ShowFormProjectQtSettings(pro);
                     } else {
@@ -141,11 +141,11 @@ namespace QtVsTools
                 break;
             case CommandId.ProjectConvertToQtMsBuild: {
                     QtMsBuildConverter.ProjectToQtMsBuild(
-                        HelperFunctions.GetSelectedProject(QtVsToolsPackage.Instance.Dte));
+                        HelperFunctions.GetSelectedProject(QtVsToolsLegacyPackage.Instance.Dte));
                 }
                 break;
             case CommandId.ProjectRefreshIntelliSense: {
-                    var selectedProject = HelperFunctions.GetSelectedProject(QtVsToolsPackage.Instance.Dte);
+                    var selectedProject = HelperFunctions.GetSelectedProject(QtVsToolsLegacyPackage.Instance.Dte);
                     var tracker = QtProjectTracker.Get(selectedProject, selectedProject.FullName);
                     QtProjectIntellisense.Refresh(tracker.Project);
                 }
@@ -159,7 +159,7 @@ namespace QtVsTools
             if (command == null)
                 return;
 
-            var project = HelperFunctions.GetSelectedProject(QtVsToolsPackage.Instance.Dte);
+            var project = HelperFunctions.GetSelectedProject(QtVsToolsLegacyPackage.Instance.Dte);
             var isQtProject = HelperFunctions.IsVsToolsProject(project);
             var isQMakeProject = HelperFunctions.IsQtProject(project);
             if (!isQtProject && !isQMakeProject) {
@@ -176,7 +176,7 @@ namespace QtVsTools
             case CommandId.ExportProFileProjectId:
                 command.Visible = true;
                 command.Enabled = HelperFunctions.IsVsToolsProject(HelperFunctions
-                    .GetSelectedProject(QtVsToolsPackage.Instance.Dte));
+                    .GetSelectedProject(QtVsToolsLegacyPackage.Instance.Dte));
                 break;
             case CommandId.lUpdateOnProjectId:
             case CommandId.lReleaseOnProjectId:
diff --git a/QtVsTools.Package/Package/QtSolutionContextMenu.cs b/QtVsTools.Package/Package/QtSolutionContextMenu.cs
index ba2b7609..5bd3a898 100644
--- a/QtVsTools.Package/Package/QtSolutionContextMenu.cs
+++ b/QtVsTools.Package/Package/QtSolutionContextMenu.cs
@@ -102,7 +102,7 @@ namespace QtVsTools
 
             switch (command.CommandID.ID) {
             case (int)CommandId.ChangeSolutionQtVersionId:
-                var projects = HelperFunctions.ProjectsInSolution(QtVsToolsPackage.Instance.Dte);
+                var projects = HelperFunctions.ProjectsInSolution(QtVsToolsLegacyPackage.Instance.Dte);
                 foreach (var project in projects) {
                     if (!HelperFunctions.IsVsToolsProject(project)
                         && HelperFunctions.IsQtProject(project)) {
@@ -126,13 +126,13 @@ namespace QtVsTools
             if (command == null)
                 return;
 
-            var dte = QtVsToolsPackage.Instance.Dte;
+            var dte = QtVsToolsLegacyPackage.Instance.Dte;
             switch ((CommandId)command.CommandID.ID) {
             case CommandId.lUpdateOnSolutionId:
-                Translation.RunlUpdate(QtVsToolsPackage.Instance.Dte.Solution);
+                Translation.RunlUpdate(QtVsToolsLegacyPackage.Instance.Dte.Solution);
                 break;
             case CommandId.lReleaseOnSolutionId:
-                Translation.RunlRelease(QtVsToolsPackage.Instance.Dte.Solution);
+                Translation.RunlRelease(QtVsToolsLegacyPackage.Instance.Dte.Solution);
                 break;
             case CommandId.ChangeSolutionQtVersionId:
                 Legacy.QtMenu.ShowFormChangeSolutionQtVersion();
diff --git a/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Program.cs b/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Program.cs
index 1da5eef7..a432025e 100644
--- a/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Program.cs
+++ b/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Program.cs
@@ -164,9 +164,9 @@ namespace QtVsTools.Qml.Debug.AD7
             var debugMode = new DBGMODE[1];
             int res = VSConstants.S_FALSE;
 
-            QtVsToolsPackage.Instance.JoinableTaskFactory.Run(async () =>
+            QtVsToolsLegacyPackage.Instance.JoinableTaskFactory.Run(async () =>
             {
-                await QtVsToolsPackage.Instance.JoinableTaskFactory.SwitchToMainThreadAsync();
+                await QtVsToolsLegacyPackage.Instance.JoinableTaskFactory.SwitchToMainThreadAsync();
                 res = VsDebugger.GetMode(debugMode);
             });
 
@@ -301,7 +301,7 @@ namespace QtVsTools.Qml.Debug.AD7
             get => ThreadHelper.JoinableTaskFactory.Run(async () =>
             {
                 await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
-                return ((bool)QtVsToolsPackage.Instance.Dte
+                return ((bool)QtVsToolsLegacyPackage.Instance.Dte
                     .Properties["Debugging", "General"]
                     .Item("BreakAllProcesses")
                     .Value);
@@ -309,7 +309,7 @@ namespace QtVsTools.Qml.Debug.AD7
             set => ThreadHelper.JoinableTaskFactory.Run(async () =>
             {
                 await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
-                QtVsToolsPackage.Instance.Dte
+                QtVsToolsLegacyPackage.Instance.Dte
                     .Properties["Debugging", "General"]
                     .Item("BreakAllProcesses")
                     .let_Value(value ? "True" : "False");
diff --git a/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7StackFrame.cs b/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7StackFrame.cs
index 8bbbede4..ac5a2406 100644
--- a/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7StackFrame.cs
+++ b/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7StackFrame.cs
@@ -86,7 +86,7 @@ namespace QtVsTools.Qml.Debug.AD7
             Name = string.Format("{0}@{1}:{2}", name, context.FilePath, context.FileLine + 1);
             FrameNumber = number;
             Scopes = scopes;
-            InitThread = QtVsToolsPackage.Instance.JoinableTaskFactory.RunAsync(async () =>
+            InitThread = QtVsToolsLegacyPackage.Instance.JoinableTaskFactory.RunAsync(async () =>
             {
                 InitializeProperties();
                 await Task.Yield();
diff --git a/QtVsTools.Package/QML/Debugging/QmlDebugLauncher.cs b/QtVsTools.Package/QML/Debugging/QmlDebugLauncher.cs
index 39803727..b36c1391 100644
--- a/QtVsTools.Package/QML/Debugging/QmlDebugLauncher.cs
+++ b/QtVsTools.Package/QML/Debugging/QmlDebugLauncher.cs
@@ -92,7 +92,7 @@ namespace QtVsTools.Qml.Debug
         {
             ThreadHelper.ThrowIfNotOnUIThread();
 
-            if (!QtVsToolsPackage.Instance.Options.QmlDebuggerEnabled)
+            if (!QtVsToolsLegacyPackage.Instance.Options.QmlDebuggerEnabled)
                 return VSConstants.S_OK;
 
             if (riidEvent != typeof(IDebugThreadCreateEvent2).GUID
@@ -203,7 +203,7 @@ namespace QtVsTools.Qml.Debug
             execCmd = "";
             rccItems = null;
 
-            foreach (var project in HelperFunctions.ProjectsInSolution(QtVsToolsPackage.Instance.Dte)) {
+            foreach (var project in HelperFunctions.ProjectsInSolution(QtVsToolsLegacyPackage.Instance.Dte)) {
 
                 var vcProject = project.Object as VCProject;
                 if (vcProject == null)
diff --git a/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Client.cs b/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Client.cs
index d6295017..285796d5 100644
--- a/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Client.cs
+++ b/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Client.cs
@@ -95,7 +95,7 @@ namespace QtVsTools.Qml.Debug.V4
         {
             this.sink = sink;
 
-            QtVsToolsPackage.Instance.JoinableTaskFactory.Run(async () =>
+            QtVsToolsLegacyPackage.Instance.JoinableTaskFactory.Run(async () =>
             {
                 await Task.WhenAny(new[]
                 {
@@ -134,7 +134,7 @@ namespace QtVsTools.Qml.Debug.V4
             if (State != DebugClientState.Unavailable) {
                 NativeMethods.DebugClientShutdown(client);
 
-                QtVsToolsPackage.Instance.JoinableTaskFactory.Run(
+                QtVsToolsLegacyPackage.Instance.JoinableTaskFactory.Run(
                     async () => await Task.WhenAll(new[] { clientThread }));
             }
         }
@@ -179,7 +179,7 @@ namespace QtVsTools.Qml.Debug.V4
                 hostName = "localhost";
             var hostNameData = Encoding.UTF8.GetBytes(hostName);
 
-            uint timeout = (uint)QtVsToolsPackage.Instance.Options.QmlDebuggerTimeout;
+            uint timeout = (uint)QtVsToolsLegacyPackage.Instance.Options.QmlDebuggerTimeout;
             _ = Task.Run(() =>
             {
                 var connectTimer = new System.Diagnostics.Stopwatch();
@@ -244,7 +244,7 @@ namespace QtVsTools.Qml.Debug.V4
                 return null;
             }
 
-            uint timeout = (uint)QtVsToolsPackage.Instance.Options.QmlDebuggerTimeout;
+            uint timeout = (uint)QtVsToolsLegacyPackage.Instance.Options.QmlDebuggerTimeout;
             if (timeout != 0) {
                 _ = Task.Run(() =>
                 {
diff --git a/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Protocol.cs b/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Protocol.cs
index 41b80660..bad51298 100644
--- a/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Protocol.cs
+++ b/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Protocol.cs
@@ -92,7 +92,7 @@ namespace QtVsTools.Qml.Debug.V4
         protected override void DisposeFinally()
         {
             eventReceived.Set();
-            QtVsToolsPackage.Instance.JoinableTaskFactory.Run(
+            QtVsToolsLegacyPackage.Instance.JoinableTaskFactory.Run(
                 async () => await Task.WhenAll(new[] { eventHandlingThread }));
             eventReceived.Dispose();
         }
diff --git a/QtVsTools.Package/QtMenus.vsct_TT b/QtVsTools.Package/QtMenus.vsct_TT
index 110c6108..c8160b09 100644
--- a/QtVsTools.Package/QtMenus.vsct_TT
+++ b/QtVsTools.Package/QtMenus.vsct_TT
@@ -188,7 +188,7 @@
                 <Strings>
                       <!-- BEGIN Generated Text <#=XML_COMMENT_END#>
                       <ButtonText
->Qt Visual Studio Tools version <#=QT_VS_TOOLS_VERSION_USER#>: Initializing...</ButtonText>
+>LEGACY Qt Visual Studio Tools version <#=QT_VS_TOOLS_VERSION_USER#>: Initializing...</ButtonText>
                       <#=XML_COMMENT_BEGIN#> END Generated Text -->
                  </Strings>
             </Button>
@@ -530,7 +530,7 @@
 
     <Symbols>
         <!-- This is the package guid. -->
-        <GuidSymbol name="PackageGuid" value="{15021976-647e-4876-9040-2507afde45d2}" />
+        <GuidSymbol name="PackageGuid" value="{6E7FA583-5FAA-4EC9-9E90-4A0AE5FD61EE}" />
 
         <!-- This is the guid used to group the menu commands together -->
         <GuidSymbol name="MainMenuGuid" value="{58f83fff-d39d-4c66-810b-2702e1f04e73}">
diff --git a/QtVsTools.Package/QtMsBuild/QtProjectBuild.cs b/QtVsTools.Package/QtMsBuild/QtProjectBuild.cs
index 5a1cb296..5f7e325f 100644
--- a/QtVsTools.Package/QtMsBuild/QtProjectBuild.cs
+++ b/QtVsTools.Package/QtMsBuild/QtProjectBuild.cs
@@ -118,7 +118,7 @@ namespace QtVsTools.QtMsBuild
             var tracker = QtProjectTracker.Get(project, projectPath);
             await tracker.Initialized;
 
-            if (QtVsToolsPackage.Instance.Options.BuildDebugInformation) {
+            if (QtVsToolsLegacyPackage.Instance.Options.BuildDebugInformation) {
                 Messages.Print(string.Format(
                 "{0:HH:mm:ss.FFF} QtProjectBuild({1}): Request [{2}] {3}",
                 DateTime.Now, Thread.CurrentThread.ManagedThreadId,
@@ -192,7 +192,7 @@ namespace QtVsTools.QtMsBuild
         static async Task BuildDispatcherLoopAsync()
         {
             ITaskHandler2 dispatchStatus = null;
-            while (!QtVsToolsPackage.Instance.Zombied) {
+            while (!QtVsToolsLegacyPackage.Instance.Zombied) {
                 while (BuildQueue.IsEmpty || RequestTimer.ElapsedMilliseconds < 1000) {
                     if (BuildQueue.IsEmpty && dispatchStatus != null) {
                         dispatchStatus.Dismiss();
@@ -269,8 +269,8 @@ namespace QtVsTools.QtMsBuild
                 configProps, null, new ProjectCollection());
 
             var loggerVerbosity = LoggerVerbosity;
-            if (QtVsToolsPackage.Instance.Options.BuildDebugInformation)
-                loggerVerbosity = QtVsToolsPackage.Instance.Options.BuildLoggerVerbosity;
+            if (QtVsToolsLegacyPackage.Instance.Options.BuildDebugInformation)
+                loggerVerbosity = QtVsToolsLegacyPackage.Instance.Options.BuildLoggerVerbosity;
             var buildParams = new BuildParameters()
             {
                 Loggers = (loggerVerbosity != LoggerVerbosity.Quiet)
@@ -283,7 +283,7 @@ namespace QtVsTools.QtMsBuild
                 hostServices: null,
                 flags: BuildRequestDataFlags.ProvideProjectStateAfterBuild);
 
-            if (QtVsToolsPackage.Instance.Options.BuildDebugInformation) {
+            if (QtVsToolsLegacyPackage.Instance.Options.BuildDebugInformation) {
                 Messages.Print(string.Format(
                     "{0:HH:mm:ss.FFF} QtProjectBuild({1}): Build [{2}] {3}",
                     DateTime.Now, Thread.CurrentThread.ManagedThreadId,
@@ -305,7 +305,7 @@ namespace QtVsTools.QtMsBuild
                     result = BuildManager.DefaultBuildManager.Build(
                         buildParams, buildRequest);
                 } catch (InvalidOperationException) {
-                    if (QtVsToolsPackage.Instance.Options.BuildDebugInformation) {
+                    if (QtVsToolsLegacyPackage.Instance.Options.BuildDebugInformation) {
                         Messages.Print(string.Format(
                             "{0:HH:mm:ss.FFF} QtProjectBuild({1}): [{2}] "
                             + "Warning: Another build is in progress; waiting...",
@@ -317,7 +317,7 @@ namespace QtVsTools.QtMsBuild
                 }
             }
 
-            if (QtVsToolsPackage.Instance.Options.BuildDebugInformation) {
+            if (QtVsToolsLegacyPackage.Instance.Options.BuildDebugInformation) {
                 string resMsg;
                 StringBuilder resInfo = new StringBuilder();
                 if (result.OverallResult == BuildResultCode.Success) {
@@ -373,7 +373,7 @@ namespace QtVsTools.QtMsBuild
         async Task BuildAsync()
         {
             if (LoggerVerbosity != LoggerVerbosity.Quiet) {
-                Messages.Print(clear: !QtVsToolsPackage.Instance.Options.BuildDebugInformation, activate: true,
+                Messages.Print(clear: !QtVsToolsLegacyPackage.Instance.Options.BuildDebugInformation, activate: true,
                     text: string.Format(
 @"== {0}: starting build...
   * Properties: {1}
diff --git a/QtVsTools.Package/QtMsBuild/QtProjectIntelliSense.cs b/QtVsTools.Package/QtMsBuild/QtProjectIntelliSense.cs
index 2597e22f..f670d962 100644
--- a/QtVsTools.Package/QtMsBuild/QtProjectIntelliSense.cs
+++ b/QtVsTools.Package/QtMsBuild/QtProjectIntelliSense.cs
@@ -53,7 +53,7 @@ namespace QtVsTools.QtMsBuild
             if (project == null || !QtProjectTracker.IsTracked(project.FullName))
                 return;
 
-            if (QtVsToolsPackage.Instance.Options.BuildDebugInformation) {
+            if (QtVsToolsLegacyPackage.Instance.Options.BuildDebugInformation) {
                 Messages.Print(string.Format(
                     "{0:HH:mm:ss.FFF} QtProjectIntellisense({1}): Refreshing: [{2}] {3}",
                     DateTime.Now, Thread.CurrentThread.ManagedThreadId,
@@ -80,7 +80,7 @@ namespace QtVsTools.QtMsBuild
             if (selectedFiles != null)
                 properties["SelectedFiles"] = string.Join(";", selectedFiles);
             var targets = new List<string> { "QtVars" };
-            if (QtVsToolsPackage.Instance.Options.BuildRunQtTools)
+            if (QtVsToolsLegacyPackage.Instance.Options.BuildRunQtTools)
                 targets.Add("Qt");
 
             IEnumerable<string> configs;
diff --git a/QtVsTools.Package/QtMsBuild/QtProjectTracker.cs b/QtVsTools.Package/QtMsBuild/QtProjectTracker.cs
index 06a42665..671943cf 100644
--- a/QtVsTools.Package/QtMsBuild/QtProjectTracker.cs
+++ b/QtVsTools.Package/QtMsBuild/QtProjectTracker.cs
@@ -88,7 +88,7 @@ namespace QtVsTools.QtMsBuild
 
         public static void Add(EnvDTE.Project project)
         {
-            if (!QtVsToolsPackage.Instance.Options.ProjectTracking)
+            if (!QtVsToolsLegacyPackage.Instance.Options.ProjectTracking)
                 return;
 
             ThreadHelper.ThrowIfNotOnUIThread();
@@ -123,17 +123,17 @@ namespace QtVsTools.QtMsBuild
 
         static async Task InitDispatcherLoopAsync()
         {
-            while (!QtVsToolsPackage.Instance.Zombied) {
+            while (!QtVsToolsLegacyPackage.Instance.Zombied) {
                 while (InitQueue.IsEmpty)
                     await Task.Delay(100);
                 if (InitQueue.TryDequeue(out QtProjectTracker tracker)) {
                     if (InitStatus == null) {
-                        await QtVsToolsPackage.Instance.JoinableTaskFactory
+                        await QtVsToolsLegacyPackage.Instance.JoinableTaskFactory
                             .SwitchToMainThreadAsync();
                         tracker.BeginInitStatus();
                         await TaskScheduler.Default;
                     } else {
-                        await QtVsToolsPackage.Instance.JoinableTaskFactory
+                        await QtVsToolsLegacyPackage.Instance.JoinableTaskFactory
                             .SwitchToMainThreadAsync();
                         tracker.UpdateInitStatus(0);
                         await TaskScheduler.Default;
@@ -186,7 +186,7 @@ namespace QtVsTools.QtMsBuild
                 var configProject = await UnconfiguredProject.LoadConfiguredProjectAsync(config);
                 UpdateInitStatus(p += d);
                 configProject.ProjectUnloading += OnProjectUnloadingAsync;
-                if (QtVsToolsPackage.Instance.Options.BuildDebugInformation) {
+                if (QtVsToolsLegacyPackage.Instance.Options.BuildDebugInformation) {
                     Messages.Print(string.Format(
                         "{0:HH:mm:ss.FFF} QtProjectTracker({1}): Started tracking [{2}] {3}",
                         DateTime.Now, Thread.CurrentThread.ManagedThreadId,
@@ -199,7 +199,7 @@ namespace QtVsTools.QtMsBuild
         async Task OnProjectUnloadingAsync(object sender, EventArgs args)
         {
             if (sender is ConfiguredProject project) {
-                if (QtVsToolsPackage.Instance.Options.BuildDebugInformation) {
+                if (QtVsToolsLegacyPackage.Instance.Options.BuildDebugInformation) {
                     Messages.Print(string.Format(
                         "{0:HH:mm:ss.FFF} QtProjectTracker: Stopped tracking [{1}] {2}",
                         DateTime.Now,
diff --git a/QtVsTools.Package/QtVsTools.Package.csproj b/QtVsTools.Package/QtVsTools.Package.csproj
index ed1c7e7a..0fdcc16c 100644
--- a/QtVsTools.Package/QtVsTools.Package.csproj
+++ b/QtVsTools.Package/QtVsTools.Package.csproj
@@ -50,7 +50,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <RootNamespace>QtVsTools.Package</RootNamespace>
-    <AssemblyName>QtVsTools</AssemblyName>
+    <AssemblyName>QtVsToolsLegacy</AssemblyName>
     <ProjectGuid>{671C3821-7BD9-4C16-9A8D-EC1470EDBC9B}</ProjectGuid>
     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
@@ -337,6 +337,7 @@
     <EmbeddedResource Include="VSPackage.resx">
       <MergeWithCTO>true</MergeWithCTO>
       <ManifestResourceName>VSPackage</ManifestResourceName>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <Compile Include="Legacy\ChangeFor.cs" />
     <Compile Include="Package\DteEventsHandler.cs" />
diff --git a/QtVsTools.Package/QtVsToolsPackage.cs b/QtVsTools.Package/QtVsToolsPackage.cs
index 63b35302..885a4130 100644
--- a/QtVsTools.Package/QtVsToolsPackage.cs
+++ b/QtVsTools.Package/QtVsToolsPackage.cs
@@ -53,7 +53,7 @@ namespace QtVsTools
 
     using static SyntaxAnalysis.RegExpr;
 
-    [Guid(QtVsToolsPackage.PackageGuidString)]
+    [Guid(QtVsToolsLegacyPackage.PackageGuidString)]
     [InstalledProductRegistration("#110", "#112", Version.PRODUCT_VERSION, IconResourceID = 400)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
@@ -96,9 +96,9 @@ namespace QtVsTools
     [ProvideOptionPage(typeof(Legacy.QtOptionsPage),
         "Qt", "Legacy Project Format", 0, 0, true, Sort = 2)]
 
-    public sealed class QtVsToolsPackage : AsyncPackage, IVsServiceProvider, IProjectTracker
+    public sealed class QtVsToolsLegacyPackage : AsyncPackage, IVsServiceProvider, IProjectTracker
     {
-        public const string PackageGuidString = "15021976-647e-4876-9040-2507afde45d2";
+        public const string PackageGuidString = "6E7FA583-5FAA-4EC9-9E90-4A0AE5FD61EE";
         const StringComparison IGNORE_CASE = StringComparison.InvariantCultureIgnoreCase;
 
         public DTE Dte { get; private set; }
@@ -113,8 +113,8 @@ namespace QtVsTools
 
         static readonly EventWaitHandle initDone = new EventWaitHandle(false, EventResetMode.ManualReset);
 
-        static QtVsToolsPackage instance = null;
-        public static QtVsToolsPackage Instance
+        static QtVsToolsLegacyPackage instance = null;
+        public static QtVsToolsLegacyPackage Instance
         {
             get
             {
@@ -151,7 +151,7 @@ namespace QtVsTools
         private string visualizersPath;
 
 
-        public QtVsToolsPackage()
+        public QtVsToolsLegacyPackage()
         {
         }
 
@@ -285,7 +285,7 @@ namespace QtVsTools
                 CopyNatvisFiles();
 
                 Messages.Print(string.Format("\r\n"
-                    + "== Qt Visual Studio Tools version {0}\r\n"
+                    + "== LEGACY Qt Visual Studio Tools version {0}\r\n"
                     + "\r\n"
                     + "   Initialized in: {1:0.##} msecs\r\n"
                     + "   Main (UI) thread: {2:0.##} msecs\r\n"
@@ -294,15 +294,6 @@ namespace QtVsTools
                     , (timeUiThreadEnd - timeUiThreadBegin).TotalMilliseconds
                     ));
 
-                var devRelease = await GetLatestDevelopmentReleaseAsync();
-                if (devRelease != null) {
-                    Messages.Print(string.Format(@"
-    ================================================================
-      Qt Visual Studio Tools version {1} PREVIEW available at:
-      {0}{1}/
-    ================================================================",
-                        urlDownloadQtIo, devRelease));
-                }
             } catch (Exception exception) {
                 exception.Log();
             } finally {
diff --git a/QtVsTools.Package/VSPackage.resx b/QtVsTools.Package/VSPackage.resx
index 05d389ac..2cb768e3 100644
--- a/QtVsTools.Package/VSPackage.resx
+++ b/QtVsTools.Package/VSPackage.resx
@@ -162,7 +162,7 @@
     <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
         PublicKeyToken=b77a5c561934e089" />
     <data name="110" xml:space="preserve">
-    <value>Qt Visual Studio Tools</value>
+    <value>LEGACY Qt Visual Studio Tools</value>
   </data>
     <data name="112" xml:space="preserve">
     <value>The Qt Visual Studio Tools allow developers to use the standard development environment without having to worry about any Qt-related build steps or tools.</value>
diff --git a/QtVsTools.Package/source.extension.vsixmanifest_TT b/QtVsTools.Package/source.extension.vsixmanifest_TT
index bb4b9ee9..60155b27 100644
--- a/QtVsTools.Package/source.extension.vsixmanifest_TT
+++ b/QtVsTools.Package/source.extension.vsixmanifest_TT
@@ -37,7 +37,7 @@
     string VersionRange = "";
     switch (VS_NAME) {
         case "2022":
-            PackageId = "QtVsTools.8e827d74-6fc4-40a6-a3aa-faf19652b3b8";
+            PackageId = "QtVsTools.f3b37dcd-515b-46f9-9069-aa09693e5f16";
             VsProducts = new[]
             {
                 "Microsoft.VisualStudio.Pro",
@@ -49,7 +49,7 @@
             VersionRange = "[17.0, 18.0)";
             break;
         case "2019":
-            PackageId = "QtVsTools.bf3c71c0-ab41-4427-ada9-9b3813d89ff5";
+            PackageId = "QtVsTools.806c5209-1581-4e75-b6c7-e376fa44321e";
             VsProducts = new[]
             {
                 "Microsoft.VisualStudio.Pro",
@@ -60,18 +60,6 @@
             };
             VersionRange = "[16.0, 17.0)";
             break;
-        case "2017":
-            PackageId = "QtVsTools.13121978-cd02-4fd0-89bd-e36f85abe16a";
-            VsProducts = new[]
-            {
-                "Microsoft.VisualStudio.Pro",
-                "Microsoft.VisualStudio.Premium",
-                "Microsoft.VisualStudio.Ultimate",
-                "Microsoft.VisualStudio.Community",
-                "Microsoft.VisualStudio.Enterprise"
-            };
-            VersionRange = "[15.0.28010.0,16.0)";
-            break;
     }
 #>
 -->
@@ -85,7 +73,7 @@
       Version="<#=QT_VS_TOOLS_VERSION_MANIFEST#>"
       Language="en-US"
       Publisher="The Qt Company Ltd." />
-    <DisplayName>Qt Visual Studio Tools</DisplayName>
+    <DisplayName>LEGACY Qt Visual Studio Tools</DisplayName>
     <Description xml:space="preserve">The Qt VS Tools for Visual Studio <#=VS_NAME#> allow developers to use the standard development environment without having to worry about any Qt-related build steps or tools.</Description>
     <#=XML_COMMENT_BEGIN#> END Generated Text -->
     <MoreInfo>https://doc.qt.io/qtvstools/index.html</MoreInfo>
diff --git a/vstools.bat b/vstools.bat
index d0519a61..8aa0008c 100644
--- a/vstools.bat
+++ b/vstools.bat
@@ -410,15 +410,15 @@ FOR %%v IN (%VS_VERSIONS%) DO (
             ECHO ## Deploying to %DEPLOY_DIR%...
             ECHO ################################################################################
             IF "%%t"=="" (
-                ECHO   QtVsTools.vsix -^> qt-vsaddin-msvc%%e-%%q.%%r.%%s.vsix
+                ECHO   QtVsToolsLegacy.vsix -^> qt-LEGACYvsaddin-msvc%%e-%%q.%%r.%%s.vsix
                 MD "%DEPLOY_DIR%\%%q.%%r.%%s.0" > NUL 2>&1
-                COPY /Y QtVsTools.Package\bin\Release\QtVsTools.vsix ^
-                    "%DEPLOY_DIR%\%%q.%%r.%%s.0\qt-vsaddin-msvc%%e-%%q.%%r.%%s.vsix"
+                COPY /Y QtVsTools.Package\bin\Release\QtVsToolsLegacy.vsix ^
+                    "%DEPLOY_DIR%\%%q.%%r.%%s.0\qt-LEGACYvsaddin-msvc%%e-%%q.%%r.%%s.vsix"
             ) ELSE (
-                ECHO   QtVsTools.vsix -^> qt-vsaddin-msvc%%e-%%q.%%r.%%s-rev.%%t.vsix
+                ECHO   QtVsToolsLegacy.vsix -^> qt-LEGACYvsaddin-msvc%%e-%%q.%%r.%%s-rev.%%t.vsix
                 MD "%DEPLOY_DIR%\%%q.%%r.%%s.%%t" > NUL 2>&1
-                COPY /Y QtVsTools.Package\bin\Release\QtVsTools.vsix ^
-                    "%DEPLOY_DIR%\%%q.%%r.%%s.%%t\qt-vsaddin-msvc%%e-%%q.%%r.%%s-rev.%%t.vsix"
+                COPY /Y QtVsTools.Package\bin\Release\QtVsToolsLegacy.vsix ^
+                    "%DEPLOY_DIR%\%%q.%%r.%%s.%%t\qt-LEGACYvsaddin-msvc%%e-%%q.%%r.%%s-rev.%%t.vsix"
             )
             ECHO.
         )
@@ -429,14 +429,12 @@ FOR %%v IN (%VS_VERSIONS%) DO (
             ECHO ################################################################################
             ECHO Removing previous installation...
             IF "%%e"=="2022" (
-                VSIXInstaller /uninstall:QtVsTools.8e827d74-6fc4-40a6-a3aa-faf19652b3b8
+                VSIXInstaller /uninstall:QtVsTools.f3b37dcd-515b-46f9-9069-aa09693e5f16
             ) ELSE IF "%%e"=="2019" (
-                VSIXInstaller /uninstall:QtVsTools.bf3c71c0-ab41-4427-ada9-9b3813d89ff5
-            ) ELSE IF "%%e"=="2017" (
-                VSIXInstaller /uninstall:QtVsTools.13121978-cd02-4fd0-89bd-e36f85abe16a
+                VSIXInstaller /uninstall:QtVsTools.806c5209-1581-4e75-b6c7-e376fa44321e
             )
             ECHO Installing...
-            VSIXInstaller QtVsTools.Package\bin\Release\QtVsTools.vsix
+            VSIXInstaller QtVsTools.Package\bin\Release\QtVsToolsLegacy.vsix
             ECHO.
         )