diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs
index 0543f0ec283..187f9c96048 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs
@@ -11,7 +11,7 @@
 using Windows.ApplicationModel.Core;
 using Windows.UI.Core;
 
-namespace UnitTests.UI.Controls
+namespace UnitTests.UWP.UI.Controls
 {
     [TestClass]
     public class Test_InfiniteCanvas_Regression
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_ListDetailsView.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_ListDetailsView.cs
index 1e39265b4e8..13f1e938c76 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_ListDetailsView.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_ListDetailsView.cs
@@ -7,7 +7,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
 using System.Linq;
 
-namespace UnitTests.UI.Controls
+namespace UnitTests.UWP.UI.Controls
 {
     [TestClass]
     public class Test_ListDetailsView
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_RangeSelector.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_RangeSelector.cs
index 24b06ac2262..89e78434d75 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_RangeSelector.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_RangeSelector.cs
@@ -7,7 +7,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Threading.Tasks;
 
-namespace UnitTests.UI.Controls
+namespace UnitTests.UWP.UI.Controls
 {
     [TestClass]
     public class Test_RangeSelector : VisualUITestBase
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs
index 9cdcbef80f9..5c0c0523fa3 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_TextToolbar_Localization.cs
@@ -15,7 +15,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Markup;
 
-namespace UnitTests.UI.Controls
+namespace UnitTests.UWP.UI.Controls
 {
     [TestClass]
     public class Test_TextToolbar_Localization
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_General.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_General.cs
index 66ddf02c29f..6ea65407d7e 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_General.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_General.cs
@@ -9,7 +9,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Markup;
 
-namespace UnitTests.UI.Controls
+namespace UnitTests.UWP.UI.Controls
 {
     [TestClass]
     public class Test_TokenizingTextBox_General
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_InterspersedCollection.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_InterspersedCollection.cs
index cd869afaef7..44f6fa5314f 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_InterspersedCollection.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_InterspersedCollection.cs
@@ -11,7 +11,7 @@
 using System.Collections.Specialized;
 using System.Linq;
 
-namespace UnitTests.UI.Controls
+namespace UnitTests.UWP.UI.Controls
 {
     [TestClass]
     public class Test_TokenizingTextBox_InterspersedCollection
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs
index 7cfbd82b7e5..57df97fc493 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs
@@ -12,7 +12,7 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Markup;
 
-namespace UnitTests.UI.Controls
+namespace UnitTests.UWP.UI.Controls
 {
     [TestClass]
     public class Test_UniformGrid_AutoLayout
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs
index e74b55f1905..955491445d2 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs
@@ -10,7 +10,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Markup;
 
-namespace UnitTests.UI.Controls
+namespace UnitTests.UWP.UI.Controls
 {
     [TestClass]
     public class Test_UniformGrid_Dimensions
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs
index 1b8be951a83..86734036c9f 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs
@@ -8,7 +8,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
 
-namespace UnitTests.UI.Controls
+namespace UnitTests.UWP.UI.Controls
 {
     [TestClass]
     public class Test_UniformGrid_FreeSpots
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs
index 700a07ac74f..9cc42cd3b68 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs
@@ -9,7 +9,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Markup;
 
-namespace UnitTests.UI.Controls
+namespace UnitTests.UWP.UI.Controls
 {
     [TestClass]
     public class Test_UniformGrid_RowColDefinitions
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_WrapPanel_BasicLayout.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_WrapPanel_BasicLayout.cs
index 226a016f0ab..e3e7860b4c0 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_WrapPanel_BasicLayout.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_WrapPanel_BasicLayout.cs
@@ -14,7 +14,7 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Markup;
 
-namespace UnitTests.UI.Controls
+namespace UnitTests.UWP.UI.Controls
 {
     [TestClass]
     public class Test_WrapPanel_BasicLayout : VisualUITestBase
diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_WrapPanel_Visibility.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_WrapPanel_Visibility.cs
index 50cd685d54e..c47780f0442 100644
--- a/UnitTests/UnitTests.UWP/UI/Controls/Test_WrapPanel_Visibility.cs
+++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_WrapPanel_Visibility.cs
@@ -14,7 +14,7 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Markup;
 
-namespace UnitTests.UI.Controls
+namespace UnitTests.UWP.UI.Controls
 {
     [TestClass]
     public class Test_WrapPanel_Visibility : VisualUITestBase