diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json
index 49c4f00bc42..ca5e01cadc0 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json
@@ -6,8 +6,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project for creating a .NET WPF Application",
   "groupIdentity": "Microsoft.Common.WPF",
-  "precedence": "3000",
-  "identity": "Microsoft.Common.WPF",
+  "precedence": "7000",
+  "identity": "Microsoft.Common.WPF.CSharp.7.0",
   "shortName": "wpf",
   "tags": {
     "language": "C#",
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json
index 3586a53d693..05ac4a1e5e2 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json
@@ -6,8 +6,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project for creating a .NET WPF Application",
   "groupIdentity": "Microsoft.Common.WPF",
-  "precedence": "3000",
-  "identity": "Microsoft.Common.WPF.VisualBasic.5.0",
+  "precedence": "7000",
+  "identity": "Microsoft.Common.WPF.VisualBasic.7.0",
   "shortName": "wpf",
   "tags": {
     "language": "VB",
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json
index 2da23d367f5..18df7bcc996 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json
@@ -6,8 +6,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project for creating a class library that targets a .NET WPF Application",
   "groupIdentity": "Microsoft.Common.WPF.Library",
-  "precedence": "3000",
-  "identity": "Microsoft.Common.WPF.Library.CSharp.5.0",
+  "precedence": "7000",
+  "identity": "Microsoft.Common.WPF.Library.CSharp.7.0",
   "shortName": "wpflib",
   "tags": {
     "language": "C#",
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json
index b2b948b1141..ee45d421d35 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json
@@ -6,8 +6,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project for creating a class library that targets a .NET WPF Application",
   "groupIdentity": "Microsoft.Common.WPF.Library",
-  "precedence": "3000",
-  "identity": "Microsoft.Common.WPF.Library.VisualBasic.5.0",
+  "precedence": "7000",
+  "identity": "Microsoft.Common.WPF.Library.VisualBasic.7.0",
   "shortName": "wpflib",
   "tags": {
     "language": "VB",
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json
index dc99028b345..6897d626fb8 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json
@@ -6,8 +6,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project for creating a custom control library for .NET WPF Applications",
   "groupIdentity": "Microsoft.Common.WPF.CustomControl",
-  "precedence": "3000",
-  "identity": "Microsoft.Common.WPF.CustomControl.CSharp.5.0",
+  "precedence": "7000",
+  "identity": "Microsoft.Common.WPF.CustomControl.CSharp.7.0",
   "shortName": "wpfcustomcontrollib",
   "tags": {
     "language": "C#",
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/template.json
index 87493894219..5ad29de1ee6 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/template.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/template.json
@@ -6,8 +6,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project for creating a custom control library for .NET WPF Applications",
   "groupIdentity": "Microsoft.Common.WPF.CustomControl",
-  "precedence": "3000",
-  "identity": "Microsoft.Common.WPF.CustomControl.VisualBasic.5.0",
+  "precedence": "7000",
+  "identity": "Microsoft.Common.WPF.CustomControl.VisualBasic.7.0",
   "shortName": "wpfcustomcontrollib",
   "tags": {
     "language": "VB",
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/template.json
index 0efdaab2314..9de54fcca3f 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/template.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/template.json
@@ -6,8 +6,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project for creating a user control library for .NET WPF Applications",
   "groupIdentity": "Microsoft.Common.WPF.Control",
-  "precedence": "3000",
-  "identity": "Microsoft.Common.WPF.Control.CSharp.5.0",
+  "precedence": "7000",
+  "identity": "Microsoft.Common.WPF.Control.CSharp.7.0",
   "shortName": "wpfusercontrollib",
   "tags": {
     "language": "C#",
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/template.json
index 6149357bed4..31cd1467077 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/template.json
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/template.json
@@ -6,8 +6,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project for creating a user control library for .NET WPF Applications",
   "groupIdentity": "Microsoft.Common.WPF.Control",
-  "precedence": "3000",
-  "identity": "Microsoft.Common.WPF.Control.VisualBasic.5.0",
+  "precedence": "7000",
+  "identity": "Microsoft.Common.WPF.Control.VisualBasic.7.0",
   "shortName": "wpfusercontrollib",
   "tags": {
     "language": "VB",