diff --git a/data/templates/file/VB/VB.Empty.xft b/data/templates/file/VB/VB.Empty.xft
index 9598b5bc22..ae3c08159d 100644
--- a/data/templates/file/VB/VB.Empty.xft
+++ b/data/templates/file/VB/VB.Empty.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.EmptyFile.Name}"
-		  icon        = "VBNet.File.EmptyFile"
+		  icon        = "VB.File.EmptyFile"
 		  category    = "VB"
 		  defaultname = "Empty${Number}.vb"
 		  language    = "VBNET"/>
diff --git a/data/templates/file/VB/VB.EmptyClass.xft b/data/templates/file/VB/VB.EmptyClass.xft
index 0cf5acb5b1..f035f7deb8 100644
--- a/data/templates/file/VB/VB.EmptyClass.xft
+++ b/data/templates/file/VB/VB.EmptyClass.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.EmptyClass.Name}"
-		icon        = "VBNet.File.NewClass"
+		icon        = "VB.File.NewClass"
 		category    = "VB"
 		defaultname = "Class${Number}.vb"
 		language    = "VBNET"
diff --git a/data/templates/file/VB/VB.Exception.xft b/data/templates/file/VB/VB.Exception.xft
index 8853cf8f47..77c92f1eca 100644
--- a/data/templates/file/VB/VB.Exception.xft
+++ b/data/templates/file/VB/VB.Exception.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.Exception.Name}"
-		  icon        = "VBNet.File.NewClass"
+		  icon        = "VB.File.NewClass"
 		  category    = "VB"
 		  defaultname = "Exception.vb"
 		  language    = "VBNet"/>
diff --git a/data/templates/file/VB/VB.Forms.Form.xft b/data/templates/file/VB/VB.Forms.Form.xft
index 82e31320bc..9f3d6ff723 100644
--- a/data/templates/file/VB/VB.Forms.Form.xft
+++ b/data/templates/file/VB/VB.Forms.Form.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.WindowsForm.Name}"
-		icon        = "VBNet.File.Form"
+		icon        = "VB.File.Form"
 		category    = "VB"
 		subcategory = "${res:Templates.File.Categories.WindowsApplications}"
 		defaultname = "Form${Number}.vb"
diff --git a/data/templates/file/VB/VB.Forms.UserControl.xft b/data/templates/file/VB/VB.Forms.UserControl.xft
index a1628cbc5b..c652c7d949 100644
--- a/data/templates/file/VB/VB.Forms.UserControl.xft
+++ b/data/templates/file/VB/VB.Forms.UserControl.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.WindowsUserControl.Name}"
-		icon        = "VBNet.File.Form"
+		icon        = "VB.File.Form"
 		category    = "VB"
 		subcategory = "${res:Templates.File.Categories.WindowsApplications}"
 		defaultname = "UserControl${Number}.vb"
diff --git a/data/templates/file/VB/VB.Interface.xft b/data/templates/file/VB/VB.Interface.xft
index 2cc9dd7f1b..e12302e1bc 100644
--- a/data/templates/file/VB/VB.Interface.xft
+++ b/data/templates/file/VB/VB.Interface.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.Interface.Name}"
-		icon        = "VBNet.File.NewClass"
+		icon        = "VB.File.NewClass"
 		category    = "VB"
 		defaultname = "Interface${Number}.vb"
 		language    = "VBNET"
diff --git a/data/templates/file/VB/VB.Module.xft b/data/templates/file/VB/VB.Module.xft
index 45cb550018..9e8c046688 100644
--- a/data/templates/file/VB/VB.Module.xft
+++ b/data/templates/file/VB/VB.Module.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.Module.Name}"
-		  icon        = "VBNet.File.NewClass"
+		  icon        = "VB.File.NewClass"
 		  category    = "VB"
 		  defaultname = "Module${Number}.vb"
 		  language    = "VBNET"/>
