Win2D project name

2014-09-03 15:46:39 -07:00 · 2014-09-03 15:46:39 -07:00 · 7dd7cf10d1
--- a/README.md
+++ b/README.md
@ -1,19 +1,19 @@
-# Windows Canvas
+# Win2D

-Windows Canvas is an easy-to-use Windows Runtime API for immediate mode 2D graphics 
+Win2D is an easy-to-use Windows Runtime API for immediate mode 2D graphics 
 rendering with GPU acceleration. It is available to C# and C++ developers writing 
 Windows Store apps for Windows 8.1 and Windows Phone 8.1. It utilizes the power of 
 Direct2D, and integrates seamlessly with XAML and ICoreWindow.

-Windows Canvas is work in progress and evolving rapidly. The goal of releasing this code 
+Win2D is work in progress and evolving rapidly. The goal of releasing this code 
 in an early, incomplete state is to solicit early developer feedback.

- [Features](http://github.com/Microsoft/WindowsCanvas/wiki/Features) - *what's implemented so far*
- [Backlog](http://github.com/Microsoft/WindowsCanvas/wiki/Backlog) - *what we plan to add next*
- [Documentation](http://microsoft.github.io/WindowsCanvas)
- [Team blog](http://blogs.msdn.com/b/windowscanvas)
+- [Features](http://github.com/Microsoft/Win2D/wiki/Features) - *what's implemented so far*
+- [Backlog](http://github.com/Microsoft/Win2D/wiki/Backlog) - *what we plan to add next*
+- [Documentation](http://microsoft.github.io/Win2D)
+- [Team blog](http://blogs.msdn.com/b/win2d)
 - [License](http://www.apache.org/licenses/LICENSE-2.0.html)
- [Contributing](http://github.com/Microsoft/WindowsCanvas/blob/master/CONTRIBUTING)
+- [Contributing](http://github.com/Microsoft/Win2D/blob/master/CONTRIBUTING)

 ## Code Example
 To give you a flavor of what the code looks like, here is a snippet of XAML:
@ -43,18 +43,18 @@ void canvasControl_Draw(CanvasControl sender, CanvasDrawEventArgs args)

 #### Clone Repository
 - Go to 'View' -> 'Team Explorer' -> 'Local Git Repositories' -> 'Clone'
- Add the Windows Canvas repository URL (https://github.com/Microsoft/WindowsCanvas.git) and hit 'Clone'
+- Add the Win2D repository URL (https://github.com/Microsoft/Win2D.git) and hit 'Clone'

 #### Build NuGet Packages
 - In Windows search, type 'Visual Studio Tools', and select that folder to open it
 - Launch 'Developer Command Prompt for VS2013'
- Change directory to your cloned Windows Canvas repository and run 'build'
+- Change directory to your cloned Win2D repository and run 'build'
 - Point Visual Studio at the resulting 'bin' directory:
  - In Visual Studio, go to 'Tools' -> 'NuGet Package Manager' -> 'Package Manager Settings'
  - Choose 'Package Sources'
  - Click the '+' button to add a new source
-  - Set 'Name' to 'Windows Canvas' (or a name of your choosing)
-  - Set 'Source' to the full path to the 'bin' directory (inside your cloned Windows Canvas repository)
+  - Set 'Name' to 'Win2D' (or a name of your choosing)
+  - Set 'Source' to the full path to the 'bin' directory (inside your cloned Win2D repository)
  - Click the 'Update' button
  - Click 'OK'

@ -67,7 +67,7 @@ Follow the steps below to get started on writing your own apps.
 - Set a 'Name' of your choosing
 - Click 'OK'
 - Go to 'Tools' -> 'NuGet Package Manager' -> 'Manage NuGet Packages for Solution...'
- Select 'Windows Canvas' package and click 'Install'
+- Select 'Win2D' package and click 'Install'
 - Click 'Close'
 - Change Solution platform from 'Any CPU' to x86
 - You are now ready to hit F5 (Build)
@ -91,18 +91,18 @@ Note: For the bulk of interesting product code, go to /winrt/lib.

 **/obj** - Intermediate files generated by the build

-**/samples** - Example projects showing how to use Windows Canvas
+**/samples** - Example projects showing how to use Win2D

-**/tests** - Test projects that consume Windows Canvas in a similar way to how an 
+**/tests** - Test projects that consume Win2D in a similar way to how an 
 external customer would. Each one is a Windows Store app. These tests are run for manual 
 verification.

-**/tools** - Standalone utilities, separate from Canvas product code
- /codegen - Generates headers+IDL from XML resource files (you don't have to build this to build Windows Canvas)
+**/tools** - Standalone utilities, separate from Win2D product code
+- /codegen - Generates headers+IDL from XML resource files (you don't have to build this to build Win2D)
 - /copyright - Verifies the right copyright banner appears at the top of each source file
 - /docs - Tools and scripts for building API reference documentation

-**/winrt** - Windows Canvas product code and automated tests
+**/winrt** - Win2D product code and automated tests
 - /dll - Build resources for the product dll
 - /docsrc - Source files used to create the reference documentation
 - /inc - Common includes
--- a/canvas.proj
+++ b/canvas.proj
@ -5,12 +5,12 @@

    For best performance, enable parallel builds:

-        msbuild canvas.proj /maxcpucount
+        msbuild Win2D.proj /maxcpucount
 -->

 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0" DefaultTargets="Build">

-  <!-- Parameters that can be configured by the caller, eg. "msbuild canvas.proj /p:BuildPhone=false" -->
+  <!-- Parameters that can be configured by the caller, eg. "msbuild Win2D.proj /p:BuildPhone=false" -->
  <PropertyGroup>
    <BuildPlatforms>Win32;x64;ARM;AnyCPU</BuildPlatforms>
    <BuildConfigurations>Debug;Release</BuildConfigurations>
--- a/canvas.sln
+++ b/canvas.sln
--- a/build.cmd
+++ b/build.cmd
@ -13,7 +13,7 @@ IF %ERRORLEVEL% NEQ 0 (
    GOTO END
 )

-msbuild %~dp0canvas.proj /v:m /maxcpucount /p:BuildTests=false /p:BuildTools=false /p:BuildDocs=false
+msbuild %~dp0Win2D.proj /v:m /maxcpucount /p:BuildTests=false /p:BuildTools=false /p:BuildDocs=false

 IF %ERRORLEVEL% NEQ 0 (
    ECHO Build failed; aborting.
--- a/build/canvas.common.props
+++ b/build/canvas.common.props
--- a/build/canvas.common.targets
+++ b/build/canvas.common.targets
--- a/build/canvas.cpp.props
+++ b/build/canvas.cpp.props
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <Import Project="canvas.common.props" />
+  <Import Project="Win2D.common.props" />

  <!-- This lets individual projects turn off their building.  This allows us to
       prevent building in the cloud for unsupported SDKs (ie Phone unit tests)
--- a/build/canvas.cpp.targets
+++ b/build/canvas.cpp.targets
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="canvas.common.targets"/>
+  <Import Project="Win2D.common.targets"/>
 </Project>
--- a/build/canvas.cs.props
+++ b/build/canvas.cs.props
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="canvas.common.props"/>
+  <Import Project="Win2D.common.props"/>

  <!-- This lets individual projects turn off their building.  This allows us to
       prevent building in the cloud for unsupported SDKs (ie Phone unit tests)
--- a/build/canvas.cs.targets
+++ b/build/canvas.cs.targets
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="canvas.common.targets"/>
+  <Import Project="Win2D.common.targets"/>
 </Project>
--- a/build/nuget/WindowsCanvas-debug.nuspec
+++ b/build/nuget/WindowsCanvas-debug.nuspec
@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
-        <id>WindowsCanvas-debug</id>
+        <id>Win2D-debug</id>
        <version>0.0.2</version>
-        <title>Windows Canvas (debug)</title>
+        <title>Win2D (debug)</title>
        <authors>Microsoft Corportation</authors>
        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Windows Canvas debug build.  Suitable for debugging Windows Canvas itself.</description>
+        <description>Win2D debug build.  Suitable for debugging Win2D itself.</description>

        <dependencies>
-          <dependency id="WindowsCanvas"/>
+          <dependency id="Win2D"/>
        </dependencies>
   </metadata>

@ -51,6 +51,6 @@
      <file src="..\..\bin\intellisense\Microsoft.Graphics.Canvas.xml" target="bin\Phone\arm" />
      <file src="..\..\bin\intellisense\Microsoft.Graphics.Canvas.Numerics.xml" target="bin\Phone\arm" />

-      <file src="WindowsCanvas-debug.props" target="build" />
+      <file src="Win2D-debug.props" target="build" />
    </files>
 </package>
--- a/build/nuget/WindowsCanvas-debug.props
+++ b/build/nuget/WindowsCanvas-debug.props
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- This file is imported by csproj / vcxproj's that have installed the Windows Canvas Debug package -->
+  <!-- This file is imported by csproj / vcxproj's that have installed the Win2D Debug package -->
  <PropertyGroup>
-    <!-- This overrides the setting in WindowsCanvas.props to make it use the
+    <!-- This overrides the setting in Win2D.props to make it use the
         debug binaries -->
-    <windowscanvas-BinDir>$(MSBuildThisFileDirectory)..\bin\</windowscanvas-BinDir>
+    <win2d-BinDir>$(MSBuildThisFileDirectory)..\bin\</win2d-BinDir>
  </PropertyGroup>
 </Project>

--- a/build/nuget/Win2D-managed.targets
+++ b/build/nuget/Win2D-managed.targets
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <win2d-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'Windows'">Windows</win2d-DeviceType>
+    <win2d-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'WindowsPhoneApp'">Phone</win2d-DeviceType>
+  </PropertyGroup>
+
+  <Target Name="win2d-DeviceType-Check" BeforeTargets="InjectReference">
+      <Error Condition="'$(win2d-DeviceType)' == ''" Text="Unable to determine if Windows or Windows Phone app" />
+  </Target>
+
+  <Target Name="InjectReference" BeforeTargets="ResolveAssemblyReferences">
+    <ItemGroup>
+      <Reference Include="Microsoft.Graphics.Canvas">
+        <HintPath>$(win2d-BinDir)$(win2d-DeviceType)\$(win2d-Platform)\Microsoft.Graphics.Canvas.winmd</HintPath>
+      </Reference>
+    </ItemGroup>
+
+    <ItemGroup>
+      <Reference Include="Microsoft.Graphics.Canvas.Numerics">
+        <HintPath>$(win2d-BinDir)$(win2d-DeviceType)\$(win2d-Platform)\Microsoft.Graphics.Canvas.Numerics.dll</HintPath>
+      </Reference>
+    </ItemGroup>
+  </Target>
+
+  <ItemGroup>
+    <SDKReference Include="Microsoft.VCLibs, Version=12.0">
+      <Name>Microsoft Visual C++ 2013 Runtime Package for Windows</Name>
+    </SDKReference>
+  </ItemGroup>
+
+</Project>
--- a/build/nuget/Win2D-native.targets
+++ b/build/nuget/Win2D-native.targets
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <win2d-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'Windows'">Windows</win2d-DeviceType>
+    <win2d-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'WindowsPhoneApp'">Phone</win2d-DeviceType>
+  </PropertyGroup>
+
+  <Target Name="win2d-DeviceType-Check" BeforeTargets="ResolveAssemblyReferences">
+      <Error Condition="'$(win2d-DeviceType)' == ''" Text="Unable to determine if Windows or Windows Phone app" />
+  </Target>
+
+  <ItemGroup>
+      <Reference Include="Microsoft.Graphics.Canvas">
+        <HintPath>$(win2d-BinDir)$(win2d-DeviceType)\$(win2d-Platform)\Microsoft.Graphics.Canvas.winmd</HintPath>
+      </Reference>      
+  </ItemGroup>
+
+</Project>
--- a/build/nuget/WindowsCanvas.nuspec
+++ b/build/nuget/WindowsCanvas.nuspec
@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
-        <id>WindowsCanvas</id>
+        <id>Win2D</id>
        <version>0.0.2</version>
-        <title>Windows Canvas</title>
+        <title>Win2D</title>
        <authors>Microsoft Corportation</authors>
        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Windows Canvas</description>
+        <description>Win2D</description>

        <!-- 
             The reference listed here is to enable the Visual Studio designer
@ -71,16 +71,16 @@
      <file src="..\..\bin\intellisense\Microsoft.Graphics.Canvas.Numerics.xml" target="bin\Phone\arm" />

      <!-- Build scripts used by managed Windows Store Apps -->
-      <file src="WindowsCanvas.props" target="build\win\WindowsCanvas.props" />
-      <file src="WindowsCanvas-managed.targets" target="build\win\WindowsCanvas.targets" />
+      <file src="Win2D.props" target="build\win\Win2D.props" />
+      <file src="Win2D-managed.targets" target="build\win\Win2D.targets" />

      <!-- Build scripts used by managed Windows Phone Apps -->
-      <file src="WindowsCanvas.props" target="build\wpa\WindowsCanvas.props" />
-      <file src="WindowsCanvas-managed.targets" target="build\wpa\WindowsCanvas.targets" />
+      <file src="Win2D.props" target="build\wpa\Win2D.props" />
+      <file src="Win2D-managed.targets" target="build\wpa\Win2D.targets" />

      <!-- Build scripts used by native apps (Windows Store and Windows Phone) -->
-      <file src="WindowsCanvas-native.targets" target="build\native\WindowsCanvas.targets" />
-      <file src="WindowsCanvas.props" target="build\native\WindowsCanvas.props" />
+      <file src="Win2D-native.targets" target="build\native\Win2D.targets" />
+      <file src="Win2D.props" target="build\native\Win2D.props" />

      <!-- Header files used by native apps -->
      <file src="..\..\winrt\published\*" target="Include"/>
--- a/build/nuget/WindowsCanvas.props
+++ b/build/nuget/WindowsCanvas.props
@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- This file is imported by csproj / vcxproj's that have installed the Windows Canvas package -->
+  <!-- This file is imported by csproj / vcxproj's that have installed the Win2D package -->

  <PropertyGroup>
-    <windowscanvas-Platform Condition="'$(Platform)' == 'Win32'">x86</windowscanvas-Platform>
-    <windowscanvas-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</windowscanvas-Platform>
+    <win2d-Platform Condition="'$(Platform)' == 'Win32'">x86</win2d-Platform>
+    <win2d-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</win2d-Platform>

    <!-- This directory may be overridden by other packages that provide
-         different binaries (eg for debugging Windows Canvas itself). -->
-    <windowscanvas-BinDir Condition="'$(windowscanvas-BinDir)' == ''">$(MSBuildThisFileDirectory)..\..\bin\</windowscanvas-BinDir>
+         different binaries (eg for debugging Win2D itself). -->
+    <win2d-BinDir Condition="'$(win2d-BinDir)' == ''">$(MSBuildThisFileDirectory)..\..\bin\</win2d-BinDir>
  </PropertyGroup>

  <ItemDefinitionGroup>
--- a/build/nuget/WindowsCanvas-managed.targets
+++ b/build/nuget/WindowsCanvas-managed.targets
@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <windowscanvas-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'Windows'">Windows</windowscanvas-DeviceType>
-    <windowscanvas-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'WindowsPhoneApp'">Phone</windowscanvas-DeviceType>
-  </PropertyGroup>
-
-  <Target Name="windowscanvas-DeviceType-Check" BeforeTargets="InjectReference">
-      <Error Condition="'$(windowscanvas-DeviceType)' == ''" Text="Unable to determine if Windows or Windows Phone app" />
-  </Target>
-
-  <Target Name="InjectReference" BeforeTargets="ResolveAssemblyReferences">
-    <ItemGroup>
-      <Reference Include="Microsoft.Graphics.Canvas">
-        <HintPath>$(windowscanvas-BinDir)$(windowscanvas-DeviceType)\$(windowscanvas-Platform)\Microsoft.Graphics.Canvas.winmd</HintPath>
-      </Reference>
-    </ItemGroup>
-
-    <ItemGroup>
-      <Reference Include="Microsoft.Graphics.Canvas.Numerics">
-        <HintPath>$(windowscanvas-BinDir)$(windowscanvas-DeviceType)\$(windowscanvas-Platform)\Microsoft.Graphics.Canvas.Numerics.dll</HintPath>
-      </Reference>
-    </ItemGroup>
-  </Target>
-
-  <ItemGroup>
-    <SDKReference Include="Microsoft.VCLibs, Version=12.0">
-      <Name>Microsoft Visual C++ 2013 Runtime Package for Windows</Name>
-    </SDKReference>
-  </ItemGroup>
-
-</Project>
--- a/build/nuget/WindowsCanvas-native.targets
+++ b/build/nuget/WindowsCanvas-native.targets
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <windowscanvas-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'Windows'">Windows</windowscanvas-DeviceType>
-    <windowscanvas-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'WindowsPhoneApp'">Phone</windowscanvas-DeviceType>
-  </PropertyGroup>
-
-  <Target Name="windowscanvas-DeviceType-Check" BeforeTargets="ResolveAssemblyReferences">
-      <Error Condition="'$(windowscanvas-DeviceType)' == ''" Text="Unable to determine if Windows or Windows Phone app" />
-  </Target>
-
-  <ItemGroup>
-      <Reference Include="Microsoft.Graphics.Canvas">
-        <HintPath>$(windowscanvas-BinDir)$(windowscanvas-DeviceType)\$(windowscanvas-Platform)\Microsoft.Graphics.Canvas.winmd</HintPath>
-      </Reference>      
-  </ItemGroup>
-
-</Project>
--- a/build/nuget/build-nupkg.cmd
+++ b/build/nuget/build-nupkg.cmd
@ -10,8 +10,8 @@ IF %ERRORLEVEL% NEQ 0 (
    GOTO END
 )

-nuget pack %~dp0WindowsCanvas.nuspec -nopackageanalysis -outputdirectory %~dp0..\..\bin %*
-nuget pack %~dp0WindowsCanvas-debug.nuspec -nopackageanalysis -outputdirectory %~dp0..\..\bin %*
+nuget pack %~dp0Win2D.nuspec -nopackageanalysis -outputdirectory %~dp0..\..\bin %*
+nuget pack %~dp0Win2D-debug.nuspec -nopackageanalysis -outputdirectory %~dp0..\..\bin %*

 :END

--- a/numerics/Cpp/tests/CppNumericsTests.Windows.vcxproj
+++ b/numerics/Cpp/tests/CppNumericsTests.Windows.vcxproj
@ -14,7 +14,7 @@
    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
    <AppxBundle>Never</AppxBundle>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\..\build\canvas.cpp.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\build\Win2D.cpp.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
@ -62,5 +62,5 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets" />
  <Import Project="$(VCInstallDir)\..\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.TestTools.Cpp.targets" Condition="Exists('$(VCInstallDir)\..\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.TestTools.Cpp.targets')" />
-  <Import Project="$(MSBuildThisFileDir)..\..\..\build\canvas.cpp.targets" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\build\Win2D.cpp.targets" />
 </Project>
--- a/numerics/Cpp/tests/CppNumericsTests.WindowsPhone.vcxproj
+++ b/numerics/Cpp/tests/CppNumericsTests.WindowsPhone.vcxproj
@ -12,7 +12,7 @@
    <AppxPackage>True</AppxPackage>
    <DoNotBuild Condition="'$(TF_BUILD)' == 'true'">true</DoNotBuild>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\..\build\canvas.cpp.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\build\Win2D.cpp.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="CppNumericsTests.Shared.vcxitems" Label="Shared" />
  <PropertyGroup Label="UserMacros">
@ -69,5 +69,5 @@
  <PropertyGroup>
    <_DefineDefaultConvergedProjectType>False</_DefineDefaultConvergedProjectType>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\..\build\canvas.cpp.targets" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\build\Win2D.cpp.targets" />
 </Project>
--- a/numerics/DotNet/DotNetNumerics.Windows.csproj
+++ b/numerics/DotNet/DotNetNumerics.Windows.csproj
@ -18,7 +18,7 @@
    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <TargetFrameworkVersion />
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cs.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
    <DebugSymbols>true</DebugSymbols>
    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_APP;INCLUDE_WINRT_CANVAS_INTEROP</DefineConstants>
--- a/numerics/DotNet/DotNetNumerics.WindowsPhone.csproj
+++ b/numerics/DotNet/DotNetNumerics.WindowsPhone.csproj
@ -20,7 +20,7 @@
  <PropertyGroup Condition=" '$(TargetPlatformIdentifier)' == '' ">
    <TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cs.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
    <DebugSymbols>true</DebugSymbols>
    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP;INCLUDE_WINRT_CANVAS_INTEROP</DefineConstants>
--- a/numerics/DotNet/tests/Windows/DotNetNumericsTests.Windows.csproj
+++ b/numerics/DotNet/tests/Windows/DotNetNumericsTests.Windows.csproj
@ -19,7 +19,7 @@
    <AppxBundle>Never</AppxBundle>
    <TargetFrameworkVersion />
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\..\build\Win2D.cs.props" />
  <PropertyGroup>
    <PackageCertificateKeyFile>$(AssetDir)TemporaryKey.pfx</PackageCertificateKeyFile>
  </PropertyGroup>
@ -135,5 +135,5 @@
  </PropertyGroup>
  <Import Project="..\Shared\DotNetNumericsTests.Shared.projitems" Label="Shared" />
  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <Import Project="$(MSBuildThisFileDir)..\..\..\..\build\canvas.cs.targets" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\..\build\Win2D.cs.targets" />
 </Project>
--- a/numerics/DotNet/tests/WindowsPhone/DotNetNumericsTests.WindowsPhone.csproj
+++ b/numerics/DotNet/tests/WindowsPhone/DotNetNumericsTests.WindowsPhone.csproj
@ -26,7 +26,7 @@
  <PropertyGroup Condition=" '$(TargetPlatformIdentifier)' == '' ">
    <TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\..\build\Win2D.cs.props" />
  <PropertyGroup>
    <PackageCertificateKeyFile>$(AssetDir)TemporaryKey.pfx</PackageCertificateKeyFile>
  </PropertyGroup>
@ -128,5 +128,5 @@
  <Target Name="AfterBuild">
  </Target>
  -->
-  <Import Project="$(MSBuildThisFileDir)..\..\..\..\build\canvas.cs.targets" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\..\build\Win2D.cs.targets" />
 </Project>
--- a/samples/SimpleSample/SimpleSample.Windows/SimpleSample.Windows.csproj
+++ b/samples/SimpleSample/SimpleSample.Windows/SimpleSample.Windows.csproj
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\WindowsCanvas.0.0.2\build\win\WindowsCanvas.props" Condition="Exists('..\packages\WindowsCanvas.0.0.2\build\win\WindowsCanvas.props')" />
+  <Import Project="..\packages\Win2D.0.0.2\build\win\Win2D.props" Condition="Exists('..\packages\Win2D.0.0.2\build\win\Win2D.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -109,7 +109,7 @@
  </ItemGroup>
  <ItemGroup>
    <Reference Include="Microsoft.Graphics.Canvas">
-      <HintPath>..\packages\WindowsCanvas.0.0.2\lib\win\Microsoft.Graphics.Canvas.winmd</HintPath>
+      <HintPath>..\packages\Win2D.0.0.2\lib\win\Microsoft.Graphics.Canvas.winmd</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
@ -124,10 +124,10 @@
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\WindowsCanvas.0.0.2\build\win\WindowsCanvas.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WindowsCanvas.0.0.2\build\win\WindowsCanvas.props'))" />
-    <Error Condition="!Exists('..\packages\WindowsCanvas.0.0.2\build\win\WindowsCanvas.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WindowsCanvas.0.0.2\build\win\WindowsCanvas.targets'))" />
+    <Error Condition="!Exists('..\packages\Win2D.0.0.2\build\win\Win2D.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Win2D.0.0.2\build\win\Win2D.props'))" />
+    <Error Condition="!Exists('..\packages\Win2D.0.0.2\build\win\Win2D.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Win2D.0.0.2\build\win\Win2D.targets'))" />
  </Target>
-  <Import Project="..\packages\WindowsCanvas.0.0.2\build\win\WindowsCanvas.targets" Condition="Exists('..\packages\WindowsCanvas.0.0.2\build\win\WindowsCanvas.targets')" />
+  <Import Project="..\packages\Win2D.0.0.2\build\win\Win2D.targets" Condition="Exists('..\packages\Win2D.0.0.2\build\win\Win2D.targets')" />
  <!-- 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">
--- a/samples/SimpleSample/SimpleSample.Windows/packages.config
+++ b/samples/SimpleSample/SimpleSample.Windows/packages.config
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="WindowsCanvas" version="0.0.2" targetFramework="win81" />
+  <package id="Win2D" version="0.0.2" targetFramework="win81" />
 </packages>
--- a/samples/SimpleSample/SimpleSample.WindowsPhone/SimpleSample.WindowsPhone.csproj
+++ b/samples/SimpleSample/SimpleSample.WindowsPhone/SimpleSample.WindowsPhone.csproj
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\WindowsCanvas.0.0.2\build\wpa\WindowsCanvas.props" Condition="Exists('..\packages\WindowsCanvas.0.0.2\build\wpa\WindowsCanvas.props')" />
+  <Import Project="..\packages\Win2D.0.0.2\build\wpa\Win2D.props" Condition="Exists('..\packages\Win2D.0.0.2\build\wpa\Win2D.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -89,7 +89,7 @@
  </ItemGroup>
  <ItemGroup>
    <Reference Include="Microsoft.Graphics.Canvas">
-      <HintPath>..\packages\WindowsCanvas.0.0.2\lib\wpa\Microsoft.Graphics.Canvas.winmd</HintPath>
+      <HintPath>..\packages\Win2D.0.0.2\lib\wpa\Microsoft.Graphics.Canvas.winmd</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
@ -107,10 +107,10 @@
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\WindowsCanvas.0.0.2\build\wpa\WindowsCanvas.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WindowsCanvas.0.0.2\build\wpa\WindowsCanvas.props'))" />
-    <Error Condition="!Exists('..\packages\WindowsCanvas.0.0.2\build\wpa\WindowsCanvas.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WindowsCanvas.0.0.2\build\wpa\WindowsCanvas.targets'))" />
+    <Error Condition="!Exists('..\packages\Win2D.0.0.2\build\wpa\Win2D.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Win2D.0.0.2\build\wpa\Win2D.props'))" />
+    <Error Condition="!Exists('..\packages\Win2D.0.0.2\build\wpa\Win2D.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Win2D.0.0.2\build\wpa\Win2D.targets'))" />
  </Target>
-  <Import Project="..\packages\WindowsCanvas.0.0.2\build\wpa\WindowsCanvas.targets" Condition="Exists('..\packages\WindowsCanvas.0.0.2\build\wpa\WindowsCanvas.targets')" />
+  <Import Project="..\packages\Win2D.0.0.2\build\wpa\Win2D.targets" Condition="Exists('..\packages\Win2D.0.0.2\build\wpa\Win2D.targets')" />
  <!-- 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">
--- a/samples/SimpleSample/SimpleSample.WindowsPhone/packages.config
+++ b/samples/SimpleSample/SimpleSample.WindowsPhone/packages.config
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="WindowsCanvas" version="0.0.2" targetFramework="wpa81" />
+  <package id="Win2D" version="0.0.2" targetFramework="wpa81" />
 </packages>
--- a/samples/SimpleSample/nuget.config
+++ b/samples/SimpleSample/nuget.config
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <packageSources>
-    <add key="Locally Built Windows Canvas" value="..\..\bin" />
+    <add key="Locally Built Win2D" value="..\..\bin" />
  </packageSources>
  <packageRestore>
    <add key="enabled" value="True" />
--- a/tests/CppConsumer/CppConsumer.Windows.vcxproj
+++ b/tests/CppConsumer/CppConsumer.Windows.vcxproj
@ -9,7 +9,7 @@
    <ApplicationType>Windows Store</ApplicationType>
    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <PropertyGroup>
@ -42,5 +42,5 @@
  </ItemGroup>
  <Import Project="CppConsumer.Shared.vcxitems" Label="Shared" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.targets" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.targets" />
 </Project>
--- a/tests/CppConsumer/CppConsumer.WindowsPhone.vcxproj
+++ b/tests/CppConsumer/CppConsumer.WindowsPhone.vcxproj
@ -9,7 +9,7 @@
    <ApplicationType>Windows Phone</ApplicationType>
    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <PropertyGroup>
@ -48,5 +48,5 @@
  </ItemGroup>
  <Import Project="CppConsumer.Shared.vcxitems" Label="Shared" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.targets" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.targets" />
 </Project>
--- a/tests/CsConsumer/Windows/CsConsumer.Windows.csproj
+++ b/tests/CsConsumer/Windows/CsConsumer.Windows.csproj
@ -16,7 +16,7 @@
    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <TargetFrameworkVersion />
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\build\Win2D.cs.props" />
  <PropertyGroup>
    <PackageCertificateKeyFile>$(AssetDir)TemporaryKey.pfx</PackageCertificateKeyFile>
  </PropertyGroup>
--- a/tests/CsConsumer/WindowsPhone/CsConsumer.WindowsPhone.csproj
+++ b/tests/CsConsumer/WindowsPhone/CsConsumer.WindowsPhone.csproj
@ -19,7 +19,7 @@
  <PropertyGroup Condition=" '$(TargetPlatformIdentifier)' == '' ">
    <TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\build\Win2D.cs.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
    <DebugSymbols>true</DebugSymbols>
    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants>
--- a/tests/ExampleGallery/Shared/MainPage.xaml
+++ b/tests/ExampleGallery/Shared/MainPage.xaml
@ -37,7 +37,7 @@ under the License.
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="*"/>
            </Grid.RowDefinitions>
-            <TextBlock Grid.Row="0" Style="{StaticResource HeaderTextBlockStyle}" TextWrapping="WrapWholeWords" Margin="0,0,0,10">Windows Canvas Example Gallery</TextBlock>
+            <TextBlock Grid.Row="0" Style="{StaticResource HeaderTextBlockStyle}" TextWrapping="WrapWholeWords" Margin="0,0,0,10">Win2D Example Gallery</TextBlock>
            <GridView Grid.Row="1" ItemTemplate="{StaticResource ItemTemplate}" ItemsSource="{Binding Definitions}" VerticalContentAlignment="Top" ItemClick="GridView_ItemClick" SelectionMode="None" IsItemClickEnabled="True">
                <GridView.ItemContainerTransitions>
                    <TransitionCollection>
--- a/tests/ExampleGallery/Windows/Assets/Logo.scale-100.png
+++ b/tests/ExampleGallery/Windows/Assets/Logo.scale-100.png
--- a/tests/ExampleGallery/Windows/Assets/SmallLogo.scale-100.png
+++ b/tests/ExampleGallery/Windows/Assets/SmallLogo.scale-100.png
--- a/tests/ExampleGallery/Windows/Assets/SplashScreen.scale-100.png
+++ b/tests/ExampleGallery/Windows/Assets/SplashScreen.scale-100.png
--- a/tests/ExampleGallery/Windows/Assets/StoreLogo.scale-100.png
+++ b/tests/ExampleGallery/Windows/Assets/StoreLogo.scale-100.png
--- a/tests/ExampleGallery/Windows/ExampleGallery.Windows.appxmanifest
+++ b/tests/ExampleGallery/Windows/ExampleGallery.Windows.appxmanifest
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="WindowsCanvasExampleGallery-Windows" Publisher="CN=Microsoft Corporation" Version="1.0.0.0" />
+  <Identity Name="Win2DExampleGallery-Windows" Publisher="CN=Microsoft Corporation" Version="1.0.0.0" />
  <Properties>
-    <DisplayName>Windows Canvas Example Gallery</DisplayName>
+    <DisplayName>Win2D Example Gallery</DisplayName>
    <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
    <Logo>Assets\StoreLogo.png</Logo>
  </Properties>
@ -15,7 +15,7 @@
  </Resources>
  <Applications>
    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="ExampleGallery.Windows.App">
-      <m2:VisualElements DisplayName="Windows Canvas Example Gallery" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png" Description="Window Canvas Example Gallery" ForegroundText="light" BackgroundColor="#464646" ToastCapable="false">
+      <m2:VisualElements DisplayName="Win2D Example Gallery" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png" Description="Window Canvas Example Gallery" ForegroundText="light" BackgroundColor="#464646" ToastCapable="false">
        <m2:SplashScreen Image="Assets\SplashScreen.png" />
      </m2:VisualElements>
    </Application>
--- a/tests/ExampleGallery/Windows/ExampleGallery.Windows.csproj
+++ b/tests/ExampleGallery/Windows/ExampleGallery.Windows.csproj
@ -16,7 +16,7 @@
    <SynthesizeLinkMetadata>true</SynthesizeLinkMetadata>
    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\build\Win2D.cs.props" />
  <PropertyGroup>
    <PackageCertificateKeyFile>$(AssetDir)TemporaryKey.pfx</PackageCertificateKeyFile>
  </PropertyGroup>
--- a/tests/ExampleGallery/WindowsPhone/Assets/Logo.scale-240.png
+++ b/tests/ExampleGallery/WindowsPhone/Assets/Logo.scale-240.png
--- a/tests/ExampleGallery/WindowsPhone/Assets/SmallLogo.scale-240.png
+++ b/tests/ExampleGallery/WindowsPhone/Assets/SmallLogo.scale-240.png
--- a/tests/ExampleGallery/WindowsPhone/Assets/SplashScreen.scale-240.png
+++ b/tests/ExampleGallery/WindowsPhone/Assets/SplashScreen.scale-240.png
--- a/tests/ExampleGallery/WindowsPhone/Assets/Square71x71Logo.scale-240.png
+++ b/tests/ExampleGallery/WindowsPhone/Assets/Square71x71Logo.scale-240.png
--- a/tests/ExampleGallery/WindowsPhone/Assets/StoreLogo.scale-240.png
+++ b/tests/ExampleGallery/WindowsPhone/Assets/StoreLogo.scale-240.png
--- a/tests/ExampleGallery/WindowsPhone/Assets/WideLogo.scale-240.png
+++ b/tests/ExampleGallery/WindowsPhone/Assets/WideLogo.scale-240.png
--- a/tests/ExampleGallery/WindowsPhone/ExampleGallery.WindowsPhone.appxmanifest
+++ b/tests/ExampleGallery/WindowsPhone/ExampleGallery.WindowsPhone.appxmanifest
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest" xmlns:m3="http://schemas.microsoft.com/appx/2014/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest">
-  <Identity Name="WindowsCanvasExampleGallery.Phone" Publisher="CN=Microsoft Corporation" Version="1.0.0.0" />
+  <Identity Name="Win2DExampleGallery.Phone" Publisher="CN=Microsoft Corporation" Version="1.0.0.0" />
  <mp:PhoneIdentity PhoneProductId="dec607a3-f3da-496f-95f8-c5fa1a8941d8" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
  <Properties>
-    <DisplayName>Windows Canvas Example Gallery</DisplayName>
+    <DisplayName>Win2D Example Gallery</DisplayName>
    <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
    <Logo>Assets\StoreLogo.png</Logo>
  </Properties>
@ -16,7 +16,7 @@
  </Resources>
  <Applications>
    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="ExampleGallery.WindowsPhone.App">
-      <m3:VisualElements DisplayName="Windows Canvas Example Gallery" Square150x150Logo="Assets\Logo.png" Square44x44Logo="Assets\SmallLogo.png" Description="Windows Canvas Example Gallery" ForegroundText="light" BackgroundColor="transparent" ToastCapable="false">
+      <m3:VisualElements DisplayName="Win2D Example Gallery" Square150x150Logo="Assets\Logo.png" Square44x44Logo="Assets\SmallLogo.png" Description="Win2D Example Gallery" ForegroundText="light" BackgroundColor="transparent" ToastCapable="false">
        <m3:DefaultTile Wide310x150Logo="Assets\WideLogo.png" Square71x71Logo="Assets\Square71x71Logo.png">
        </m3:DefaultTile>
        <m3:SplashScreen Image="Assets\SplashScreen.png" />
--- a/tests/ExampleGallery/WindowsPhone/ExampleGallery.WindowsPhone.csproj
+++ b/tests/ExampleGallery/WindowsPhone/ExampleGallery.WindowsPhone.csproj
@ -17,7 +17,7 @@
    <SynthesizeLinkMetadata>true</SynthesizeLinkMetadata>
    <AppxBundle>Never</AppxBundle>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\build\Win2D.cs.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
    <DebugSymbols>true</DebugSymbols>
    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP</DefineConstants>
--- a/tools/codegen/exe/codegen.exe.csproj
+++ b/tools/codegen/exe/codegen.exe.csproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Win2D.cs.props" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
--- a/tools/codegen/test/codegen.test.csproj
+++ b/tools/codegen/test/codegen.test.csproj
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Win2D.cs.props" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
--- a/tools/copyright/CheckCopyrightBanners.proj
+++ b/tools/copyright/CheckCopyrightBanners.proj
@ -18,7 +18,7 @@

 <Project ToolsVersion="12.0" DefaultTargets="CheckCopyrightBanners" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <Import Project="$(MsBuildThisFileDirectory)..\..\build\canvas.common.props" />
+  <Import Project="$(MsBuildThisFileDirectory)..\..\build\Win2D.common.props" />

  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
--- a/tools/copyright/copyright.csproj
+++ b/tools/copyright/copyright.csproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\build\Win2D.cs.props" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -51,5 +51,5 @@
    <Content Include="copyright.txt" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\build\canvas.cs.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\build\Win2D.cs.targets" />
 </Project>
--- a/tools/docs/BuildDocs.proj
+++ b/tools/docs/BuildDocs.proj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="BuildDocs" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <Import Project="$(MsBuildThisFileDirectory)..\..\build\canvas.common.props" />
+  <Import Project="$(MsBuildThisFileDirectory)..\..\build\Win2D.common.props" />


  <!-- Settings -->
--- a/tools/docs/BuildDocs.shfbproj
+++ b/tools/docs/BuildDocs.shfbproj
@ -35,9 +35,9 @@
    <OutputPath>$(MSBuildThisFileDirectory)..\..\bin\docs</OutputPath>

    <!-- Header and footer applied to all doc pages -->
-    <HelpTitle>Windows Canvas documentation</HelpTitle>
+    <HelpTitle>Win2D documentation</HelpTitle>
    <CopyrightText>Copyright %28c%29 Microsoft Corporation. All rights reserved.</CopyrightText>
-    <CopyrightHref>http://github.com/Microsoft/WindowsCanvas/blob/master/LICENSE.txt</CopyrightHref>
+    <CopyrightHref>http://github.com/Microsoft/Win2D/blob/master/LICENSE.txt</CopyrightHref>

    <DocumentationSources>
      <!-- Reference assemblies -->
--- a/tools/docs/DocDiff/DocDiff.csproj
+++ b/tools/docs/DocDiff/DocDiff.csproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Win2D.cs.props" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -50,5 +50,5 @@
    <None Include="App.config" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\canvas.cs.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Win2D.cs.targets" />
 </Project>
--- a/tools/docs/ExtractAPISurface/ExtractAPISurface.csproj
+++ b/tools/docs/ExtractAPISurface/ExtractAPISurface.csproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Win2D.cs.props" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -53,5 +53,5 @@
    <None Include="App.config" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\canvas.cs.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Win2D.cs.targets" />
 </Project>
--- a/tools/docs/MergeIntellisense/MergeIntellisense.csproj
+++ b/tools/docs/MergeIntellisense/MergeIntellisense.csproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Win2D.cs.props" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -49,5 +49,5 @@
    <None Include="App.config" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\canvas.cs.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Win2D.cs.targets" />
 </Project>
--- a/winrt/dll/winrt.dll.Shared.vcxitems
+++ b/winrt/dll/winrt.dll.Shared.vcxitems
@ -10,7 +10,7 @@
    <TargetName>$(ItemsRootNamespace)</TargetName>
  </PropertyGroup>

-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.props" />

  <ItemGroup>
    <ProjectCapability Include="SourceItemsFromImports" />
@ -63,6 +63,6 @@


  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.targets" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.targets" />

 </Project>
--- a/winrt/docsrc/CanvasControl.xml
+++ b/winrt/docsrc/CanvasControl.xml
@ -20,9 +20,9 @@ under the License.
  <members>

    <member name="T:Microsoft.Graphics.Canvas.CanvasControl">
-      <summary>XAML control providing immediate mode 2D rendering. Start here if you are new to the Windows Canvas API.</summary>
+      <summary>XAML control providing immediate mode 2D rendering. Start here if you are new to the Win2D API.</summary>
      <remarks>
-        To get started using Windows Canvas, simply add a CanvasControl to your XAML
+        To get started using Win2D, simply add a CanvasControl to your XAML
        tree, subscribe to its CanvasControl.Draw event, and use the methods of
        CanvasDrawEventArgs.DrawingSession to draw your immediate mode 2D graphics.
      </remarks>
--- a/winrt/docsrc/CanvasDrawingSession.xml
+++ b/winrt/docsrc/CanvasDrawingSession.xml
@ -23,7 +23,7 @@ under the License.
      <summary>Drawing sessions are used to issue graphics drawing commands. This is the main way to draw things onto a canvas.</summary>
      <remarks>
        <p>For best performance, graphics drawing commands need to be batched into groups so the GPU hardware
-           can process as many operations as possible in parallel. Windows Canvas achieves this through the
+           can process as many operations as possible in parallel. Win2D achieves this through the
           CanvasDrawingSession API. A drawing session represents an active batch of commands that are in the
           process of being generated. Use its various methods to indicate what you want to draw, then when
           you dispose the CanvasDrawingSession the entire batch will be optimized and submitted for the GPU
--- a/winrt/docsrc/Interop.aml
+++ b/winrt/docsrc/Interop.aml
@ -18,22 +18,22 @@ under the License.

    <introduction>
      <para>
-        Windows Canvas is implemented as a layer on top of 
+        Win2D is implemented as a layer on top of 
        <externalLink>
          <linkUri>http://msdn.microsoft.com/en-us/library/windows/desktop/dd370990</linkUri>
          <linkText>Direct2D</linkText>
        </externalLink>,
-        and supports interop in both directions. If you have a Windows Canvas object, you can
+        and supports interop in both directions. If you have a Win2D object, you can
        access the native Direct2D object that is used to implement it. If you have a Direct2D 
-        object, you can look up the Windows Canvas object that wraps it, or create a new wrapper 
+        object, you can look up the Win2D object that wraps it, or create a new wrapper 
        if one did not already exist.
      </para>

      <para>
-        Interop allows you to mix and match Windows Canvas with native DirectX APIs. You can write
-        an app that mostly uses Windows Canvas, but drop down to native DirectX at any point -
+        Interop allows you to mix and match Win2D with native DirectX APIs. You can write
+        an app that mostly uses Win2D, but drop down to native DirectX at any point -
        perhaps to call into some other API or 3rd party component that requires native interfaces.
-        Or your app can be mostly native DirectX, yet you can switch over to Windows Canvas in specific
+        Or your app can be mostly native DirectX, yet you can switch over to Win2D in specific
        places where you want its extra convenience or C# support.
      </para>
    </introduction>
@ -41,7 +41,7 @@ under the License.
    <section>
      <title>Interop APIs</title>
      <content>
-        <para>To move back and forth between Windows Canvas and native Direct2D interfaces, use the C++/CX methods:</para>
+        <para>To move back and forth between Win2D and native Direct2D interfaces, use the C++/CX methods:</para>

        <code>
        // header: Microsoft.Graphics.Canvas.native.h
@ -77,7 +77,7 @@ under the License.
          using namespace Microsoft::WRL;
        </code>

-        <para>To get the native Direct2D object that is wrapped by a Windows Canvas object:</para>
+        <para>To get the native Direct2D object that is wrapped by a Win2D object:</para>

        <code>
          CanvasDevice^ canvasDevice = ...;
@ -85,7 +85,7 @@ under the License.
          ComPtr&lt;ID2D1Device&gt; nativeDevice = GetWrappedResource&lt;ID2D1Device&gt;(canvasDevice);
        </code>

-        <para>To get a Windows Canvas object wrapping a native Direct2D object:</para>
+        <para>To get a Win2D object wrapping a native Direct2D object:</para>

        <code>
          ComPtr&lt;ID2D1Device&gt; nativeDevice = ...;
--- a/winrt/docsrc/Introduction.aml
+++ b/winrt/docsrc/Introduction.aml
@ -18,17 +18,17 @@ under the License.

    <introduction>
      <para>
-        Windows Canvas is an easy-to-use Windows Runtime API for immediate mode 2D graphics 
+        Win2D is an easy-to-use Windows Runtime API for immediate mode 2D graphics 
        rendering with GPU acceleration. It is available to C# and C++ developers writing 
        Windows Store apps for Windows 8.1 and Windows Phone 8.1. It utilizes the power of 
        Direct2D, and integrates seamlessly with XAML and ICoreWindow.
      </para>

      <para>
-        Windows Canvas is work in progress and evolving rapidly. The goal of releasing this
+        Win2D is work in progress and evolving rapidly. The goal of releasing this
        code in an early, incomplete state is to solicit early developer feedback. The
        <externalLink>
-          <linkUri>http://github.com/Microsoft/WindowsCanvas/wiki/Backlog</linkUri>
+          <linkUri>http://github.com/Microsoft/Win2D/wiki/Backlog</linkUri>
          <linkText>project backlog</linkText>
        </externalLink>
        shows what we plan to add in the future, and the order in which we plan to add it.
@ -37,8 +37,8 @@ under the License.
      <para>
        Source code and issue tracking are available at
        <externalLink>
-          <linkUri>http://github.com/Microsoft/WindowsCanvas</linkUri>
-          <linkText>http://github.com/Microsoft/WindowsCanvas</linkText>
+          <linkUri>http://github.com/Microsoft/Win2D</linkUri>
+          <linkText>http://github.com/Microsoft/Win2D</linkText>
        </externalLink>
      </para>
    </introduction>
@ -47,7 +47,7 @@ under the License.
      <title>Getting Started</title>
      <content>
        <para>
-          To get started using Windows Canvas:
+          To get started using Win2D:

          <list class="bullet">
            <listItem>Clone the source code from github</listItem>
@ -58,7 +58,7 @@ under the License.

          See the
          <externalLink>
-            <linkUri>https://github.com/Microsoft/WindowsCanvas/blob/master/README.md</linkUri>
+            <linkUri>https://github.com/Microsoft/Win2D/blob/master/README.md</linkUri>
            <linkText>readme</linkText>
          </externalLink>
          for more detailed instructions.
--- a/winrt/docsrc/Namespaces.xml
+++ b/winrt/docsrc/Namespaces.xml
@ -20,7 +20,7 @@ under the License.
  <members>

    <member name="N:Microsoft.Graphics.Canvas">
-      <summary>This namespace defines the main Windows Canvas API for drawing 2D graphics.</summary>
+      <summary>This namespace defines the main Win2D API for drawing 2D graphics.</summary>
    </member>

    <member name="N:Microsoft.Graphics.Canvas.DirectX">
--- a/winrt/lib/winrt.lib.Windows.vcxproj
+++ b/winrt/lib/winrt.lib.Windows.vcxproj
@ -10,11 +10,11 @@
    <ApplicationType>Windows Store</ApplicationType>
    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

  <Import Project="winrt.lib.Shared.vcxitems" Label="Shared" />

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.targets" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.targets" />
 </Project>
--- a/winrt/lib/winrt.lib.WindowsPhone.vcxproj
+++ b/winrt/lib/winrt.lib.WindowsPhone.vcxproj
@ -10,11 +10,11 @@
 	<ApplicationTypeRevision>8.1</ApplicationTypeRevision>
  </PropertyGroup>
  
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

  <Import Project="winrt.lib.Shared.vcxitems" Label="Shared" />
  
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.targets" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.targets" />
 </Project>
--- a/winrt/test.external/winrt.test.external.Windows.vcxproj
+++ b/winrt/test.external/winrt.test.external.Windows.vcxproj
@ -14,7 +14,7 @@
    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
    <AppxBundle>Never</AppxBundle>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
@ -68,5 +68,5 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets" />
  <Import Project="$(VCInstallDir)\..\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.TestTools.Cpp.targets" Condition="Exists('$(VCInstallDir)\..\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.TestTools.Cpp.targets')" />
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.targets" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.targets" />
 </Project>
--- a/winrt/test.external/winrt.test.external.WindowsPhone.vcxproj
+++ b/winrt/test.external/winrt.test.external.WindowsPhone.vcxproj
@ -12,7 +12,7 @@
    <AppxPackage>True</AppxPackage>
    <DoNotBuild Condition="'$(TF_BUILD)' == 'true'">true</DoNotBuild>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="winrt.test.external.Shared.vcxitems" Label="Shared" />
  <PropertyGroup>
@ -78,5 +78,5 @@
  <PropertyGroup>
    <_DefineDefaultConvergedProjectType>False</_DefineDefaultConvergedProjectType>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.targets" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.targets" />
 </Project>
--- a/winrt/test.internal/winrt.test.internal.vcxproj
+++ b/winrt/test.internal/winrt.test.internal.vcxproj
@ -5,7 +5,7 @@
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>winrt_test</RootNamespace>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <PlatformToolset>v120</PlatformToolset>
--- a/winrt/test.managed/Windows/winrt.test.managed.Windows.csproj
+++ b/winrt/test.managed/Windows/winrt.test.managed.Windows.csproj
@ -19,7 +19,7 @@
    <AppxBundle>Never</AppxBundle>
    <TargetFrameworkVersion />
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\build\Win2D.cs.props" />
  <PropertyGroup>
    <PackageCertificateKeyFile>$(AssetDir)TemporaryKey.pfx</PackageCertificateKeyFile>
  </PropertyGroup>
@ -129,5 +129,5 @@
  </PropertyGroup>
  <Import Project="..\Shared\winrt.test.managed.Shared.projitems" Label="Shared" />
  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <Import Project="$(MSBuildThisFileDir)..\..\..\build\canvas.cs.targets" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\build\Win2D.cs.targets" />
 </Project>
--- a/winrt/test.managed/WindowsPhone/winrt.test.managed.WindowsPhone.csproj
+++ b/winrt/test.managed/WindowsPhone/winrt.test.managed.WindowsPhone.csproj
@ -26,7 +26,7 @@
  <PropertyGroup Condition=" '$(TargetPlatformIdentifier)' == '' ">
    <TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\..\build\canvas.cs.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\build\Win2D.cs.props" />
  <PropertyGroup>
    <PackageCertificateKeyFile>$(AssetDir)TemporaryKey.pfx</PackageCertificateKeyFile>
  </PropertyGroup>
@ -124,6 +124,6 @@
  <Target Name="AfterBuild">
  </Target>
  -->
-  <Import Project="$(MSBuildThisFileDir)..\..\..\build\canvas.cs.targets" />
+  <Import Project="$(MSBuildThisFileDir)..\..\..\build\Win2D.cs.targets" />

 </Project>
--- a/winrt/test.nativecomponent/winrt.test.nativecomponent.Shared.vcxitems
+++ b/winrt/test.nativecomponent/winrt.test.nativecomponent.Shared.vcxitems
@ -10,7 +10,7 @@
    <ItemsProjectName>winrt.test.nativecomponent.Shared</ItemsProjectName>
    <TargetName>$(ItemsRootNamespace)</TargetName>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.props" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.props" />
  <ItemGroup>
    <ProjectCapability Include="SourceItemsFromImports" />
  </ItemGroup>
@ -47,5 +47,5 @@
    <ClInclude Include="$(MSBuildThisFileDirectory)pch.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="$(MSBuildThisFileDir)..\..\build\canvas.cpp.targets" />
+  <Import Project="$(MSBuildThisFileDir)..\..\build\Win2D.cpp.targets" />
 </Project>