diff --git a/appveyor.yml b/appveyor.yml
index 13e9692a..d0ec7525 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,12 +18,12 @@ build_script:
   
   - cmd: msbuild src\TestStack.White.sln "/p:Configuration=%CONFIGURATION%;Platform=%PLATFORM%"
 
-  - cmd: ECHO GitLink src\ -u https://github.com/TestStack/White -c %CONFIGURATION% -ignore WinformsTodo,WpfTodo,WpfTodo.UITests,Todo.Core,TestSilverlightApplication,TestSilverlightApplication.Web,WindowsFormsTestApplication,WinFormsTestApp.Old,WPFTestApp.Old,WpfTestApplication,TestStack.White.Reporting,TestStack.White.ScreenObjects,TestStack.White.ScreenObjects.UITests,TestStack.White.UITests,TestStack.White.UnitTests,TestStack.White.WebBrowser,TestStack.White.WebBrowser.UITests,TestStack.White.WebBrowser.UnitTests
-  - cmd: GitLink . -u https://github.com/TestStack/White -c %CONFIGURATION% -ignore WinformsTodo,WpfTodo,WpfTodo.UITests,Todo.Core,TestSilverlightApplication,TestSilverlightApplication.Web,WindowsFormsTestApplication,WinFormsTestApp.Old,WPFTestApp.Old,WpfTestApplication,TestStack.White.Reporting,TestStack.White.ScreenObjects,TestStack.White.ScreenObjects.UITests,TestStack.White.UITests,TestStack.White.UnitTests,TestStack.White.WebBrowser,TestStack.White.WebBrowser.UITests,TestStack.White.WebBrowser.UnitTests
+  - cmd: ECHO GitLink src\ -u https://github.com/TestStack/White -b UIAComWrapper -c %CONFIGURATION% -ignore WinformsTodo,WpfTodo,WpfTodo.UITests,Todo.Core,TestSilverlightApplication,TestSilverlightApplication.Web,WindowsFormsTestApplication,WinFormsTestApp.Old,WPFTestApp.Old,WpfTestApplication,TestStack.White.Reporting,TestStack.White.ScreenObjects,TestStack.White.ScreenObjects.UITests,TestStack.White.UITests,TestStack.White.UnitTests,TestStack.White.WebBrowser,TestStack.White.WebBrowser.UITests,TestStack.White.WebBrowser.UnitTests
+  - cmd: GitLink . -u https://github.com/TestStack/White -b UIAComWrapper -c %CONFIGURATION% -ignore WinformsTodo,WpfTodo,WpfTodo.UITests,Todo.Core,TestSilverlightApplication,TestSilverlightApplication.Web,WindowsFormsTestApplication,WinFormsTestApp.Old,WPFTestApp.Old,WpfTestApplication,TestStack.White.Reporting,TestStack.White.ScreenObjects,TestStack.White.ScreenObjects.UITests,TestStack.White.UITests,TestStack.White.UnitTests,TestStack.White.WebBrowser,TestStack.White.WebBrowser.UITests,TestStack.White.WebBrowser.UnitTests
 
-  - cmd: ECHO nuget pack nuget\TestStack.White.nuspec -version "%GitVersion_NuGetVersion%" -prop "configuration=%CONFIGURATION%"
-  - cmd: nuget pack nuget\TestStack.White.nuspec -version "%GitVersion_NuGetVersion%" -prop "configuration=%CONFIGURATION%"
-  - cmd: appveyor PushArtifact "TestStack.White.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: ECHO nuget pack nuget\TestStack.White.Uia3.nuspec -version "%GitVersion_NuGetVersion%" -prop "configuration=%CONFIGURATION%"
+  - cmd: nuget pack nuget\TestStack.White.Uia3.nuspec -version "%GitVersion_NuGetVersion%" -prop "configuration=%CONFIGURATION%"
+  - cmd: appveyor PushArtifact "TestStack.White.Uia3.%GitVersion_NuGetVersion%.nupkg"
 
 on_finish:
   - ps: if (Test-Path -path c:\FailedTestsScreenshots) { Get-ChildItem c:\FailedTestsScreenshots\*.* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }}
