renamed namespace to NOT include device OS version number 7
diff --git a/example/CordovaExample.csproj b/example/CordovaExample.csproj
index 5752930..93596fc 100644
--- a/example/CordovaExample.csproj
+++ b/example/CordovaExample.csproj
@@ -171,9 +171,9 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\framework\WP7CordovaClassLib.csproj">
+    <ProjectReference Include="..\framework\WPCordovaClassLib.csproj">
       <Project>{FC6A1A70-892D-46AD-9E4A-9793F72AF780}</Project>
-      <Name>WP7CordovaClassLib</Name>
+      <Name>WPCordovaClassLib</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
diff --git a/example/CordovaExample.sln b/example/CordovaExample.sln
index eb92c55..55a06f4 100644
--- a/example/CordovaExample.sln
+++ b/example/CordovaExample.sln
@@ -1,9 +1,9 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010 Express for Windows Phone
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CordovaExample", "CordovaExample.csproj", "{0C6DFC84-A3BE-4581-BAAD-85B8CCC17FF8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WP7CordovaClassLib", "..\framework\WP7CordovaClassLib.csproj", "{FC6A1A70-892D-46AD-9E4A-9793F72AF780}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPCordovaClassLib", "..\framework\WPCordovaClassLib.csproj", "{FC6A1A70-892D-46AD-9E4A-9793F72AF780}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/example/MainPage.xaml b/example/MainPage.xaml
index 5166868..b595818 100644
--- a/example/MainPage.xaml
+++ b/example/MainPage.xaml
@@ -30,7 +30,7 @@
     Background="Black"
     SupportedOrientations="PortraitOrLandscape" Orientation="Portrait"
     shell:SystemTray.IsVisible="True" d:DesignHeight="768" d:DesignWidth="480" 
-    xmlns:my="clr-namespace:WP7CordovaClassLib;assembly=WP7CordovaClassLib">
+    xmlns:my="clr-namespace:WPCordovaClassLib;assembly=WPCordovaClassLib">
     <Grid x:Name="LayoutRoot" Background="Transparent" HorizontalAlignment="Stretch">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
diff --git a/example/Plugins/Calculator.cs b/example/Plugins/Calculator.cs
index 1b2c7df..2e74dd3 100644
--- a/example/Plugins/Calculator.cs
+++ b/example/Plugins/Calculator.cs
@@ -18,9 +18,9 @@
  */
 
 using System.Runtime.Serialization;
-using WP7CordovaClassLib.Cordova;
-using WP7CordovaClassLib.Cordova.Commands;
-using WP7CordovaClassLib.Cordova.JSON;
+using WPCordovaClassLib.Cordova;
+using WPCordovaClassLib.Cordova.Commands;
+using WPCordovaClassLib.Cordova.JSON;
 
 namespace Cordova.Extension.Commands
 {
diff --git a/framework/Properties/AssemblyInfo.cs b/framework/Properties/AssemblyInfo.cs
index b842ce5..b9b2ea6 100644
--- a/framework/Properties/AssemblyInfo.cs
+++ b/framework/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // 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.
-[assembly: AssemblyTitle("WP7CordovaClassLib")]
-[assembly: AssemblyDescription("2.2.0")]
+[assembly: AssemblyTitle("WPCordovaClassLib")]
+[assembly: AssemblyDescription("2.3.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Cordova")]
-[assembly: AssemblyProduct("WP7CordovaClassLib")]
+[assembly: AssemblyProduct("WPCordovaClassLib")]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.2.0")]
-[assembly: AssemblyFileVersion("2.2.0")]
+[assembly: AssemblyVersion("2.3.0")]
+[assembly: AssemblyFileVersion("2.3.0")]
diff --git a/framework/WPCordovaClassLib.csproj b/framework/WPCordovaClassLib.csproj
new file mode 100644
index 0000000..5b4ac1e
--- /dev/null
+++ b/framework/WPCordovaClassLib.csproj
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License. 
+-->
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.20506</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{FC6A1A70-892D-46AD-9E4A-9793F72AF780}</ProjectGuid>
+    <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>WPCordovaClassLib</RootNamespace>
+    <AssemblyName>WPCordovaClassLib</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <TargetFrameworkProfile>WindowsPhone71</TargetFrameworkProfile>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <SilverlightApplication>false</SilverlightApplication>
+    <ValidateXaml>true</ValidateXaml>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;WINDOWS_PHONE;CORDOVA_CLASSLIB</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>Bin\Release</OutputPath>
+    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;WINDOWS_PHONE;CORDOVA_CLASSLIB</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>
+    </DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Devices.Sensors" />
+    <Reference Include="Microsoft.Phone" />
+    <Reference Include="Microsoft.Phone.Interop" />
+    <Reference Include="Microsoft.Xna.Framework" />
+    <Reference Include="System.Device" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Servicemodel" />
+    <Reference Include="System.Servicemodel.Web" />
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\templates\standalone\cordovalib\BrowserMouseHelper.cs">
+      <Link>CordovaLib\BrowserMouseHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\CommandFactory.cs">
+      <Link>CordovaLib\CommandFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Accelerometer.cs">
+      <Link>CordovaLib\Commands\Accelerometer.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\AudioFormatsHelper.cs">
+      <Link>CordovaLib\Commands\AudioFormatsHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\AudioPlayer.cs">
+      <Link>CordovaLib\Commands\AudioPlayer.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\BaseCommand.cs">
+      <Link>CordovaLib\Commands\BaseCommand.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Battery.cs">
+      <Link>CordovaLib\Commands\Battery.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Camera.cs">
+      <Link>CordovaLib\Commands\Camera.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Capture.cs">
+      <Link>CordovaLib\Commands\Capture.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Compass.cs">
+      <Link>CordovaLib\Commands\Compass.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Contacts.cs">
+      <Link>CordovaLib\Commands\Contacts.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\DebugConsole.cs">
+      <Link>CordovaLib\Commands\DebugConsole.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Device.cs">
+      <Link>CordovaLib\Commands\Device.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\File.cs">
+      <Link>CordovaLib\Commands\File.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\FileTransfer.cs">
+      <Link>CordovaLib\Commands\FileTransfer.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\GeoLocation.cs">
+      <Link>CordovaLib\Commands\GeoLocation.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\ImageExifHelper.cs">
+      <Link>CordovaLib\Commands\ImageExifHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Media.cs">
+      <Link>CordovaLib\Commands\Media.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\MimeTypeMapper.cs">
+      <Link>CordovaLib\Commands\MimeTypeMapper.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\NetworkStatus.cs">
+      <Link>CordovaLib\Commands\NetworkStatus.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Notification.cs">
+      <Link>CordovaLib\Commands\Notification.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\CordovaCommandCall.cs">
+      <Link>CordovaLib\CordovaCommandCall.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\CordovaView.xaml.cs">
+      <Link>CordovaLib\CordovaView.xaml.cs</Link>
+      <DependentUpon>CordovaView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\DOMStorageHelper.cs">
+      <Link>CordovaLib\DOMStorageHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\JSON\JsonHelper.cs">
+      <Link>CordovaLib\JSON\JsonHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\NativeExecution.cs">
+      <Link>CordovaLib\NativeExecution.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\OrientationHelper.cs">
+      <Link>CordovaLib\OrientationHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\PluginResult.cs">
+      <Link>CordovaLib\PluginResult.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\ScriptCallback.cs">
+      <Link>CordovaLib\ScriptCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\UI\AudioCaptureTask.cs">
+      <Link>CordovaLib\UI\AudioCaptureTask.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\UI\AudioRecorder.xaml.cs">
+      <Link>CordovaLib\UI\AudioRecorder.xaml.cs</Link>
+      <DependentUpon>AudioRecorder.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\UI\ImageCapture.xaml.cs">
+      <Link>CordovaLib\UI\ImageCapture.xaml.cs</Link>
+      <DependentUpon>ImageCapture.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\UI\NotificationBox.xaml.cs">
+      <Link>CordovaLib\UI\NotificationBox.xaml.cs</Link>
+      <DependentUpon>NotificationBox.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\UI\VideoCaptureTask.cs">
+      <Link>CordovaLib\UI\VideoCaptureTask.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\UI\VideoRecorder.xaml.cs">
+      <Link>CordovaLib\UI\VideoRecorder.xaml.cs</Link>
+      <DependentUpon>VideoRecorder.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="..\templates\standalone\cordovalib\Images\appbar.back.rest.png">
+      <Link>CordovaLib\Images\appbar.back.rest.png</Link>
+    </Resource>
+    <Resource Include="..\templates\standalone\cordovalib\Images\appbar.close.rest.png">
+      <Link>CordovaLib\Images\appbar.close.rest.png</Link>
+    </Resource>
+    <Resource Include="..\templates\standalone\cordovalib\Images\appbar.feature.video.rest.png">
+      <Link>CordovaLib\Images\appbar.feature.video.rest.png</Link>
+    </Resource>
+    <Resource Include="..\templates\standalone\cordovalib\Images\appbar.next.rest.png">
+      <Link>CordovaLib\Images\appbar.next.rest.png</Link>
+    </Resource>
+    <Resource Include="..\templates\standalone\cordovalib\Images\appbar.save.rest.png">
+      <Link>CordovaLib\Images\appbar.save.rest.png</Link>
+    </Resource>
+    <Resource Include="..\templates\standalone\cordovalib\Images\appbar.stop.rest.png">
+      <Link>CordovaLib\Images\appbar.stop.rest.png</Link>
+    </Resource>
+    <Content Include="..\templates\standalone\cordovalib\resources\notification-beep.wav">
+      <Link>CordovaLib\resources\notification-beep.wav</Link>
+    </Content>
+    <Content Include="Images\appbar.back.rest.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\appbar.close.rest.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\appbar.feature.video.rest.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\appbar.next.rest.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\appbar.stop.rest.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\appbar.save.rest.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="resources\notification-beep.wav" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="..\templates\standalone\cordovalib\CordovaView.xaml">
+      <Link>CordovaLib\CordovaView.xaml</Link>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="..\templates\standalone\cordovalib\UI\AudioRecorder.xaml">
+      <Link>CordovaLib\UI\AudioRecorder.xaml</Link>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="..\templates\standalone\cordovalib\UI\ImageCapture.xaml">
+      <Link>CordovaLib\UI\ImageCapture.xaml</Link>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="..\templates\standalone\cordovalib\UI\NotificationBox.xaml">
+      <Link>CordovaLib\UI\NotificationBox.xaml</Link>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="..\templates\standalone\cordovalib\UI\VideoRecorder.xaml">
+      <Link>CordovaLib\UI\VideoRecorder.xaml</Link>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <ProjectExtensions />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/templates/standalone/cordovalib/BrowserMouseHelper.cs b/templates/standalone/cordovalib/BrowserMouseHelper.cs
index fea09e5..acd1bcd 100644
--- a/templates/standalone/cordovalib/BrowserMouseHelper.cs
+++ b/templates/standalone/cordovalib/BrowserMouseHelper.cs
@@ -26,7 +26,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace WP7CordovaClassLib
+namespace WPCordovaClassLib
 {
 
     /// <summary>
diff --git a/templates/standalone/cordovalib/CommandFactory.cs b/templates/standalone/cordovalib/CommandFactory.cs
index 5c72ef6..893ce80 100644
--- a/templates/standalone/cordovalib/CommandFactory.cs
+++ b/templates/standalone/cordovalib/CommandFactory.cs
@@ -23,11 +23,11 @@
 using System.Windows.Media.Animation;
 using System.Windows.Shapes;
 using System.Collections.Generic;
-using WP7CordovaClassLib.Cordova.Commands;
+using WPCordovaClassLib.Cordova.Commands;
 using System.Reflection;
 using System.Diagnostics;
 
-namespace WP7CordovaClassLib.Cordova
+namespace WPCordovaClassLib.Cordova
 {
     /// <summary>
     /// Provides functionality to create phone gap command by name.
@@ -39,7 +39,7 @@
         /// </summary>
         private static readonly string CustomPluginNamespacePrefix = "Cordova.Extension.Commands.";
 
-        private static readonly string BaseCommandNamespacePrefix = "WP7CordovaClassLib.Cordova.Commands.";
+        private static readonly string BaseCommandNamespacePrefix = "WPCordovaClassLib.Cordova.Commands.";
 
         /// <summary>
         /// Cache instantiated commands in a map.
diff --git a/templates/standalone/cordovalib/Commands/Accelerometer.cs b/templates/standalone/cordovalib/Commands/Accelerometer.cs
index baea009..cba911c 100644
--- a/templates/standalone/cordovalib/Commands/Accelerometer.cs
+++ b/templates/standalone/cordovalib/Commands/Accelerometer.cs
@@ -21,7 +21,7 @@
 using System.Globalization;
 using System.Diagnostics;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     /// <summary>
     /// Captures device motion in the x, y, and z direction.
diff --git a/templates/standalone/cordovalib/Commands/AudioFormatsHelper.cs b/templates/standalone/cordovalib/Commands/AudioFormatsHelper.cs
index f93340f..dca7ee6 100644
--- a/templates/standalone/cordovalib/Commands/AudioFormatsHelper.cs
+++ b/templates/standalone/cordovalib/Commands/AudioFormatsHelper.cs
@@ -16,7 +16,7 @@
 using System;
 using System.IO;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     /// <summary>
     /// Provides extra functionality to support different audio formats.
diff --git a/templates/standalone/cordovalib/Commands/AudioPlayer.cs b/templates/standalone/cordovalib/Commands/AudioPlayer.cs
index 4df878f..00e345c 100644
--- a/templates/standalone/cordovalib/Commands/AudioPlayer.cs
+++ b/templates/standalone/cordovalib/Commands/AudioPlayer.cs
@@ -24,7 +24,7 @@
 using Microsoft.Phone.Controls;
 using System.Diagnostics;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     /// <summary>
     /// Implements audio record and play back functionality.
diff --git a/templates/standalone/cordovalib/Commands/BaseCommand.cs b/templates/standalone/cordovalib/Commands/BaseCommand.cs
index 4ff8f22..f6e45da 100644
--- a/templates/standalone/cordovalib/Commands/BaseCommand.cs
+++ b/templates/standalone/cordovalib/Commands/BaseCommand.cs
@@ -17,7 +17,7 @@
 using Microsoft.Phone.Shell;
 using System.Diagnostics;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     public abstract class BaseCommand : IDisposable
     {
@@ -138,7 +138,7 @@
         public static string GetBaseURL()
         {
 #if CORDOVA_CLASSLIB
-            return "/WP7CordovaClassLib;component/";
+            return "/WPCordovaClassLib;component/";
 #else
             return "./";
 #endif
diff --git a/templates/standalone/cordovalib/Commands/Battery.cs b/templates/standalone/cordovalib/Commands/Battery.cs
index f027c0f..962959e 100644
--- a/templates/standalone/cordovalib/Commands/Battery.cs
+++ b/templates/standalone/cordovalib/Commands/Battery.cs
@@ -25,7 +25,7 @@
 
 using Microsoft.Phone.Info;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     /// <summary>
     /// Listens for changes to the state of the battery on the device.
diff --git a/templates/standalone/cordovalib/Commands/Camera.cs b/templates/standalone/cordovalib/Commands/Camera.cs
index 8fbf317..6fb0a00 100644
--- a/templates/standalone/cordovalib/Commands/Camera.cs
+++ b/templates/standalone/cordovalib/Commands/Camera.cs
@@ -31,7 +31,7 @@
 using Microsoft.Xna.Framework.Media;
 using System.Diagnostics;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     public class Camera : BaseCommand
     {
diff --git a/templates/standalone/cordovalib/Commands/Capture.cs b/templates/standalone/cordovalib/Commands/Capture.cs
index 3cda1b9..5e14a16 100644
--- a/templates/standalone/cordovalib/Commands/Capture.cs
+++ b/templates/standalone/cordovalib/Commands/Capture.cs
@@ -21,14 +21,14 @@
 using Microsoft.Phone;
 using Microsoft.Phone.Tasks;
 using Microsoft.Xna.Framework.Media;
-using WP7CordovaClassLib.Cordova.UI;
-using AudioResult = WP7CordovaClassLib.Cordova.UI.AudioCaptureTask.AudioResult;
-using VideoResult = WP7CordovaClassLib.Cordova.UI.VideoCaptureTask.VideoResult;
+using WPCordovaClassLib.Cordova.UI;
+using AudioResult = WPCordovaClassLib.Cordova.UI.AudioCaptureTask.AudioResult;
+using VideoResult = WPCordovaClassLib.Cordova.UI.VideoCaptureTask.VideoResult;
 using System.Windows;
 using System.Diagnostics;
 using Microsoft.Phone.Controls;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     /// <summary>
     /// Provides access to the audio, image, and video capture capabilities of the device
diff --git a/templates/standalone/cordovalib/Commands/Compass.cs b/templates/standalone/cordovalib/Commands/Compass.cs
index 02defd6..c9e1c4d 100644
--- a/templates/standalone/cordovalib/Commands/Compass.cs
+++ b/templates/standalone/cordovalib/Commands/Compass.cs
@@ -31,7 +31,7 @@
 using System.Threading;
 using Microsoft.Devices.Sensors;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
 
     public class Compass : BaseCommand
diff --git a/templates/standalone/cordovalib/Commands/Contacts.cs b/templates/standalone/cordovalib/Commands/Contacts.cs
index f299fe0..df9c67e 100644
--- a/templates/standalone/cordovalib/Commands/Contacts.cs
+++ b/templates/standalone/cordovalib/Commands/Contacts.cs
@@ -24,7 +24,7 @@
 using DeviceContacts = Microsoft.Phone.UserData.Contacts;
 
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     [DataContract]
     public class SearchOptions
diff --git a/templates/standalone/cordovalib/Commands/DebugConsole.cs b/templates/standalone/cordovalib/Commands/DebugConsole.cs
index 32504fd..fa9863a 100644
--- a/templates/standalone/cordovalib/Commands/DebugConsole.cs
+++ b/templates/standalone/cordovalib/Commands/DebugConsole.cs
@@ -24,7 +24,7 @@
 using System.Windows.Shapes;
 using System.Diagnostics;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
 
     public class DebugConsole : BaseCommand
diff --git a/templates/standalone/cordovalib/Commands/Device.cs b/templates/standalone/cordovalib/Commands/Device.cs
index 8e6d496..fe57e81 100644
--- a/templates/standalone/cordovalib/Commands/Device.cs
+++ b/templates/standalone/cordovalib/Commands/Device.cs
@@ -28,7 +28,7 @@
 using System.IO;
 using System.Diagnostics;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     public class Device : BaseCommand
     {
diff --git a/templates/standalone/cordovalib/Commands/File.cs b/templates/standalone/cordovalib/Commands/File.cs
index 397a495..91d85d6 100644
--- a/templates/standalone/cordovalib/Commands/File.cs
+++ b/templates/standalone/cordovalib/Commands/File.cs
@@ -21,7 +21,7 @@
 using System.Text;
 using System.Diagnostics;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     /// <summary>
     /// Provides access to isolated storage
diff --git a/templates/standalone/cordovalib/Commands/FileTransfer.cs b/templates/standalone/cordovalib/Commands/FileTransfer.cs
index fcb866d..f2a83a1 100644
--- a/templates/standalone/cordovalib/Commands/FileTransfer.cs
+++ b/templates/standalone/cordovalib/Commands/FileTransfer.cs
@@ -22,7 +22,7 @@
 using System.Security;
 using System.Diagnostics;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     public class FileTransfer : BaseCommand
     {
@@ -381,7 +381,7 @@
 
                     }
                 }
-                WP7CordovaClassLib.Cordova.Commands.File.FileEntry entry = new WP7CordovaClassLib.Cordova.Commands.File.FileEntry(reqState.options.FilePath);
+                WPCordovaClassLib.Cordova.Commands.File.FileEntry entry = new WPCordovaClassLib.Cordova.Commands.File.FileEntry(reqState.options.FilePath);
                 DispatchCommandResult(new PluginResult(PluginResult.Status.OK, entry));
             }
             catch (IsolatedStorageException)
diff --git a/templates/standalone/cordovalib/Commands/GeoLocation.cs b/templates/standalone/cordovalib/Commands/GeoLocation.cs
index 49a4787..c53cb29 100644
--- a/templates/standalone/cordovalib/Commands/GeoLocation.cs
+++ b/templates/standalone/cordovalib/Commands/GeoLocation.cs
@@ -18,7 +18,7 @@
 using System.Threading;
 using System.Device.Location;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     /// <summary>
     /// This is a command stub, the browser provides the correct implementation.  We use this to trigger the static analyzer that we require this permission 
diff --git a/templates/standalone/cordovalib/Commands/ImageExifHelper.cs b/templates/standalone/cordovalib/Commands/ImageExifHelper.cs
index ed8d89b..ec78201 100644
--- a/templates/standalone/cordovalib/Commands/ImageExifHelper.cs
+++ b/templates/standalone/cordovalib/Commands/ImageExifHelper.cs
@@ -18,7 +18,7 @@
 using System.IO;
 using System.Windows.Media.Imaging;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     public class ImageExifOrientation
     {
diff --git a/templates/standalone/cordovalib/Commands/Media.cs b/templates/standalone/cordovalib/Commands/Media.cs
index f5efdac..69265dd 100644
--- a/templates/standalone/cordovalib/Commands/Media.cs
+++ b/templates/standalone/cordovalib/Commands/Media.cs
@@ -18,7 +18,7 @@
 using System.Windows;
 using System.Diagnostics;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     /// <summary>
     /// Provides the ability to record and play back audio files on a device. 
diff --git a/templates/standalone/cordovalib/Commands/MimeTypeMapper.cs b/templates/standalone/cordovalib/Commands/MimeTypeMapper.cs
index f4fed55..01ba4cb 100644
--- a/templates/standalone/cordovalib/Commands/MimeTypeMapper.cs
+++ b/templates/standalone/cordovalib/Commands/MimeTypeMapper.cs
@@ -15,7 +15,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     /// <summary>
     /// Represents file extension to mime type mapper.
diff --git a/templates/standalone/cordovalib/Commands/NetworkStatus.cs b/templates/standalone/cordovalib/Commands/NetworkStatus.cs
index ba56724..c74882e 100644
--- a/templates/standalone/cordovalib/Commands/NetworkStatus.cs
+++ b/templates/standalone/cordovalib/Commands/NetworkStatus.cs
@@ -26,7 +26,7 @@
 using System.Windows.Shapes;
 using Microsoft.Phone.Net.NetworkInformation;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
 
     // http://msdn.microsoft.com/en-us/library/microsoft.phone.net.networkinformation(v=VS.92).aspx
diff --git a/templates/standalone/cordovalib/Commands/Notification.cs b/templates/standalone/cordovalib/Commands/Notification.cs
index 49ca3fe..eeae341 100644
--- a/templates/standalone/cordovalib/Commands/Notification.cs
+++ b/templates/standalone/cordovalib/Commands/Notification.cs
@@ -21,10 +21,10 @@
 using System.Windows.Resources;
 using Microsoft.Phone.Controls;
 using Microsoft.Xna.Framework.Audio;
-using WP7CordovaClassLib.Cordova.UI;
+using WPCordovaClassLib.Cordova.UI;
 using System.Diagnostics;
 
-namespace WP7CordovaClassLib.Cordova.Commands
+namespace WPCordovaClassLib.Cordova.Commands
 {
     public class Notification : BaseCommand
     {
diff --git a/templates/standalone/cordovalib/CordovaCommandCall.cs b/templates/standalone/cordovalib/CordovaCommandCall.cs
index 020509c..084fd2c 100644
--- a/templates/standalone/cordovalib/CordovaCommandCall.cs
+++ b/templates/standalone/cordovalib/CordovaCommandCall.cs
@@ -24,7 +24,7 @@
 using System.Windows.Shapes;
 using System.Linq;
 
-namespace WP7CordovaClassLib.Cordova
+namespace WPCordovaClassLib.Cordova
 {
     /// <summary>
     /// Represents Cordova native command call: action callback, etc
diff --git a/templates/standalone/cordovalib/CordovaView.xaml b/templates/standalone/cordovalib/CordovaView.xaml
index 9ff9da5..b993d97 100644
--- a/templates/standalone/cordovalib/CordovaView.xaml
+++ b/templates/standalone/cordovalib/CordovaView.xaml
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations
  under the License.  
 -->
-<UserControl x:Class="WP7CordovaClassLib.CordovaView"
+<UserControl x:Class="WPCordovaClassLib.CordovaView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/templates/standalone/cordovalib/CordovaView.xaml.cs b/templates/standalone/cordovalib/CordovaView.xaml.cs
index ce1cb68..27f286f 100644
--- a/templates/standalone/cordovalib/CordovaView.xaml.cs
+++ b/templates/standalone/cordovalib/CordovaView.xaml.cs
@@ -31,17 +31,17 @@
 using System.IO;
 using System.ComponentModel;
 using System.Xml.Linq;
-using WP7CordovaClassLib.Cordova.Commands;
+using WPCordovaClassLib.Cordova.Commands;
 using System.Diagnostics;
 using System.Text;
-using WP7CordovaClassLib.Cordova;
+using WPCordovaClassLib.Cordova;
 using System.Threading;
 using Microsoft.Phone.Shell;
-using WP7CordovaClassLib.Cordova.JSON;
+using WPCordovaClassLib.Cordova.JSON;
 
 
 
-namespace WP7CordovaClassLib
+namespace WPCordovaClassLib
 {
     public partial class CordovaView : UserControl
     {
diff --git a/templates/standalone/cordovalib/DOMStorageHelper.cs b/templates/standalone/cordovalib/DOMStorageHelper.cs
index ee2d70c..f57bae4 100644
--- a/templates/standalone/cordovalib/DOMStorageHelper.cs
+++ b/templates/standalone/cordovalib/DOMStorageHelper.cs
@@ -26,14 +26,14 @@
 using System.Collections.Generic;
 using Microsoft.Phone.Controls;
 using System.Linq;
-using WP7CordovaClassLib.Cordova.JSON;
+using WPCordovaClassLib.Cordova.JSON;
 
 /*
  * Translates DOMStorage API between JS and Isolated Storage
  * Missing pieces : QUOTA_EXCEEDED_ERR  + StorageEvent  
  * */
 
-namespace WP7CordovaClassLib
+namespace WPCordovaClassLib
 {
     public class DOMStorageHelper
     {
diff --git a/templates/standalone/cordovalib/JSON/JsonHelper.cs b/templates/standalone/cordovalib/JSON/JsonHelper.cs
index bc02053..44511f6 100644
--- a/templates/standalone/cordovalib/JSON/JsonHelper.cs
+++ b/templates/standalone/cordovalib/JSON/JsonHelper.cs
@@ -28,7 +28,7 @@
 using System.Text;
 using System.Diagnostics;
 
-namespace WP7CordovaClassLib.Cordova.JSON
+namespace WPCordovaClassLib.Cordova.JSON
 {
     /// <summary>
     /// Provides JSON serialization/deserialization functionality.
diff --git a/templates/standalone/cordovalib/NativeExecution.cs b/templates/standalone/cordovalib/NativeExecution.cs
index 390912e..2b6fa5a 100644
--- a/templates/standalone/cordovalib/NativeExecution.cs
+++ b/templates/standalone/cordovalib/NativeExecution.cs
@@ -17,10 +17,10 @@
 using System.Threading;
 using Microsoft.Devices;
 using Microsoft.Phone.Controls;
-using WP7CordovaClassLib.Cordova.Commands;
+using WPCordovaClassLib.Cordova.Commands;
 using System.Windows;
 
-namespace WP7CordovaClassLib.Cordova
+namespace WPCordovaClassLib.Cordova
 {
     /// <summary>
     /// Implements logic to execute native command and return result back.
diff --git a/templates/standalone/cordovalib/OrientationHelper.cs b/templates/standalone/cordovalib/OrientationHelper.cs
index f723df1..81a329e 100644
--- a/templates/standalone/cordovalib/OrientationHelper.cs
+++ b/templates/standalone/cordovalib/OrientationHelper.cs
@@ -24,7 +24,7 @@
 using System.Windows.Shapes;
 using Microsoft.Phone.Controls;
 
-namespace WP7CordovaClassLib.Cordova
+namespace WPCordovaClassLib.Cordova
 {
     public class OrientationHelper
     {
diff --git a/templates/standalone/cordovalib/PluginResult.cs b/templates/standalone/cordovalib/PluginResult.cs
index 5ecba90..b887bb8 100644
--- a/templates/standalone/cordovalib/PluginResult.cs
+++ b/templates/standalone/cordovalib/PluginResult.cs
@@ -25,7 +25,7 @@
 using System.Text;
 using System.Diagnostics;
 
-namespace WP7CordovaClassLib.Cordova
+namespace WPCordovaClassLib.Cordova
 {
     /// <summary>
     /// Represents command execution result
diff --git a/templates/standalone/cordovalib/ScriptCallback.cs b/templates/standalone/cordovalib/ScriptCallback.cs
index 890cfaa..7878134 100644
--- a/templates/standalone/cordovalib/ScriptCallback.cs
+++ b/templates/standalone/cordovalib/ScriptCallback.cs
@@ -27,10 +27,10 @@
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Shapes;
-using WP7CordovaClassLib.Cordova.JSON;
+using WPCordovaClassLib.Cordova.JSON;
 using System.Diagnostics;
 
-namespace WP7CordovaClassLib.Cordova
+namespace WPCordovaClassLib.Cordova
 {
     /// <summary>
     /// Represents client script function to execute
diff --git a/templates/standalone/cordovalib/UI/AudioCaptureTask.cs b/templates/standalone/cordovalib/UI/AudioCaptureTask.cs
index 3de33f7..9f43d23 100644
--- a/templates/standalone/cordovalib/UI/AudioCaptureTask.cs
+++ b/templates/standalone/cordovalib/UI/AudioCaptureTask.cs
@@ -18,7 +18,7 @@
 using Microsoft.Phone.Controls;
 using Microsoft.Phone.Tasks;
 
-namespace WP7CordovaClassLib.Cordova.UI
+namespace WPCordovaClassLib.Cordova.UI
 {
     /// <summary>
     /// Allows an application to launch the Audio Recording application. 
@@ -28,7 +28,7 @@
     {
         /// <summary>
         /// Represents recorded audio returned from a call to the Show method of
-        /// a WP7CordovaClassLib.Cordova.Controls.AudioCaptureTask object
+        /// a WPCordovaClassLib.Cordova.Controls.AudioCaptureTask object
         /// </summary>
         public class AudioResult : TaskEventArgs
         {
@@ -74,7 +74,7 @@
 
                 root.Navigated += new System.Windows.Navigation.NavigatedEventHandler(NavigationService_Navigated);
 
-                string baseUrl = WP7CordovaClassLib.Cordova.Commands.BaseCommand.GetBaseURL();
+                string baseUrl = WPCordovaClassLib.Cordova.Commands.BaseCommand.GetBaseURL();
                 // dummy parameter is used to always open a fresh version
                 root.Navigate(new System.Uri(baseUrl + "CordovaLib/UI/AudioRecorder.xaml?dummy=" + Guid.NewGuid().ToString(), UriKind.Relative));
 
diff --git a/templates/standalone/cordovalib/UI/AudioRecorder.xaml b/templates/standalone/cordovalib/UI/AudioRecorder.xaml
index 7bbea6b..0fd26ab 100644
--- a/templates/standalone/cordovalib/UI/AudioRecorder.xaml
+++ b/templates/standalone/cordovalib/UI/AudioRecorder.xaml
@@ -17,7 +17,7 @@
  under the License. 
 -->
 <phone:PhoneApplicationPage 
-    x:Class="WP7CordovaClassLib.Cordova.UI.AudioRecorder"
+    x:Class="WPCordovaClassLib.Cordova.UI.AudioRecorder"
     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/cordovalib/UI/AudioRecorder.xaml.cs b/templates/standalone/cordovalib/UI/AudioRecorder.xaml.cs
index fbd74a6..01a0832 100644
--- a/templates/standalone/cordovalib/UI/AudioRecorder.xaml.cs
+++ b/templates/standalone/cordovalib/UI/AudioRecorder.xaml.cs
@@ -21,10 +21,10 @@
 using System.IO.IsolatedStorage;
 using System.Windows;
 using System.Windows.Threading;
-using WP7CordovaClassLib.Cordova.Commands;
-using AudioResult = WP7CordovaClassLib.Cordova.UI.AudioCaptureTask.AudioResult;
+using WPCordovaClassLib.Cordova.Commands;
+using AudioResult = WPCordovaClassLib.Cordova.UI.AudioCaptureTask.AudioResult;
 
-namespace WP7CordovaClassLib.Cordova.UI
+namespace WPCordovaClassLib.Cordova.UI
 {
     /// <summary>
     /// Implements Audio Recording application
diff --git a/templates/standalone/cordovalib/UI/ImageCapture.xaml b/templates/standalone/cordovalib/UI/ImageCapture.xaml
index 3fe4be6..a7eee21 100644
--- a/templates/standalone/cordovalib/UI/ImageCapture.xaml
+++ b/templates/standalone/cordovalib/UI/ImageCapture.xaml
@@ -1,5 +1,5 @@
 <phone:PhoneApplicationPage 
-    x:Class="WP7CordovaClassLib.Cordova.UI.ImageCapture"
+    x:Class="WPCordovaClassLib.Cordova.UI.ImageCapture"
     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/cordovalib/UI/ImageCapture.xaml.cs b/templates/standalone/cordovalib/UI/ImageCapture.xaml.cs
index 8774e47..234b444 100644
--- a/templates/standalone/cordovalib/UI/ImageCapture.xaml.cs
+++ b/templates/standalone/cordovalib/UI/ImageCapture.xaml.cs
@@ -19,7 +19,7 @@
 using Microsoft.Phone.Controls;
 using Microsoft.Phone.Tasks;
 
-namespace WP7CordovaClassLib.Cordova.UI
+namespace WPCordovaClassLib.Cordova.UI
 {
     public partial class ImageCapture : PhoneApplicationPage
     {
@@ -33,7 +33,7 @@
     {
         /// <summary>
         /// Represents an image returned from a call to the Show method of
-        /// a WP7CordovaClassLib.Cordova.Controls.ImageCaptureTask object
+        /// a WPCordovaClassLib.Cordova.Controls.ImageCaptureTask object
         /// </summary>
         //public class AudioResult : TaskEventArgs
         //{
@@ -79,7 +79,7 @@
 
                 root.Navigated += new System.Windows.Navigation.NavigatedEventHandler(NavigationService_Navigated);
 
-                string baseUrl = WP7CordovaClassLib.Cordova.Commands.BaseCommand.GetBaseURL();
+                string baseUrl = WPCordovaClassLib.Cordova.Commands.BaseCommand.GetBaseURL();
 
                 // dummy parameter is used to always open a fresh version
                 root.Navigate(new System.Uri(baseUrl + "Cordova/UI/ImageCapture.xaml?dummy=" + Guid.NewGuid().ToString(), UriKind.Relative));
diff --git a/templates/standalone/cordovalib/UI/NotificationBox.xaml b/templates/standalone/cordovalib/UI/NotificationBox.xaml
index dda25c6..1ca5d5f 100644
--- a/templates/standalone/cordovalib/UI/NotificationBox.xaml
+++ b/templates/standalone/cordovalib/UI/NotificationBox.xaml
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations
  under the License. 
 -->
-<UserControl x:Class="WP7CordovaClassLib.Cordova.UI.NotificationBox"
+<UserControl x:Class="WPCordovaClassLib.Cordova.UI.NotificationBox"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/templates/standalone/cordovalib/UI/NotificationBox.xaml.cs b/templates/standalone/cordovalib/UI/NotificationBox.xaml.cs
index 4e4a3f8..50b2f2a 100644
--- a/templates/standalone/cordovalib/UI/NotificationBox.xaml.cs
+++ b/templates/standalone/cordovalib/UI/NotificationBox.xaml.cs
@@ -29,7 +29,7 @@
 using System.Windows.Media.Animation;
 using System.Windows.Shapes;
 
-namespace WP7CordovaClassLib.Cordova.UI
+namespace WPCordovaClassLib.Cordova.UI
 {
     public partial class NotificationBox : UserControl
     {
diff --git a/templates/standalone/cordovalib/UI/VideoCaptureTask.cs b/templates/standalone/cordovalib/UI/VideoCaptureTask.cs
index 6655730..def2a88 100644
--- a/templates/standalone/cordovalib/UI/VideoCaptureTask.cs
+++ b/templates/standalone/cordovalib/UI/VideoCaptureTask.cs
@@ -18,7 +18,7 @@
 using Microsoft.Phone.Controls;
 using Microsoft.Phone.Tasks;
 
-namespace WP7CordovaClassLib.Cordova.UI
+namespace WPCordovaClassLib.Cordova.UI
 {
     /// <summary>
     /// Allows an application to launch the Video Recording application. 
@@ -28,7 +28,7 @@
     {
         /// <summary>
         /// Represents recorded video returned from a call to the Show method of
-        /// a WP7CordovaClassLib.Cordova.Controls.VideoCaptureTask object
+        /// a WPCordovaClassLib.Cordova.Controls.VideoCaptureTask object
         /// </summary>
         public class VideoResult : TaskEventArgs
         {
@@ -74,7 +74,7 @@
 
                 root.Navigated += new System.Windows.Navigation.NavigatedEventHandler(NavigationService_Navigated);
 
-                string baseUrl = WP7CordovaClassLib.Cordova.Commands.BaseCommand.GetBaseURL();
+                string baseUrl = WPCordovaClassLib.Cordova.Commands.BaseCommand.GetBaseURL();
                 // dummy parameter is used to always open a fresh version
                 root.Navigate(new System.Uri(baseUrl + "CordovaLib/UI/VideoRecorder.xaml?dummy=" + Guid.NewGuid().ToString(), UriKind.Relative));
             });
diff --git a/templates/standalone/cordovalib/UI/VideoRecorder.xaml b/templates/standalone/cordovalib/UI/VideoRecorder.xaml
index 9d02ec7..c78fdb0 100644
--- a/templates/standalone/cordovalib/UI/VideoRecorder.xaml
+++ b/templates/standalone/cordovalib/UI/VideoRecorder.xaml
@@ -17,7 +17,7 @@
  under the License. 
 -->
 <phone:PhoneApplicationPage 
-    x:Class="WP7CordovaClassLib.Cordova.UI.VideoRecorder"
+    x:Class="WPCordovaClassLib.Cordova.UI.VideoRecorder"
     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/cordovalib/UI/VideoRecorder.xaml.cs b/templates/standalone/cordovalib/UI/VideoRecorder.xaml.cs
index 5637d43..6ab1cc3 100644
--- a/templates/standalone/cordovalib/UI/VideoRecorder.xaml.cs
+++ b/templates/standalone/cordovalib/UI/VideoRecorder.xaml.cs
@@ -20,9 +20,9 @@
 using Microsoft.Phone.Controls;
 using Microsoft.Phone.Shell;
 using Microsoft.Phone.Tasks;
-using VideoResult = WP7CordovaClassLib.Cordova.UI.VideoCaptureTask.VideoResult;
+using VideoResult = WPCordovaClassLib.Cordova.UI.VideoCaptureTask.VideoResult;
 
-namespace WP7CordovaClassLib.Cordova.UI
+namespace WPCordovaClassLib.Cordova.UI
 {
     public partial class VideoRecorder : PhoneApplicationPage
     {