diff --git a/data/templates/file/VB/VB.Mvc.Controller.xft b/data/templates/file/VB/VB.Mvc.Controller.xft
index da57343ceb..056e226471 100644
--- a/data/templates/file/VB/VB.Mvc.Controller.xft
+++ b/data/templates/file/VB/VB.Mvc.Controller.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="MVC Controller"
-		icon="VBNet.File.NewClass"
+		icon="VB.File.NewClass"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="Controller${Number}.vb"
diff --git a/data/templates/file/VB/VB.Mvc.Razor.LayoutPage.xft b/data/templates/file/VB/VB.Mvc.Razor.LayoutPage.xft
index 0e3477cd29..13b166eaeb 100644
--- a/data/templates/file/VB/VB.Mvc.Razor.LayoutPage.xft
+++ b/data/templates/file/VB/VB.Mvc.Razor.LayoutPage.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="Razor Layout Page"
-		icon="VBNet.File.MvcRazorFile"
+		icon="VB.File.MvcRazorFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="_LayoutPage${Number}.vbhtml"
diff --git a/data/templates/file/VB/VB.Mvc.Razor.PartialPage.xft b/data/templates/file/VB/VB.Mvc.Razor.PartialPage.xft
index 4feb2bb642..bb37436d13 100644
--- a/data/templates/file/VB/VB.Mvc.Razor.PartialPage.xft
+++ b/data/templates/file/VB/VB.Mvc.Razor.PartialPage.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="Razor Partial Page"
-		icon="VBNet.File.MvcRazorFile"
+		icon="VB.File.MvcRazorFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="_PartialPage${Number}.vbhtml"
diff --git a/data/templates/file/VB/VB.Mvc.Razor.ViewPage.xft b/data/templates/file/VB/VB.Mvc.Razor.ViewPage.xft
index 4233395719..45bacead51 100644
--- a/data/templates/file/VB/VB.Mvc.Razor.ViewPage.xft
+++ b/data/templates/file/VB/VB.Mvc.Razor.ViewPage.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="Razor View Page"
-		icon="VBNet.File.MvcRazorFile"
+		icon="VB.File.MvcRazorFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewPage${Number}.vbhtml"
diff --git a/data/templates/file/VB/VB.Mvc.ViewContentPage.xft b/data/templates/file/VB/VB.Mvc.ViewContentPage.xft
index c728328281..c927b6ed77 100644
--- a/data/templates/file/VB/VB.Mvc.ViewContentPage.xft
+++ b/data/templates/file/VB/VB.Mvc.ViewContentPage.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="MVC View Content Page"
-		icon="VBNet.File.WebFile"
+		icon="VB.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewContentPage${Number}.aspx"
diff --git a/data/templates/file/VB/VB.Mvc.ViewMasterPage.xft b/data/templates/file/VB/VB.Mvc.ViewMasterPage.xft
index 9e7d865cb9..096c4a40ae 100644
--- a/data/templates/file/VB/VB.Mvc.ViewMasterPage.xft
+++ b/data/templates/file/VB/VB.Mvc.ViewMasterPage.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="MVC View Master Page"
-		icon="VBNet.File.WebFile"
+		icon="VB.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewMasterPage${Number}.master"
diff --git a/data/templates/file/VB/VB.Mvc.ViewPage.xft b/data/templates/file/VB/VB.Mvc.ViewPage.xft
index 6d8b4fbb58..23c58eaf28 100644
--- a/data/templates/file/VB/VB.Mvc.ViewPage.xft
+++ b/data/templates/file/VB/VB.Mvc.ViewPage.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="MVC View Page"
-		icon="VBNet.File.WebFile"
+		icon="VB.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewPage${Number}.aspx"
diff --git a/data/templates/file/VB/VB.Mvc.ViewUserControl.xft b/data/templates/file/VB/VB.Mvc.ViewUserControl.xft
index bc22c008fc..532a2211d0 100644
--- a/data/templates/file/VB/VB.Mvc.ViewUserControl.xft
+++ b/data/templates/file/VB/VB.Mvc.ViewUserControl.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="MVC View User Control"
-		icon="VBNet.File.WebFile"
+		icon="VB.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewUserControl${Number}.ascx"
diff --git a/data/templates/file/VB/VB.MyExtensionClass.xft b/data/templates/file/VB/VB.MyExtensionClass.xft
index 22a9b7ad63..b5bc973a03 100644
--- a/data/templates/file/VB/VB.MyExtensionClass.xft
+++ b/data/templates/file/VB/VB.MyExtensionClass.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.MyExtensionClass.Name}"
-		icon        = "VBNet.File.NewClass"
+		icon        = "VB.File.NewClass"
 		category    = "VB"
 		defaultname = "Extension${Number}.vb"
 		language    = "VBNET"
