diff --git a/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft b/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
index 10a99da554..27dca89820 100644
--- a/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
+++ b/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
@@ -5,7 +5,7 @@
 		  name        = "${res:Templates.File.WinFXFlowDocument.Name}"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
-		  subcategory = "WinFX"
+		  subcategory = "WPF"
 		  defaultname = "FlowDocument${Number}.xaml"
 		  language    = "XML"/>
 	 
diff --git a/data/templates/file/CSharp/CSharp.WPFPage.xft b/data/templates/file/CSharp/CSharp.WPFPage.xft
index b3a67d31e4..e95b252b84 100644
--- a/data/templates/file/CSharp/CSharp.WPFPage.xft
+++ b/data/templates/file/CSharp/CSharp.WPFPage.xft
@@ -5,7 +5,7 @@
 		  name        = "${res:Templates.File.WinFXPage.Name}"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
-		  subcategory = "WinFX"
+		  subcategory = "WPF"
 		  defaultname = "Page${Number}.xaml"
 		  language    = "C#"/>
 	 
diff --git a/data/templates/file/CSharp/CSharp.WPFPageFunction.xft b/data/templates/file/CSharp/CSharp.WPFPageFunction.xft
index 80a710fdeb..4ddf86058d 100644
--- a/data/templates/file/CSharp/CSharp.WPFPageFunction.xft
+++ b/data/templates/file/CSharp/CSharp.WPFPageFunction.xft
@@ -5,7 +5,7 @@
 		  name        = "${res:Templates.File.WinFXPageFunction.Name}"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
-		  subcategory = "WinFX"
+		  subcategory = "WPF"
 		  defaultname = "PageFunction${Number}.xaml"
 		  language    = "XML"/>
 	 
diff --git a/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft b/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
index 0e98f46dc7..3f78a6756a 100644
--- a/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
+++ b/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
@@ -4,7 +4,7 @@
 	<Config
 		  name        = "${res:Templates.File.WinFXResourceDictionary.Name}"
 		  icon        = "Icons.32x32.XMLFileIcon"
-		  subcategory = "WinFX"
+		  subcategory = "WPF"
 		  category    = "C#"
 		  defaultname = "Dictionary${Number}.xaml"
 		  language    = "XML"/>
diff --git a/data/templates/file/CSharp/CSharp.WPFUserControl.xft b/data/templates/file/CSharp/CSharp.WPFUserControl.xft
index 2643f39d30..941456c79c 100644
--- a/data/templates/file/CSharp/CSharp.WPFUserControl.xft
+++ b/data/templates/file/CSharp/CSharp.WPFUserControl.xft
@@ -5,7 +5,7 @@
 		  name        = "${res:Templates.File.WinFXUserControl.Name}"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
-		  subcategory = "WinFX"
+		  subcategory = "WPF"
 		  defaultname = "UserControl${Number}.xaml"
 		  language    = "C#"/>
 	 
diff --git a/data/templates/file/CSharp/CSharp.WPFWindow.xft b/data/templates/file/CSharp/CSharp.WPFWindow.xft
index d3109fc5a6..4d9b60aa22 100644
--- a/data/templates/file/CSharp/CSharp.WPFWindow.xft
+++ b/data/templates/file/CSharp/CSharp.WPFWindow.xft
@@ -5,7 +5,7 @@
 		  name        = "${res:Templates.File.WinFXWindow.Name}"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
-		  subcategory = "WinFX"
+		  subcategory = "WPF"
 		  defaultname = "Window${Number}.xaml"
 		  language    = "C#"/>