diff --git a/nuget/Init.ps1 b/nuget/Init.ps1
deleted file mode 100644
index 5cca45f0..00000000
--- a/nuget/Init.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-param($installPath, $toolsPath, $package)
-
-Import-Module (Join-Path $toolsPath TestStack.White.psm1)
\ No newline at end of file
diff --git a/nuget/TestStack.White.nuspec b/nuget/TestStack.White.Uia3.nuspec
similarity index 83%
rename from nuget/TestStack.White.nuspec
rename to nuget/TestStack.White.Uia3.nuspec
index de519090..3de3f291 100644
--- a/nuget/TestStack.White.nuspec
+++ b/nuget/TestStack.White.Uia3.nuspec
@@ -1,12 +1,14 @@
 <?xml version="1.0"?>
 <package>
   <metadata>
-    <id>TestStack.White</id>
+    <id>TestStack.White.Uia3</id>
     <version>$version$</version>
-    <title>TestStack.White</title>
-    <summary>TestStack.White is the official replacement for the White UI automation framework</summary>
+    <title>TestStack.White.Uia3</title>
+    <summary>TestStack.White is the official replacement for the White UI automation framework. Uia3 flavor works with UIAv3</summary>
     <description>White is a framework for automating rich client applications based on Win32, WinForms, WPF, Silverlight and SWT (Java) platforms. It is .NET based and does not require the use of any proprietary scripting languages. Tests/automation programs using White can be written with whatever .NET language, IDE and tools you are already using. White provides a consistent object-oriented API, hiding the complexity of Microsoft's UIAutomation library (on which White is based) and windows messages.
 
+UIAv3 works better with WPF and newer technologies and supports new UIA Patterns appeared in Windows 8.1. For WinForms and Win32 apps it is better to use normal TestStack.White package.
+
 * TestStack.White is the official replacement for White *</description>
     <authors>Vivek Singh, Jake Ginnivan</authors>
     <owners>Jake Ginnivan</owners>
@@ -15,7 +17,7 @@
     <projectUrl>https://github.com/TestStack/White</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright Jake Ginnivan 2012</copyright>
-    <tags>White UIAutomation Testing UIA WPF Silverlight Win32 Automation</tags>
+    <tags>White UIAutomation Testing UIA WPF Silverlight Win32 Automation UIAv3</tags>
     <dependencies>
       <dependency id="Castle.Core" version="3.3.0" />
       <dependency id="UIAComWrapper" version="1.1.0.14" />
@@ -25,8 +27,6 @@
     <file src="..\src\TestStack.White\bin\$configuration$\TestStack.White.dll" target="lib\net40" />
     <file src="..\src\TestStack.White\bin\$configuration$\TestStack.White.pdb" target="lib\net40" />
     <file src="..\src\TestStack.White\bin\$configuration$\TestStack.White.xml" target="lib\net40" />
-    <file src="Init.ps1" target="tools" />
-    <file src="TestStack.White.psm1" target="tools" />
     <file src="readme.txt" target="" />
   </files>
 </package>
\ No newline at end of file
diff --git a/nuget/TestStack.White.psm1 b/nuget/TestStack.White.psm1
deleted file mode 100644
index 2c11b445..00000000
--- a/nuget/TestStack.White.psm1
+++ /dev/null
@@ -1,14 +0,0 @@
-function Fix-WhiteNamespace() {
-	$find = $dte.Find;
-	$find.WaitForFindToComplete = $true;
-
-	$find.FindReplace(
-		[EnvDTE.vsFindAction]::vsFindActionReplaceAll, 
-		"White.Core",
-		[EnvDTE.vsFindOptions]::vsFindOptionsKeepModifiedDocumentsOpen,
-		"TestStack.White", 
-		[EnvDTE.vsFindTarget]::vsFindTargetSolution, "", "", 
-		[EnvDTE.vsFindResultsLocation]::vsFindResults2);
-}
-
-Export-ModuleMember Fix-WhiteNamespace
\ No newline at end of file
diff --git a/nuget/readme.txt b/nuget/readme.txt
index dbce62c4..9c23e8e3 100644
--- a/nuget/readme.txt
+++ b/nuget/readme.txt
@@ -7,13 +7,6 @@ Tests/automation programs using White can be written with whatever .NET language
 
 White provides a consistent object-oriented API, hiding the complexity of Microsoft's UIAutomation library (on which White is based) and windows messages.
 
-Namespace Change
-----------------
-**White's namespace has changed to 'TestStack.White'!**
-
-When you upgrade type `Fix-WhiteNamespace` into your NuGet powershell console to perform the rename,
-the replace will leave all modified files open, and output the results into the 'Find Results 2' window
-
 Common Resources
 ----------------
 
diff --git a/src/UpgradeLog.htm b/src/UpgradeLog.htm
deleted file mode 100644
index ea5354dd..00000000
Binary files a/src/UpgradeLog.htm and /dev/null differ