diff --git a/data/templates/file/VB/VB.Patterns.Singleton.xft b/data/templates/file/VB/VB.Patterns.Singleton.xft
index 357c778012..6b61ecc48b 100644
--- a/data/templates/file/VB/VB.Patterns.Singleton.xft
+++ b/data/templates/file/VB/VB.Patterns.Singleton.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.SingletonClass.Name}"
-		icon        = "VBNet.File.NewClass"
+		icon        = "VB.File.NewClass"
 		category    = "VB"
 		defaultname = "SingletonClass${Number}.vb"
 		language    = "VB"
diff --git a/data/templates/file/VB/VB.Structure.xft b/data/templates/file/VB/VB.Structure.xft
index c4dbac74db..51505f0fdd 100644
--- a/data/templates/file/VB/VB.Structure.xft
+++ b/data/templates/file/VB/VB.Structure.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.Structure.Name}"
-		  icon        = "VBNet.File.NewClass"
+		  icon        = "VB.File.NewClass"
 		  category    = "VB"
 		  defaultname = "Structure${Number}.vb"
 		  language    = "VBNET"/>
diff --git a/data/templates/file/VB/VB.UnitTest.xft b/data/templates/file/VB/VB.UnitTest.xft
index 1e16516821..7af10eefc8 100644
--- a/data/templates/file/VB/VB.UnitTest.xft
+++ b/data/templates/file/VB/VB.UnitTest.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.UnitTest.Name}"
-		  icon        = "VBNet.File.FullFile"
+		  icon        = "VB.File.FullFile"
 		  category    = "VB"
 		  defaultname = "Test${Number}.vb"
 		  language    = "VBNET"/>
diff --git a/data/templates/file/VB/VB.WPFFlowDocument.xft b/data/templates/file/VB/VB.WPFFlowDocument.xft
index 5e970e1a02..932485e345 100644
--- a/data/templates/file/VB/VB.WPFFlowDocument.xft
+++ b/data/templates/file/VB/VB.WPFFlowDocument.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXFlowDocument.Name}"
-		  icon        = "VBNet.File.WPFFlowDocument"
+		  icon        = "VB.File.WPFFlowDocument"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "FlowDocument${Number}.xaml"
diff --git a/data/templates/file/VB/VB.WPFPage.xft b/data/templates/file/VB/VB.WPFPage.xft
index d99b625884..0dd8669265 100644
--- a/data/templates/file/VB/VB.WPFPage.xft
+++ b/data/templates/file/VB/VB.WPFPage.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXPage.Name}"
-		  icon        = "VBNet.File.WPFPage"
+		  icon        = "VB.File.WPFPage"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "Page${Number}.xaml"
diff --git a/data/templates/file/VB/VB.WPFPageFunction.xft b/data/templates/file/VB/VB.WPFPageFunction.xft
index 513ced2e9f..2810e22fa4 100644
--- a/data/templates/file/VB/VB.WPFPageFunction.xft
+++ b/data/templates/file/VB/VB.WPFPageFunction.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXPageFunction.Name}"
-		  icon        = "VBNet.File.WPFPageFunction"
+		  icon        = "VB.File.WPFPageFunction"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "PageFunction${Number}.xaml"
diff --git a/data/templates/file/VB/VB.WPFResourceDictionary.xft b/data/templates/file/VB/VB.WPFResourceDictionary.xft
index 2a2f7ae403..b0a1ae2b32 100644
--- a/data/templates/file/VB/VB.WPFResourceDictionary.xft
+++ b/data/templates/file/VB/VB.WPFResourceDictionary.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXResourceDictionary.Name}"
-		  icon        = "VBNet.File.WPFResourceDictionary"
+		  icon        = "VB.File.WPFResourceDictionary"
 		  subcategory = "WPF"
 		  category    = "VB"
 		  defaultname = "Dictionary${Number}.xaml"
