diff --git a/Item Templates/DataPageDeletePageItem/DataPageDeleteItem.vstemplate b/Item Templates/DataPageDeletePageItem/DataPageDeleteItem.vstemplate
index 9f050c7..33c5dc0 100644
--- a/Item Templates/DataPageDeletePageItem/DataPageDeleteItem.vstemplate	
+++ b/Item Templates/DataPageDeletePageItem/DataPageDeleteItem.vstemplate	
@@ -19,7 +19,7 @@
     <ProjectItem ReplaceParameters="true" TargetFileName="$safeitemname$.cs">Class.cs</ProjectItem>
   </TemplateContent>
   <WizardExtension>
-    <Assembly>SageCRMDotNetTemplatesVSIX, Version=1.0.0.0, Culture=neutral, PublicKeyToken=355296cadd9bd1c9</Assembly>
+    <Assembly>SageCrmDotNetTemplates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=355296cadd9bd1c9</Assembly>
     <FullClassName>SageCRMDotNetTemplatesVSIX.Wizards.DataPageItemWizard.DataPageItemWizard</FullClassName>
   </WizardExtension>
 </VSTemplate>
\ No newline at end of file
diff --git a/Item Templates/DataPageEditPageItem/DataPageEditItem.vstemplate b/Item Templates/DataPageEditPageItem/DataPageEditItem.vstemplate
index b33dfee..2b33304 100644
--- a/Item Templates/DataPageEditPageItem/DataPageEditItem.vstemplate	
+++ b/Item Templates/DataPageEditPageItem/DataPageEditItem.vstemplate	
@@ -19,7 +19,7 @@
     <ProjectItem ReplaceParameters="true" TargetFileName="$safeitemname$.cs">Class.cs</ProjectItem>
   </TemplateContent>
   <WizardExtension>
-    <Assembly>SageCRMDotNetTemplatesVSIX, Version=1.0.0.0, Culture=neutral, PublicKeyToken=355296cadd9bd1c9</Assembly>
+    <Assembly>SageCrmDotNetTemplates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=355296cadd9bd1c9</Assembly>
     <FullClassName>SageCRMDotNetTemplatesVSIX.Wizards.DataPageItemWizard.DataPageItemWizard</FullClassName>
   </WizardExtension>
 </VSTemplate>
\ No newline at end of file
diff --git a/Item Templates/DataPageNewPageItem/DataPageNewItem.vstemplate b/Item Templates/DataPageNewPageItem/DataPageNewItem.vstemplate
index 87587cc..9f774c7 100644
--- a/Item Templates/DataPageNewPageItem/DataPageNewItem.vstemplate	
+++ b/Item Templates/DataPageNewPageItem/DataPageNewItem.vstemplate	
@@ -19,7 +19,7 @@
     <ProjectItem ReplaceParameters="true" TargetFileName="$safeitemname$.cs">Class.cs</ProjectItem>
   </TemplateContent>
   <WizardExtension>
-    <Assembly>SageCRMDotNetTemplatesVSIX, Version=1.0.0.0, Culture=neutral, PublicKeyToken=355296cadd9bd1c9</Assembly>
+    <Assembly>SageCrmDotNetTemplates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=355296cadd9bd1c9</Assembly>
     <FullClassName>SageCRMDotNetTemplatesVSIX.Wizards.DataPageItemWizard.DataPageItemWizard</FullClassName>
   </WizardExtension>
 </VSTemplate>
\ No newline at end of file
diff --git a/Item Templates/DataPagePageItem/DataPageItem.vstemplate b/Item Templates/DataPagePageItem/DataPageItem.vstemplate
index 02b6d1e..2f34672 100644
--- a/Item Templates/DataPagePageItem/DataPageItem.vstemplate	
+++ b/Item Templates/DataPagePageItem/DataPageItem.vstemplate	
@@ -19,7 +19,7 @@
     <ProjectItem ReplaceParameters="true" TargetFileName="$safeitemname$.cs">Class.cs</ProjectItem>
   </TemplateContent>
   <WizardExtension>
-    <Assembly>SageCRMDotNetTemplatesVSIX, Version=1.0.0.0, Culture=neutral, PublicKeyToken=355296cadd9bd1c9</Assembly>
+    <Assembly>SageCrmDotNetTemplates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=355296cadd9bd1c9</Assembly>
     <FullClassName>SageCRMDotNetTemplatesVSIX.Wizards.DataPageItemWizard.DataPageItemWizard</FullClassName>
   </WizardExtension>
 </VSTemplate>
