updates for template BS
diff --git a/templates/full/App.xaml b/templates/full/App.xaml
index d37fafa..18072fe 100644
--- a/templates/full/App.xaml
+++ b/templates/full/App.xaml
@@ -17,7 +17,7 @@
  under the License. 
 -->
 <Application 
-    x:Class="GapExample.App"
+    x:Class="$safeprojectname$.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"       
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
diff --git a/templates/standalone/App.xaml b/templates/standalone/App.xaml
index d37fafa..18072fe 100644
--- a/templates/standalone/App.xaml
+++ b/templates/standalone/App.xaml
@@ -17,7 +17,7 @@
  under the License. 
 -->
 <Application 
-    x:Class="GapExample.App"
+    x:Class="$safeprojectname$.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"       
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
diff --git a/templates/standalone/App.xaml.cs b/templates/standalone/App.xaml.cs
index 0b0590d..2b7306d 100644
--- a/templates/standalone/App.xaml.cs
+++ b/templates/standalone/App.xaml.cs
@@ -32,7 +32,7 @@
 using Microsoft.Phone.Controls;
 using Microsoft.Phone.Shell;
 
-namespace GapExample
+namespace $safeprojectname$
 {
     public partial class App : Application
     {
diff --git a/templates/standalone/CordovaAppProj.csproj b/templates/standalone/CordovaAppProj.csproj
index e34c449..38b6cae 100644
--- a/templates/standalone/CordovaAppProj.csproj
+++ b/templates/standalone/CordovaAppProj.csproj
@@ -27,8 +27,8 @@
     <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CordovaApp</RootNamespace>
-    <AssemblyName>CordovaApp</AssemblyName>
+    <RootNamespace>$safeprojectname$</RootNamespace>
+    <AssemblyName>$safeprojectname$</AssemblyName>
     <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
     <SilverlightVersion>
     </SilverlightVersion>
@@ -41,7 +41,7 @@
     <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
     <XapFilename>CordovaAppProj_$(Configuration)_$(Platform).xap</XapFilename>
     <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
-    <SilverlightAppEntry>GapExample.App</SilverlightAppEntry>
+    <SilverlightAppEntry>$safeprojectname$.App</SilverlightAppEntry>
     <ValidateXaml>true</ValidateXaml>
     <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
diff --git a/templates/standalone/MainPage.xaml b/templates/standalone/MainPage.xaml
index 0f41079..1f2fe7c 100644
--- a/templates/standalone/MainPage.xaml
+++ b/templates/standalone/MainPage.xaml
@@ -17,7 +17,7 @@
  under the License. 
 -->
 <phone:PhoneApplicationPage 
-    x:Class="GapExample.MainPage"
+    x:Class="$safeprojectname$.MainPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
diff --git a/templates/standalone/MainPage.xaml.cs b/templates/standalone/MainPage.xaml.cs
index e0eb81a..88fa5ea 100644
--- a/templates/standalone/MainPage.xaml.cs
+++ b/templates/standalone/MainPage.xaml.cs
@@ -35,7 +35,7 @@
 using WPCordovaClassLib;
 
 
-namespace GapExample
+namespace $safeprojectname$
 {
     public partial class MainPage : PhoneApplicationPage
     {
diff --git a/templates/standalone/Properties/AssemblyInfo.cs b/templates/standalone/Properties/AssemblyInfo.cs
index f534de9..bac2738 100644
--- a/templates/standalone/Properties/AssemblyInfo.cs
+++ b/templates/standalone/Properties/AssemblyInfo.cs
@@ -15,7 +15,8 @@
 [assembly: AssemblyTrademark("Apache Cordova")]
 [assembly: AssemblyCulture("")]
 
-[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+[assembly: NeutralResourcesLanguageAttribute("en-US")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from