diff --git a/data/templates/file/VB/VB.WPFUserControl.xft b/data/templates/file/VB/VB.WPFUserControl.xft
index 7c92973c91..fc9da148d3 100644
--- a/data/templates/file/VB/VB.WPFUserControl.xft
+++ b/data/templates/file/VB/VB.WPFUserControl.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXUserControl.Name}"
-		  icon        = "VBNet.File.WPFUserControl"
+		  icon        = "VB.File.WPFUserControl"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "UserControl${Number}.xaml"
diff --git a/data/templates/file/VB/VB.WPFWindow.xft b/data/templates/file/VB/VB.WPFWindow.xft
index 0c806e0879..83bcda4099 100644
--- a/data/templates/file/VB/VB.WPFWindow.xft
+++ b/data/templates/file/VB/VB.WPFWindow.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXWindow.Name}"
-		  icon        = "VBNet.File.WPFWindow"
+		  icon        = "VB.File.WPFWindow"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "Window${Number}.xaml"
diff --git a/data/templates/file/VB/VB.WcfRestService.xft b/data/templates/file/VB/VB.WcfRestService.xft
index b06fffa6d0..e9e67d1f55 100644
--- a/data/templates/file/VB/VB.WcfRestService.xft
+++ b/data/templates/file/VB/VB.WcfRestService.xft
@@ -7,7 +7,7 @@
 	
 	<Config
 		name="WCF REST Service"
-		icon="VBNet.File.NewClass"
+		icon="VB.File.NewClass"
 		category="VB"
 		subcategory="WCF"
 		defaultname="Service${Number}.svc"
diff --git a/data/templates/file/VB/VB.WcfService.xft b/data/templates/file/VB/VB.WcfService.xft
index a0d4a9fe78..298334cd11 100644
--- a/data/templates/file/VB/VB.WcfService.xft
+++ b/data/templates/file/VB/VB.WcfService.xft
@@ -7,7 +7,7 @@
 	
 	<Config
 		name="WCF Service"
-		icon="VBNet.File.NewClass"
+		icon="VB.File.NewClass"
 		category="VB"
 		subcategory="WCF"
 		defaultname="Service${Number}.svc"
diff --git a/data/templates/file/VB/VB.Web.WebControl.xft b/data/templates/file/VB/VB.Web.WebControl.xft
index 10b6085f23..bf79b18714 100644
--- a/data/templates/file/VB/VB.Web.WebControl.xft
+++ b/data/templates/file/VB/VB.Web.WebControl.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebControl.Name}"
-		icon        = "VBNet.File.WebFile"
+		icon        = "VB.File.WebFile"
 		category    = "VB"
 		subcategory = "ASP.NET"
 		defaultname = "WebControl${Number}"
diff --git a/data/templates/file/VB/VB.Web.WebForm.xft b/data/templates/file/VB/VB.Web.WebForm.xft
index 54d80baad4..b05c404623 100644
--- a/data/templates/file/VB/VB.Web.WebForm.xft
+++ b/data/templates/file/VB/VB.Web.WebForm.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebForm.Name}"
-		icon        = "VBNet.File.WebFile"
+		icon        = "VB.File.WebFile"
 		category    = "VB"
 		subcategory = "ASP.NET"
 		defaultname = "WebForm${Number}.aspx"