\ No newline at end of file
diff --git a/Item Templates/ListPageItem/ListPageItem.vstemplate b/Item Templates/ListPageItem/ListPageItem.vstemplate
index bafe51f..3cb01ce 100644
--- a/Item Templates/ListPageItem/ListPageItem.vstemplate	
+++ b/Item Templates/ListPageItem/ListPageItem.vstemplate	
@@ -19,7 +19,7 @@
     <ProjectItem ReplaceParameters="true" TargetFileName="$safeitemname$.cs">Class.cs</ProjectItem>
   </TemplateContent>
   <WizardExtension>
-    <Assembly>SageCRMDotNetTemplatesVSIX, Version=1.0.0.0, Culture=neutral, PublicKeyToken=355296cadd9bd1c9</Assembly>
+    <Assembly>SageCrmDotNetTemplates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=355296cadd9bd1c9</Assembly>
     <FullClassName>SageCRMDotNetTemplatesVSIX.Wizards.ListPageItemWizard.ListPageItemWizard</FullClassName>
   </WizardExtension>
 </VSTemplate>
\ No newline at end of file
diff --git a/Item Templates/SearchPageItem/SearchPageItem.vstemplate b/Item Templates/SearchPageItem/SearchPageItem.vstemplate
index ea5a173..078c5b1 100644
--- a/Item Templates/SearchPageItem/SearchPageItem.vstemplate	
+++ b/Item Templates/SearchPageItem/SearchPageItem.vstemplate	
@@ -19,7 +19,7 @@
     <ProjectItem ReplaceParameters="true" TargetFileName="$safeitemname$.cs">Class.cs</ProjectItem>
   </TemplateContent>
   <WizardExtension>
-    <Assembly>SageCRMDotNetTemplatesVSIX, Version=1.0.0.0, Culture=neutral, PublicKeyToken=355296cadd9bd1c9</Assembly>
+    <Assembly>SageCrmDotNetTemplates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=355296cadd9bd1c9</Assembly>
     <FullClassName>SageCRMDotNetTemplatesVSIX.Wizards.SearchPageItemWizard.SearchPageItemWizard</FullClassName>
   </WizardExtension>
 </VSTemplate>
\ No newline at end of file
diff --git a/Project Templates/EntityProject/EntityProject.vstemplate b/Project Templates/EntityProject/EntityProject.vstemplate
index 59386fd..adb3096 100644
--- a/Project Templates/EntityProject/EntityProject.vstemplate	
+++ b/Project Templates/EntityProject/EntityProject.vstemplate	
@@ -27,7 +27,7 @@
     </Project>
   </TemplateContent>
   <WizardExtension>
-    <Assembly>SageCRMDotNetTemplatesVSIX, Version=1.0.0.0, Culture=neutral, PublicKeyToken=355296cadd9bd1c9</Assembly>
+    <Assembly>SageCrmDotNetTemplates, Version=1.0.0.0, Culture=neutral, PublicKeyToken=355296cadd9bd1c9</Assembly>
     <FullClassName>SageCRMDotNetTemplatesVSIX.Wizards.EntityProjectWizard.EntityProjectWizard</FullClassName>
   </WizardExtension>
 </VSTemplate>
\ No newline at end of file
diff --git a/SageCRMDotNetTemplatesVSIX/SageCRMDotNetTemplatesVSIX.csproj b/SageCRMDotNetTemplatesVSIX/SageCRMDotNetTemplatesVSIX.csproj
index 2d68121..f5085ee 100644
--- a/SageCRMDotNetTemplatesVSIX/SageCRMDotNetTemplatesVSIX.csproj
+++ b/SageCRMDotNetTemplatesVSIX/SageCRMDotNetTemplatesVSIX.csproj
@@ -20,7 +20,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SageCRMDotNetTemplatesVSIX</RootNamespace>
-    <AssemblyName>Sage CRM .NET Templates</AssemblyName>
+    <AssemblyName>SageCrmDotNetTemplates</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
diff --git a/SageCRMDotNetTemplatesVSIX/source.extension.vsixmanifest b/SageCRMDotNetTemplatesVSIX/source.extension.vsixmanifest
index 0f717da..1ee4645 100644
--- a/SageCRMDotNetTemplatesVSIX/source.extension.vsixmanifest
+++ b/SageCRMDotNetTemplatesVSIX/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="SageCrmDotNetTemplates.3c68dbfd-dbd6-42fc-a8cc-af7bed1204a2" Version="1.0.1" Language="en-US" Publisher="Ivan Kahl" />
+    <Identity Id="SageCrmDotNetTemplates.3c68dbfd-dbd6-42fc-a8cc-af7bed1204a2" Version="1.0.2" Language="en-US" Publisher="Ivan Kahl" />
     <DisplayName>Sage CRM .NET Templates</DisplayName>
     <Description xml:space="preserve">This contains a collection of project templates, item templates and snippets that will make .NET development easier for Sage CRM.</Description>
     <License>LICENSE.txt</License>