diff --git a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj
index b086d5164..1eb721b77 100644
--- a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj
+++ b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj
@@ -141,7 +141,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="Templates\Projects\CosmosProject\AssemblyInfo.cs" />
     <None Include="Templates\Projects\CosmosProject\Program.cs" />
-    <None Include="Templates\Projects\CosmosProject\CSharp Kernel.Cosmos" />
+    <None Include="Templates\Projects\CosmosProject\Kernel.Cosmos" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources.resx">
@@ -156,7 +156,6 @@
   <ItemGroup>
     <None Include="bin\Images\alert.png" />
     <None Include="bin\Images\alert1.png" />
-    <None Include="Templates\Projects\CosmosProject\VB Kernel.Cosmos" />
     <Content Include="Resources\Cosmos.ico" />
     <EmbeddedResource Include="BuildOptionsPropertyPage.resx">
       <DependentUpon>BuildOptionsPropertyPage.cs</DependentUpon>
@@ -189,9 +188,7 @@
     <EmbeddedResource Include="VMOptionsQemu.resx">
       <DependentUpon>VMOptionsQemu.cs</DependentUpon>
     </EmbeddedResource>
-    <Content Include="Templates\Projects\CosmosProject\AssemblyInfo.vb" />
-    <Content Include="Templates\Projects\CosmosProject\CSharp Kernel.ico" />
-    <Content Include="Templates\Projects\CosmosProject\Program.vb" />
+    <Content Include="Templates\Projects\CosmosProject\Kernel.ico" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/AssemblyInfo.vb b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/AssemblyInfo.vb
deleted file mode 100644
index 59a2b544d..000000000
--- a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/AssemblyInfo.vb
+++ /dev/null
@@ -1,34 +0,0 @@
-Imports System
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-
-' General Information about an assembly is controlled through the following 
-' set of attributes. Change these attribute values to modify the information
-' associated with an assembly.
-
-' Review the values of the assembly attributes
-
-<Assembly: AssemblyTitle("Package Name")> 
-<Assembly: AssemblyDescription("")> 
-<Assembly: AssemblyConfiguration("")> 
-<Assembly: AssemblyCompany("Company")> 
-<Assembly: AssemblyProduct("Package Name")> 
-<Assembly: AssemblyCopyright("")> 
-<Assembly: AssemblyTrademark("")> 
-<Assembly: AssemblyCulture("")> 
-<Assembly: ComVisible(False)> 
-<Assembly: CLSCompliant(False)> 
-
-' Version information for an assembly consists of the following four values:
-'
-'      Major Version
-'      Minor Version 
-'      Build Number
-'      Revision
-'
-' You can specify all the values or you can default the Build and Revision Numbers 
-' by using the '*' as shown below:
-' <Assembly: AssemblyVersion("1.0.*")> 
-
-<Assembly: AssemblyVersion("1.0.0.0")> 
-<Assembly: AssemblyFileVersion("1.0.0.0")> 
\ No newline at end of file
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CSharp Kernel.Cosmos b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/Kernel.Cosmos
similarity index 100%
rename from source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CSharp Kernel.Cosmos
rename to source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/Kernel.Cosmos
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CSharp Kernel.ico b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/Kernel.ico
similarity index 100%
rename from source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CSharp Kernel.ico
rename to source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/Kernel.ico
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/Program.vb b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/Program.vb
deleted file mode 100644
index 2ddefab26..000000000
--- a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/Program.vb
+++ /dev/null
@@ -1,14 +0,0 @@
-Imports System
-Imports System.Collections.Generic
-Imports System.Text
-
-Namespace $nameSpace$
-	Public Module $className$
-
-		Public Sub Main()
-			Console.WriteLine("Hello VSX!!!")
-			Console.ReadKey()
-		End Sub
-
-	End Module
-End Namespace
\ No newline at end of file
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/VB Kernel.Cosmos b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/VB Kernel.Cosmos
deleted file mode 100644
index ab499dde4..000000000
--- a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/VB Kernel.Cosmos	
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
-		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-		<ProjectGuid>{99999999-9999-9999-9999-999999999999}</ProjectGuid>
-		<SchemaVersion>2.0</SchemaVersion>
-		<OutputType>Exe</OutputType>
-		<RootNamespace>Cosmos.User.Kernel</RootNamespace>
-		<AssemblyName>CosmosKernel</AssemblyName>
-		<OptionExplicit>On</OptionExplicit>
-		<OptionCompare>Binary</OptionCompare>
-		<OptionStrict>On</OptionStrict>
-		<OptionInfer>Off</OptionInfer>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-		<DebugSymbols>true</DebugSymbols>
-		<DebugType>full</DebugType>
-		<DefineDebug>true</DefineDebug>
-		<DefineTrace>true</DefineTrace>
-		<OutputPath>bin\Debug\</OutputPath>
-		<DocumentationFile>TestConsole.xml</DocumentationFile>
-		<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-		<BuildTarget>QEMU</BuildTarget>
-		<Framework>MicrosoftNET</Framework>
-		<UseInternalAssembler>False</UseInternalAssembler>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-		<DebugType>none</DebugType>
-		<DefineDebug>false</DefineDebug>
-		<DefineTrace>true</DefineTrace>
-		<Optimize>true</Optimize>
-		<OutputPath>bin\Release\</OutputPath>
-		<DocumentationFile>TestConsole.xml</DocumentationFile>
-		<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-		<BuildTarget>QEMU</BuildTarget>
-		<Framework>MicrosoftNET</Framework>
-		<UseInternalAssembler>False</UseInternalAssembler>
-	</PropertyGroup>
-	<ItemGroup>
-		<Reference Include="mscorlib" />
-		<Reference Include="System" />
-	</ItemGroup>
-	<ItemGroup>
-		<Import Include="System" />
-	</ItemGroup>
-	<ItemGroup>
-		<Compile Include="AssemblyInfo.vb" />
-		<Compile Include="Program.vb" />
-	</ItemGroup>
-
-	<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-
-	<Target Name="BeforeBuild">
-	</Target>
-
-	<!-- 
-	We have to read from registry becasue MSBuild process wont see changes to 
-	env variables. But by reading the env var key, we allow support for both env
-	var and registry as some scenarios we can read env var but not registry
-	(ie .bat files)
-	-->
-	<PropertyGroup>
-	<Cosmos>$(Registry:HKEY_CURRENT_USER\Environment@Cosmos)</Cosmos>
-	</PropertyGroup>
-	<UsingTask TaskName="Cosmos.Build.MSBuild.BuildImage" AssemblyFile="$(Cosmos)\source2\Build\Cosmos.Build.MSBuild\bin\Debug\Cosmos.Build.MSBuild.dll" />
-	<Target Name="AfterBuild">
-		<Message Text="Using Cosmos Path: $(Cosmos)" Importance="high" />
-		<BuildImage
-			KernelAssembly="$(AssemblyName).$(OutputType)"
-			OutputPath="$(BaseOutputPath)$(OutputPath)"
-			BuildTarget="$(BuildTarget)"
-			Framework="$(Framework)"
-			UseInternalAssembler="$(UseInternalAssembler)"
-		/>
-	</Target>
-</Project>
\ No newline at end of file