diff --git a/data/templates/file/VB/VB.Web.WebHandler.xft b/data/templates/file/VB/VB.Web.WebHandler.xft
index a4f249e50e..fdd15a37bf 100644
--- a/data/templates/file/VB/VB.Web.WebHandler.xft
+++ b/data/templates/file/VB/VB.Web.WebHandler.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebHandler.Name}"
-		icon        = "VBNet.File.WebFile"
+		icon        = "VB.File.WebFile"
 		category    = "VB"
 		subcategory = "ASP.NET"
 		defaultname = "WebHandler${Number}.ashx"
diff --git a/data/templates/file/VB/VB.Web.WebService.xft b/data/templates/file/VB/VB.Web.WebService.xft
index 59a9f19251..50135a4ee2 100644
--- a/data/templates/file/VB/VB.Web.WebService.xft
+++ b/data/templates/file/VB/VB.Web.WebService.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebService.Name}"
-		icon        = "VBNet.File.WebFile"
+		icon        = "VB.File.WebFile"
 		category    = "VB"
 		subcategory = "ASP.NET"
 		defaultname = "WebService${Number}.asmx"
diff --git a/data/templates/project/VB/ConsoleProject.xpt b/data/templates/project/VB/ConsoleProject.xpt
index 1df928c60e..8af5677d72 100644
--- a/data/templates/project/VB/ConsoleProject.xpt
+++ b/data/templates/project/VB/ConsoleProject.xpt
@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.ConsoleProject.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>${res:Templates.File.Categories.WindowsApplications}</Subcategory>
-		<Icon>VBNet.Project.DOSProject</Icon>
+		<Icon>VB.Project.DOSProject</Icon>
 		<Description>${res:Templates.Project.ConsoleProject.Description}</Description>
 		<SupportedTargetFrameworks>v2.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/ControlLibrary.xpt b/data/templates/project/VB/ControlLibrary.xpt
index 04139052a4..9ae5a83a7b 100644
--- a/data/templates/project/VB/ControlLibrary.xpt
+++ b/data/templates/project/VB/ControlLibrary.xpt
@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.UserControlLibrary.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>${res:Templates.File.Categories.WindowsApplications}</Subcategory>
-		<Icon>VBNet.Project.ControlLibrary</Icon>
+		<Icon>VB.Project.ControlLibrary</Icon>
 		<Description>${res:Templates.Project.UserControlLibrary.Description}</Description>
 		<SupportedTargetFrameworks>v2.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/EmptyMvc3WebProject.xpt b/data/templates/project/VB/EmptyMvc3WebProject.xpt
index 00bef54823..92e51d56e0 100644
--- a/data/templates/project/VB/EmptyMvc3WebProject.xpt
+++ b/data/templates/project/VB/EmptyMvc3WebProject.xpt
@@ -8,7 +8,7 @@
 		<Name>Empty MVC 3 Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC 3</Subcategory>
-		<Icon>VBNet.Project.WebProject</Icon>
+		<Icon>VB.Project.WebProject</Icon>
 		<Description>Empty ASP.NET MVC 3 Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/EmptyMvc4WebProject.xpt b/data/templates/project/VB/EmptyMvc4WebProject.xpt
index 3b2507d247..7f466f54d9 100644
--- a/data/templates/project/VB/EmptyMvc4WebProject.xpt
+++ b/data/templates/project/VB/EmptyMvc4WebProject.xpt
@@ -8,7 +8,7 @@
 		<Name>Empty MVC 4 Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC 4</Subcategory>
-		<Icon>VBNet.Project.WebProject</Icon>
+		<Icon>VB.Project.WebProject</Icon>
 		<Description>Empty ASP.NET MVC 4 Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/EmptyProject.xpt b/data/templates/project/VB/EmptyProject.xpt
index 488bb03cf1..83d6ffa116 100644
--- a/data/templates/project/VB/EmptyProject.xpt
+++ b/data/templates/project/VB/EmptyProject.xpt
@@ -7,7 +7,7 @@
 	<TemplateConfiguration>
 		<Name>${res:Templates.Project.EmptyProject.Name}</Name>
 		<Category>VB</Category>
-		<Icon>VBNet.Project.EmptyProject</Icon>
+		<Icon>VB.Project.EmptyProject</Icon>
 		<Description>${res:Templates.Project.EmptyProject.Description}</Description>
 		<SupportedTargetFrameworks>v2.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/FormsProject.xpt b/data/templates/project/VB/FormsProject.xpt
index f3571d7da6..e7929c9a51 100644
--- a/data/templates/project/VB/FormsProject.xpt
+++ b/data/templates/project/VB/FormsProject.xpt
@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.WindowsApplication.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>${res:Templates.File.Categories.WindowsApplications}</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VB.Project.Form</Icon>
 		<Description>${res:Templates.Project.WindowsApplication.Description}</Description>
 		<SupportedTargetFrameworks>v2.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/Library.xpt b/data/templates/project/VB/Library.xpt
index 5411dc4644..25c9772a58 100644
--- a/data/templates/project/VB/Library.xpt
+++ b/data/templates/project/VB/Library.xpt
@@ -7,7 +7,7 @@
 	<TemplateConfiguration>
 		<Name>${res:Templates.Project.ClassLibrary.Name}</Name>
 		<Category>VB</Category>
-		<Icon>VBNet.Project.Library</Icon>
+		<Icon>VB.Project.Library</Icon>
 		<Description>${res:Templates.Project.ClassLibrary.Description}</Description>
 		<SupportedTargetFrameworks>v2.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/Mvc3RazorProject.xpt b/data/templates/project/VB/Mvc3RazorProject.xpt
index a5d6585357..a54dac1cb2 100644
--- a/data/templates/project/VB/Mvc3RazorProject.xpt
+++ b/data/templates/project/VB/Mvc3RazorProject.xpt
@@ -8,7 +8,7 @@
 		<Name>Razor MVC 3 Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC 3</Subcategory>
-		<Icon>VBNet.Project.MvcRazorProject</Icon>
+		<Icon>VB.Project.MvcRazorProject</Icon>
 		<Description>ASP.NET MVC 3 Application using Razor</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/Mvc3WebProject.xpt b/data/templates/project/VB/Mvc3WebProject.xpt
index 430b2c0e8c..b057d0ef42 100644
--- a/data/templates/project/VB/Mvc3WebProject.xpt
+++ b/data/templates/project/VB/Mvc3WebProject.xpt
@@ -8,7 +8,7 @@
 		<Name>MVC 3 Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC 3</Subcategory>
-		<Icon>VBNet.Project.WebProject</Icon>
+		<Icon>VB.Project.WebProject</Icon>
 		<Description>ASP.NET MVC 3 Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/Mvc4RazorProject.xpt b/data/templates/project/VB/Mvc4RazorProject.xpt
index 3b60c64551..cae5c9fde0 100644
--- a/data/templates/project/VB/Mvc4RazorProject.xpt
+++ b/data/templates/project/VB/Mvc4RazorProject.xpt
@@ -8,7 +8,7 @@
 		<Name>Razor MVC 4 Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC 4</Subcategory>
-		<Icon>VBNet.Project.MvcRazorProject</Icon>
+		<Icon>VB.Project.MvcRazorProject</Icon>
 		<Description>ASP.NET MVC 4 Application using Razor</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/Mvc4WebProject.xpt b/data/templates/project/VB/Mvc4WebProject.xpt
index 3d771f3a1e..e5344e6130 100644
--- a/data/templates/project/VB/Mvc4WebProject.xpt
+++ b/data/templates/project/VB/Mvc4WebProject.xpt
@@ -8,7 +8,7 @@
 		<Name>MVC 4 Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC 4</Subcategory>
-		<Icon>VBNet.Project.WebProject</Icon>
+		<Icon>VB.Project.WebProject</Icon>
 		<Description>ASP.NET MVC 4 Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/NotifyIcon.xpt b/data/templates/project/VB/NotifyIcon.xpt
index 003d0d41e6..8b928a00f8 100644
--- a/data/templates/project/VB/NotifyIcon.xpt
+++ b/data/templates/project/VB/NotifyIcon.xpt
@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.SysTrayIcon.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>${res:Templates.File.Categories.WindowsApplications}</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VB.Project.Form</Icon>
 		<Description>${res:Templates.Project.SysTrayIcon.Description}</Description>
 		<SupportedTargetFrameworks>v2.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/Service.xpt b/data/templates/project/VB/Service.xpt
index 931beb5b99..3602b67810 100644
--- a/data/templates/project/VB/Service.xpt
+++ b/data/templates/project/VB/Service.xpt
@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.WindowsService.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>${res:Templates.File.Categories.WindowsApplications}</Subcategory>
-		<Icon>VBNet.Project.ServiceProject</Icon>
+		<Icon>VB.Project.ServiceProject</Icon>
 		<Description>${res:Templates.Project.WindowsService.Description}</Description>
 		<SupportedTargetFrameworks>v2.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/SharedAddin.xpt b/data/templates/project/VB/SharedAddin.xpt
index d82179e885..0d2d132a2f 100644
--- a/data/templates/project/VB/SharedAddin.xpt
+++ b/data/templates/project/VB/SharedAddin.xpt
@@ -11,7 +11,7 @@
 
 		<Name>${res:Templates.Project.SharedAddin.Name}</Name>
 		<Category>VB</Category>
-		<Icon>VBNet.Project.Library</Icon>
+		<Icon>VB.Project.Library</Icon>
 		<Description>${res:Templates.Project.SharedAddin.Description}</Description>
 		<SupportedTargetFrameworks>v2.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/SharpDevelopAddin.xpt b/data/templates/project/VB/SharpDevelopAddin.xpt
index 7a62c73355..7c659ef16a 100644
--- a/data/templates/project/VB/SharpDevelopAddin.xpt
+++ b/data/templates/project/VB/SharpDevelopAddin.xpt
@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.SharpDevelopAddin.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>SharpDevelop</Subcategory>
-		<Icon>VBNet.Project.ControlLibrary</Icon>
+		<Icon>VB.Project.ControlLibrary</Icon>
 		<Description>${res:Templates.Project.SharpDevelopAddin.Description}</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/SharpDevelopCustomTool.xpt b/data/templates/project/VB/SharpDevelopCustomTool.xpt
index 3eaa5df261..0caf06c01c 100644
--- a/data/templates/project/VB/SharpDevelopCustomTool.xpt
+++ b/data/templates/project/VB/SharpDevelopCustomTool.xpt
@@ -6,7 +6,7 @@
 		<Name>Custom Tool</Name>
 		<Category>VB</Category>
 		<Subcategory>SharpDevelop</Subcategory>
-		<Icon>VBNet.Project.ControlLibrary</Icon>
+		<Icon>VB.Project.ControlLibrary</Icon>
 		<Description>A custom tool that implements a code generator transforming a source file into an output file whenever the source is changed inside SharpDevelop</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/SharpDevelopMacro.xpt b/data/templates/project/VB/SharpDevelopMacro.xpt
index f4f214ea52..3d420079d1 100644
--- a/data/templates/project/VB/SharpDevelopMacro.xpt
+++ b/data/templates/project/VB/SharpDevelopMacro.xpt
@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.SharpDevelopMacro.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>SharpDevelop</Subcategory>
-		<Icon>VBNet.Project.ControlLibrary</Icon>
+		<Icon>VB.Project.ControlLibrary</Icon>
 		<Description>${res:Templates.Project.SharpDevelopMacro.Description}</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/SilverlightApplication.xpt b/data/templates/project/VB/SilverlightApplication.xpt
index a799bb6f35..edccb9b0da 100644
--- a/data/templates/project/VB/SilverlightApplication.xpt
+++ b/data/templates/project/VB/SilverlightApplication.xpt
@@ -5,7 +5,7 @@
 		<Name>Silverlight Application</Name>
 		<Category>VB</Category>
 		<Subcategory>Silverlight</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VB.Project.Form</Icon>
 		<Description>Default Silverlight Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/VB.WcfRestServiceProject.xpt b/data/templates/project/VB/VB.WcfRestServiceProject.xpt
index 8998ce5987..cd6a874932 100644
--- a/data/templates/project/VB/VB.WcfRestServiceProject.xpt
+++ b/data/templates/project/VB/VB.WcfRestServiceProject.xpt
@@ -10,7 +10,7 @@
 		<Name>WCF REST Service</Name>
 		<Category>VB</Category>
 		<Subcategory>WCF</Subcategory>
-		<Icon>VBNet.Project.WCFServiceProject</Icon>
+		<Icon>VB.Project.WCFServiceProject</Icon>
 		<Description>WCF REST Service</Description>
 		<SupportedTargetFrameworks>v3.5</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/VB.WcfServiceProject.xpt b/data/templates/project/VB/VB.WcfServiceProject.xpt
index 7583e7bd1a..69ea2e4626 100644
--- a/data/templates/project/VB/VB.WcfServiceProject.xpt
+++ b/data/templates/project/VB/VB.WcfServiceProject.xpt
@@ -10,7 +10,7 @@
 		<Name>WCF Service</Name>
 		<Category>VB</Category>
 		<Subcategory>WCF</Subcategory>
-		<Icon>VBNet.Project.WCFServiceProject</Icon>
+		<Icon>VB.Project.WCFServiceProject</Icon>
 		<Description>WCF Service</Description>
 		<SupportedTargetFrameworks>v3.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/WPFApplication.xpt b/data/templates/project/VB/WPFApplication.xpt
index 415ce851c4..13246ac8da 100644
--- a/data/templates/project/VB/WPFApplication.xpt
+++ b/data/templates/project/VB/WPFApplication.xpt
@@ -6,7 +6,7 @@
 		<Name>${res:Templates.Project.WinFXApplication.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>WPF</Subcategory>
-		<Icon>VBNet.Project.WPFProject</Icon>
+		<Icon>VB.Project.WPFProject</Icon>
 		<Description>${res:Templates.Project.WinFXApplication.Description}</Description>
 		<SupportedTargetFrameworks>v3.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/WPFNavigationApplication.xpt b/data/templates/project/VB/WPFNavigationApplication.xpt
index ebfa311373..3d84262b8d 100644
--- a/data/templates/project/VB/WPFNavigationApplication.xpt
+++ b/data/templates/project/VB/WPFNavigationApplication.xpt
@@ -6,7 +6,7 @@
 		<Name>${res:Templates.Project.WinFXNavigationApplication.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>WPF</Subcategory>
-		<Icon>VBNet.Project.WPFNavigationProject</Icon>
+		<Icon>VB.Project.WPFNavigationProject</Icon>
 		<Description>${res:Templates.Project.WinFXNavigationApplication.Description}</Description>
 		<SupportedTargetFrameworks>v3.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/WebService.xpt b/data/templates/project/VB/WebService.xpt
index 65cd2c98a3..12a124024c 100644
--- a/data/templates/project/VB/WebService.xpt
+++ b/data/templates/project/VB/WebService.xpt
@@ -6,7 +6,7 @@
 		<Name>${res:Templates.Project.WebService.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET</Subcategory>
-		<Icon>VBNet.Project.WebService</Icon>
+		<Icon>VB.Project.WebService</Icon>
 		<Description>${res:Templates.Project.WebService.Description}</Description>
 	</TemplateConfiguration>
 
diff --git a/data/templates/project/VB/WebpageProject.xpt b/data/templates/project/VB/WebpageProject.xpt
index cceee9ae88..862a66e198 100644
--- a/data/templates/project/VB/WebpageProject.xpt
+++ b/data/templates/project/VB/WebpageProject.xpt
@@ -6,7 +6,7 @@
 		<Name>${res:Templates.Project.WebPage.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET</Subcategory>
-		<Icon>VBNet.Project.WebProject</Icon>
+		<Icon>VB.Project.WebProject</Icon>
 		<Description>${res:Templates.Project.WebPage.Description}</Description>
 		<SupportedTargetFrameworks>v2.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>