From 3bde759ad98bc81fe25a4268c8e9d1bcc1970aeb Mon Sep 17 00:00:00 2001
From: Arlo <arlo.godfrey@outlook.com>
Date: Fri, 10 Mar 2023 17:50:28 -0600
Subject: [PATCH] Updated the default namespace for new components  (#394)

* Updated default root namespace and PackageId

* Doc fix

* Renamed template csproj

* Move PackageId prefix to property in Directory.Build.props

* Moved code / docs to new default namespace

* Use xmlns:controls instead of xmlns:labs

* Use xmlns:controls instead of xmlns:labs

* Fixed xaml styling

* Removed default component namespace from global usings

* Unify default package ID

* Fixed missing using directive

* Fixed missing using directive
---
 Directory.Build.props                              |  1 +
 common/GlobalUsings_WinUI.cs                       |  2 --
 common/ToolkitComponent.SourceProject.props        |  2 +-
 .../samples/CanvasLayoutSample.xaml.cs             |  2 ++
 .../tests/ExampleCanvasLayoutTestClass.cs          |  1 +
 .../CanvasView/tests/ExampleCanvasViewTestClass.cs |  1 +
 .../samples/SegmentedControlBasicSample.xaml.cs    |  1 +
 .../tests/ExampleSegmentedControlTestClass.cs      |  1 +
 .../tests/ExampleSettingsControlsTestClass.cs      |  1 +
 .../Shimmer/tests/ExampleShimmerTestClass.cs       |  1 +
 .../SizerBase/tests/ExampleSizerBaseTestClass.cs   |  1 +
 ...tackedNotificationsBehaviorCustomSample.xaml.cs |  2 ++
 ...ExampleStackedNotificationsBehaviorTestClass.cs |  1 +
 .../samples/ProjectTemplateCustomSample.xaml       |  6 +++---
 .../samples/ProjectTemplateCustomSample.xaml.cs    |  2 ++
 .../samples/ProjectTemplateTemplatedSample.xaml    | 10 +++++-----
 .../ProjectTemplateTemplatedStyleCustomSample.xaml | 14 +++++++-------
 .../samples/ProjectTemplateXbindBackedSample.xaml  | 10 +++++-----
 ...rojectTemplateXbindBackedStyleCustomSample.xaml | 14 +++++++-------
 ...yToolkit.WinUI.Controls.ProjectTemplate.csproj} |  2 +-
 template/ProjectTemplate/src/ProjectTemplate.cs    |  2 +-
 .../src/ProjectTemplateStyle_ClassicBinding.xaml   | 10 +++++-----
 .../src/ProjectTemplateStyle_xBind.xaml            | 14 +++++++-------
 .../src/ProjectTemplateStyle_xBind.xaml.cs         |  2 +-
 .../src/ProjectTemplate_ClassicBinding.cs          |  2 +-
 .../ProjectTemplate/src/ProjectTemplate_xBind.cs   |  2 +-
 template/ProjectTemplate/src/Themes/Generic.xaml   |  6 +++---
 .../tests/ExampleProjectTemplateTestClass.cs       |  1 +
 .../tests/ExampleProjectTemplateTestPage.xaml      |  4 ++--
 template/README.md                                 |  6 +++---
 30 files changed, 69 insertions(+), 55 deletions(-)
 rename template/ProjectTemplate/src/{CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj => CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj} (86%)

diff --git a/Directory.Build.props b/Directory.Build.props
index 158ebd1f0..1b9915078 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
+    <PackageIdPrefix>CommunityToolkit.Labs</PackageIdPrefix>
     <RepositoryDirectory>$(MSBuildThisFileDirectory)</RepositoryDirectory>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
   </PropertyGroup>
diff --git a/common/GlobalUsings_WinUI.cs b/common/GlobalUsings_WinUI.cs
index 24d4eb16a..547158a0a 100644
--- a/common/GlobalUsings_WinUI.cs
+++ b/common/GlobalUsings_WinUI.cs
@@ -7,8 +7,6 @@
 
 global using System.Runtime.InteropServices.WindowsRuntime;
 
-global using CommunityToolkit.Labs.WinUI;
-
 global using Windows.Foundation;
 global using Windows.Foundation.Collections;
 
diff --git a/common/ToolkitComponent.SourceProject.props b/common/ToolkitComponent.SourceProject.props
index a9f7d6578..1e87977be 100644
--- a/common/ToolkitComponent.SourceProject.props
+++ b/common/ToolkitComponent.SourceProject.props
@@ -10,7 +10,7 @@
   <Import Project="$(RepositoryDirectory)common\MultiTarget\MultiTarget.props" />
   
   <PropertyGroup>
-    <PackageId Condition="'$(PackageId)' == ''">CommunityToolkit.Labs.$(PackageIdVariant).$(ToolkitComponentName)</PackageId>
+    <PackageId Condition="'$(PackageId)' == ''">$(PackageIdPrefix).$(PackageIdVariant).$(ToolkitComponentName)</PackageId>
   </PropertyGroup>
 
   <!-- XAML Pages are automatically included, and don't need to be specified here. -->
diff --git a/components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs b/components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs
index 025fd8e4a..38b0f02a0 100644
--- a/components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs
+++ b/components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Labs.WinUI;
+
 namespace CanvasLayoutExperiment.Samples;
 
 /// <summary>
diff --git a/components/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs b/components/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs
index a6e227807..2978c1d68 100644
--- a/components/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs
+++ b/components/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Labs.WinUI;
 using CommunityToolkit.Tooling.TestGen;
 using CommunityToolkit.Tests;
 
diff --git a/components/CanvasView/tests/ExampleCanvasViewTestClass.cs b/components/CanvasView/tests/ExampleCanvasViewTestClass.cs
index 4780c6c78..f1881fa85 100644
--- a/components/CanvasView/tests/ExampleCanvasViewTestClass.cs
+++ b/components/CanvasView/tests/ExampleCanvasViewTestClass.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Labs.WinUI;
 using CommunityToolkit.Tooling.TestGen;
 using CommunityToolkit.Tests;
 
diff --git a/components/SegmentedControl/samples/SegmentedControlBasicSample.xaml.cs b/components/SegmentedControl/samples/SegmentedControlBasicSample.xaml.cs
index 09fd29bb9..9a8904f7d 100644
--- a/components/SegmentedControl/samples/SegmentedControlBasicSample.xaml.cs
+++ b/components/SegmentedControl/samples/SegmentedControlBasicSample.xaml.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.UI.Xaml.Controls;
+using CommunityToolkit.Labs.WinUI;
 
 namespace SegmentedControlExperiment.Samples;
 
diff --git a/components/SegmentedControl/tests/ExampleSegmentedControlTestClass.cs b/components/SegmentedControl/tests/ExampleSegmentedControlTestClass.cs
index fa1fb4826..c11be1ea8 100644
--- a/components/SegmentedControl/tests/ExampleSegmentedControlTestClass.cs
+++ b/components/SegmentedControl/tests/ExampleSegmentedControlTestClass.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Labs.WinUI;
 using CommunityToolkit.Tooling.TestGen;
 using CommunityToolkit.Tests;
 
diff --git a/components/SettingsControls/tests/ExampleSettingsControlsTestClass.cs b/components/SettingsControls/tests/ExampleSettingsControlsTestClass.cs
index f3d5b608d..29a8030f7 100644
--- a/components/SettingsControls/tests/ExampleSettingsControlsTestClass.cs
+++ b/components/SettingsControls/tests/ExampleSettingsControlsTestClass.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Labs.WinUI;
 using CommunityToolkit.Tooling.TestGen;
 using CommunityToolkit.Tests;
 
diff --git a/components/Shimmer/tests/ExampleShimmerTestClass.cs b/components/Shimmer/tests/ExampleShimmerTestClass.cs
index 7e5dc44dd..243e820d3 100644
--- a/components/Shimmer/tests/ExampleShimmerTestClass.cs
+++ b/components/Shimmer/tests/ExampleShimmerTestClass.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Labs.WinUI;
 using CommunityToolkit.Tooling.TestGen;
 using CommunityToolkit.Tests;
 
diff --git a/components/SizerBase/tests/ExampleSizerBaseTestClass.cs b/components/SizerBase/tests/ExampleSizerBaseTestClass.cs
index c4a6b8b2a..951b3b6a5 100644
--- a/components/SizerBase/tests/ExampleSizerBaseTestClass.cs
+++ b/components/SizerBase/tests/ExampleSizerBaseTestClass.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Labs.WinUI;
 using CommunityToolkit.Tooling.TestGen;
 using CommunityToolkit.Tests;
 using CommunityToolkit.Labs.WinUI.Automation.Peers;
diff --git a/components/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs b/components/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs
index 2ac06da19..09c9d2792 100644
--- a/components/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs
+++ b/components/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Labs.WinUI;
+
 namespace StackedNotificationsBehaviorExperiment.Samples;
 
 /// <summary>
diff --git a/components/StackedNotificationsBehavior/tests/ExampleStackedNotificationsBehaviorTestClass.cs b/components/StackedNotificationsBehavior/tests/ExampleStackedNotificationsBehaviorTestClass.cs
index d3e5a55c7..fe7b0fff3 100644
--- a/components/StackedNotificationsBehavior/tests/ExampleStackedNotificationsBehaviorTestClass.cs
+++ b/components/StackedNotificationsBehavior/tests/ExampleStackedNotificationsBehaviorTestClass.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Labs.WinUI;
 using CommunityToolkit.Tooling.TestGen;
 using CommunityToolkit.Tests;
 
diff --git a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
index c744fd697..ebaf1b730 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml
@@ -2,8 +2,8 @@
 <Page x:Class="ProjectTemplateExperiment.Samples.ProjectTemplateCustomSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:labs="using:CommunityToolkit.Labs.WinUI"
       xmlns:local="using:ProjectTemplateExperiment.Samples"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
@@ -11,13 +11,13 @@
     <StackPanel Spacing="15">
         <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}"
                    Text="{x:Bind TitleText, Mode=OneWay}" />
-        <labs:ProjectTemplate Orientation="{x:Bind local:ProjectTemplateCustomSample.ConvertStringToOrientation(LayoutOrientation), Mode=OneWay}">
+        <controls:ProjectTemplate Orientation="{x:Bind local:ProjectTemplateCustomSample.ConvertStringToOrientation(LayoutOrientation), Mode=OneWay}">
             <TextBlock Text="1" />
             <TextBlock Text="2" />
             <TextBlock Text="3" />
             <TextBlock Text="4" />
             <TextBlock Text="5" />
             <TextBlock Text="6" />
-        </labs:ProjectTemplate>
+        </controls:ProjectTemplate>
     </StackPanel>
 </Page>
diff --git a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs
index 26484e6b3..c5adf1769 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs
+++ b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.WinUI.Controls;
+
 namespace ProjectTemplateExperiment.Samples;
 
 /// <summary>
diff --git a/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
index 06374b718..be0e62ea5 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml
@@ -2,15 +2,15 @@
 <Page x:Class="ProjectTemplateExperiment.Samples.ProjectTemplateTemplatedSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:labs="using:CommunityToolkit.Labs.WinUI"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
     <StackPanel Spacing="16">
-        <labs:ProjectTemplate_ClassicBinding FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
-                                             FontSize="{x:Bind TextSize, Mode=OneWay}"
-                                             Foreground="{x:Bind TextForeground, Mode=OneWay}"
-                                             Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
+        <controls:ProjectTemplate_ClassicBinding FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
+                                                 FontSize="{x:Bind TextSize, Mode=OneWay}"
+                                                 Foreground="{x:Bind TextForeground, Mode=OneWay}"
+                                                 Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
     </StackPanel>
 </Page>
diff --git a/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
index 12d353f09..50f1c6768 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml
@@ -2,8 +2,8 @@
 <Page x:Class="ProjectTemplateExperiment.Samples.ProjectTemplateTemplatedStyleCustomSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:labs="using:CommunityToolkit.Labs.WinUI"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
@@ -11,16 +11,16 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <!--  Import custom styles  -->
-                <ResourceDictionary Source="ms-appx:///CommunityToolkit.Labs.WinUI.ProjectTemplate/ProjectTemplateStyle_ClassicBinding.xaml" />
+                <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.ProjectTemplate/ProjectTemplateStyle_ClassicBinding.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Page.Resources>
 
     <StackPanel Spacing="16">
-        <labs:ProjectTemplate_ClassicBinding FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
-                                             FontSize="{x:Bind TextSize, Mode=OneWay}"
-                                             Foreground="{x:Bind TextForeground, Mode=OneWay}"
-                                             Style="{StaticResource CustomClassicBindingProjectTemplateStyle}"
-                                             Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
+        <controls:ProjectTemplate_ClassicBinding FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
+                                                 FontSize="{x:Bind TextSize, Mode=OneWay}"
+                                                 Foreground="{x:Bind TextForeground, Mode=OneWay}"
+                                                 Style="{StaticResource CustomClassicBindingProjectTemplateStyle}"
+                                                 Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
     </StackPanel>
 </Page>
diff --git a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
index c7661a1b4..ee1ac3c6d 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml
@@ -2,15 +2,15 @@
 <Page x:Class="ProjectTemplateExperiment.Samples.ProjectTemplateXbindBackedSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:labs="using:CommunityToolkit.Labs.WinUI"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
     <StackPanel Spacing="16">
-        <labs:ProjectTemplate_xBind FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
-                                    FontSize="{x:Bind TextSize, Mode=OneWay}"
-                                    Foreground="{x:Bind TextForeground, Mode=OneWay}"
-                                    Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
+        <controls:ProjectTemplate_xBind FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
+                                        FontSize="{x:Bind TextSize, Mode=OneWay}"
+                                        Foreground="{x:Bind TextForeground, Mode=OneWay}"
+                                        Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
     </StackPanel>
 </Page>
diff --git a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
index ecfb01deb..8782b94e6 100644
--- a/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
+++ b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml
@@ -2,8 +2,8 @@
 <Page x:Class="ProjectTemplateExperiment.Samples.ProjectTemplateXbindBackedStyleCustomSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:labs="using:CommunityToolkit.Labs.WinUI"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
@@ -11,16 +11,16 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <!--  Import custom styles  -->
-                <labs:ProjectTemplateStyle_xBind />
+                <controls:ProjectTemplateStyle_xBind />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Page.Resources>
 
     <StackPanel Spacing="16">
-        <labs:ProjectTemplate_xBind FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
-                                    FontSize="{x:Bind TextSize, Mode=OneWay}"
-                                    Foreground="{x:Bind TextForeground, Mode=OneWay}"
-                                    Style="{StaticResource CustomxBindProjectTemplateStyle}"
-                                    Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
+        <controls:ProjectTemplate_xBind FontFamily="{x:Bind TextFontFamily, Mode=OneWay}"
+                                        FontSize="{x:Bind TextSize, Mode=OneWay}"
+                                        Foreground="{x:Bind TextForeground, Mode=OneWay}"
+                                        Style="{StaticResource CustomxBindProjectTemplateStyle}"
+                                        Visibility="{x:Bind IsTextVisible, Mode=OneWay}" />
     </StackPanel>
 </Page>
diff --git a/template/ProjectTemplate/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj b/template/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
similarity index 86%
rename from template/ProjectTemplate/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj
rename to template/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
index b9fb7aace..5dc2b1e98 100644
--- a/template/ProjectTemplate/src/CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj
+++ b/template/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
@@ -5,7 +5,7 @@
     <Version>0.0.1</Version>
 
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
-    <RootNamespace>CommunityToolkit.Labs.WinUI.ProjectTemplateRns</RootNamespace>
+    <RootNamespace>CommunityToolkit.WinUI.Controls.ProjectTemplateRns</RootNamespace>
   </PropertyGroup>
 
   <!-- Sets this up as a toolkit component's source project -->
diff --git a/template/ProjectTemplate/src/ProjectTemplate.cs b/template/ProjectTemplate/src/ProjectTemplate.cs
index 0f3f02d0d..87911049f 100644
--- a/template/ProjectTemplate/src/ProjectTemplate.cs
+++ b/template/ProjectTemplate/src/ProjectTemplate.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace CommunityToolkit.Labs.WinUI;
+namespace CommunityToolkit.WinUI.Controls;
 
 /// <summary>
 /// This is an example control based off of the BoxPanel sample here: https://docs.microsoft.com/windows/apps/design/layout/boxpanel-example-custom-panel. If you need this similar sort of layout component for an application, see UniformGrid in the Toolkit.
diff --git a/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml b/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml
index b609a5716..78c1c522c 100644
--- a/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml
+++ b/template/ProjectTemplate/src/ProjectTemplateStyle_ClassicBinding.xaml
@@ -1,7 +1,7 @@
 <!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:labs="using:CommunityToolkit.Labs.WinUI">
+                    xmlns:controls="using:CommunityToolkit.WinUI.Controls">
 
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
@@ -22,16 +22,16 @@
 
     <!--  Implicitly applied default style  -->
     <Style BasedOn="{StaticResource DefaultClassicBindingProjectTemplateStyle}"
-           TargetType="labs:ProjectTemplate_ClassicBinding" />
+           TargetType="controls:ProjectTemplate_ClassicBinding" />
 
     <Style x:Key="DefaultClassicBindingProjectTemplateStyle"
-           TargetType="labs:ProjectTemplate_ClassicBinding">
+           TargetType="controls:ProjectTemplate_ClassicBinding">
         <Style.Setters>
             <Setter Property="MyProperty" Value="This property has been overriden by the style template" />
             <Setter Property="ItemPadding" Value="{StaticResource DefaultProjectTemplateItemPadding}" />
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="labs:ProjectTemplate_ClassicBinding">
+                    <ControlTemplate TargetType="controls:ProjectTemplate_ClassicBinding">
                         <Grid Padding="{TemplateBinding ItemPadding}">
                             <StackPanel Spacing="20">
                                 <TextBlock x:Name="PART_HelloWorld"
@@ -52,7 +52,7 @@
     <!--  Minimal, custom style  -->
     <Style x:Key="CustomClassicBindingProjectTemplateStyle"
            BasedOn="{StaticResource DefaultClassicBindingProjectTemplateStyle}"
-           TargetType="labs:ProjectTemplate_ClassicBinding">
+           TargetType="controls:ProjectTemplate_ClassicBinding">
         <Style.Setters>
             <Setter Property="MyProperty" Value="This property has been overriden by a custom style!" />
             <Setter Property="ItemPadding" Value="25" />
diff --git a/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml b/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml
index f080a4180..efa526130 100644
--- a/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml
+++ b/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml
@@ -1,8 +1,8 @@
 <!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
-<ResourceDictionary x:Class="CommunityToolkit.Labs.WinUI.ProjectTemplateStyle_xBind"
+<ResourceDictionary x:Class="CommunityToolkit.WinUI.Controls.ProjectTemplateStyle_xBind"
                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:labs="using:CommunityToolkit.Labs.WinUI">
+                    xmlns:controls="using:CommunityToolkit.WinUI.Controls">
 
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
@@ -23,21 +23,21 @@
 
     <!--  Implicitly applied default style  -->
     <Style BasedOn="{StaticResource DefaultxBindProjectTemplateStyle}"
-           TargetType="labs:ProjectTemplate_xBind" />
+           TargetType="controls:ProjectTemplate_xBind" />
 
     <Style x:Key="DefaultxBindProjectTemplateStyle"
-           TargetType="labs:ProjectTemplate_xBind">
+           TargetType="controls:ProjectTemplate_xBind">
         <Style.Setters>
             <Setter Property="MyProperty" Value="This property has been overriden by the style template" />
             <Setter Property="ItemPadding" Value="{StaticResource DefaultProjectTemplateItemPadding}" />
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="labs:ProjectTemplate_xBind">
+                    <ControlTemplate TargetType="controls:ProjectTemplate_xBind">
                         <ContentControl x:Name="ContentContainer"
                                         HorizontalContentAlignment="Stretch"
                                         VerticalContentAlignment="Stretch">
                             <ContentControl.ContentTemplate>
-                                <DataTemplate x:DataType="labs:ProjectTemplate_xBind">
+                                <DataTemplate x:DataType="controls:ProjectTemplate_xBind">
                                     <Grid Padding="{x:Bind ItemPadding}"
                                           PointerEntered="{x:Bind Element_PointerEntered}">
                                         <StackPanel Spacing="20">
@@ -59,7 +59,7 @@
     <!--  Minimal, custom style  -->
     <Style x:Key="CustomxBindProjectTemplateStyle"
            BasedOn="{StaticResource DefaultxBindProjectTemplateStyle}"
-           TargetType="labs:ProjectTemplate_xBind">
+           TargetType="controls:ProjectTemplate_xBind">
         <Style.Setters>
             <Setter Property="MyProperty" Value="This property has been overriden by a custom style!" />
             <Setter Property="ItemPadding" Value="25" />
diff --git a/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml.cs b/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml.cs
index adacfe974..e0770101e 100644
--- a/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml.cs
+++ b/template/ProjectTemplate/src/ProjectTemplateStyle_xBind.xaml.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace CommunityToolkit.Labs.WinUI;
+namespace CommunityToolkit.WinUI.Controls;
 
 /// <summary>
 /// Backing code for this resource dictionary.
diff --git a/template/ProjectTemplate/src/ProjectTemplate_ClassicBinding.cs b/template/ProjectTemplate/src/ProjectTemplate_ClassicBinding.cs
index 745f11b01..ccb3fb2b7 100644
--- a/template/ProjectTemplate/src/ProjectTemplate_ClassicBinding.cs
+++ b/template/ProjectTemplate/src/ProjectTemplate_ClassicBinding.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace CommunityToolkit.Labs.WinUI;
+namespace CommunityToolkit.WinUI.Controls;
 
 /// <summary>
 /// An example templated control.
diff --git a/template/ProjectTemplate/src/ProjectTemplate_xBind.cs b/template/ProjectTemplate/src/ProjectTemplate_xBind.cs
index 461e24205..d8e0811ac 100644
--- a/template/ProjectTemplate/src/ProjectTemplate_xBind.cs
+++ b/template/ProjectTemplate/src/ProjectTemplate_xBind.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace CommunityToolkit.Labs.WinUI;
+namespace CommunityToolkit.WinUI.Controls;
 
 /// <summary>
 /// An example templated control.
diff --git a/template/ProjectTemplate/src/Themes/Generic.xaml b/template/ProjectTemplate/src/Themes/Generic.xaml
index eb4e339ad..e965b0cd9 100644
--- a/template/ProjectTemplate/src/Themes/Generic.xaml
+++ b/template/ProjectTemplate/src/Themes/Generic.xaml
@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:labs="using:CommunityToolkit.Labs.WinUI">
+                    xmlns:controls="using:CommunityToolkit.WinUI.Controls">
 
     <ResourceDictionary.MergedDictionaries>
-        <labs:ProjectTemplateStyle_xBind />
-        <ResourceDictionary Source="ms-appx:///CommunityToolkit.Labs.WinUI.ProjectTemplate/ProjectTemplateStyle_ClassicBinding.xaml" />
+        <controls:ProjectTemplateStyle_xBind />
+        <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.ProjectTemplate/ProjectTemplateStyle_ClassicBinding.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
diff --git a/template/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs b/template/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs
index b5c28a621..0e8d5764c 100644
--- a/template/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs
+++ b/template/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs
@@ -4,6 +4,7 @@
 
 using CommunityToolkit.Tooling.TestGen;
 using CommunityToolkit.Tests;
+using CommunityToolkit.WinUI.Controls;
 
 namespace ProjectTemplateExperiment.Tests;
 
diff --git a/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml b/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
index c2936542a..b3f44a5a7 100644
--- a/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
+++ b/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
@@ -2,13 +2,13 @@
 <Page x:Class="ProjectTemplateExperiment.Tests.ExampleProjectTemplateTestPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:labs="using:CommunityToolkit.Labs.WinUI"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
       mc:Ignorable="d">
 
     <Grid>
-        <labs:ProjectTemplate_ClassicBinding x:Name="ProjectTemplateControl" />
+        <controls:ProjectTemplate_ClassicBinding x:Name="ProjectTemplateControl" />
     </Grid>
 </Page>
diff --git a/template/README.md b/template/README.md
index f32e0b93e..028b99579 100644
--- a/template/README.md
+++ b/template/README.md
@@ -15,7 +15,7 @@ dotnet new labexp -n MyExperimentNameHere
 ```
 
 This creates a new experiment called "MyExperimentNameHere".
-You can now open `./components/MyExperimentNameHere/MyExperimentNameHere.sln` and start your experiment.
+You can now open `./components/MyExperimentNameHere/OpenSolution.bat` to start your experiment.
 
 ### Inside the generated solution
 
@@ -31,7 +31,7 @@ The `Tests` folder contains projects used to run the tests on different platform
 
 #### Where to add your code
 
-The main code of your experiment will go in the project `CommunityToolkit.Labs.WinUI.MyExperimentNameHere`. When an experiment is merged into Labs, this code will be bundled automatically in a NuGet package and pushed to the Labs DevOps feed. This will let others try out your experiment and provide feedback to further your experiment.
+The main code of your experiment will go in the project `CommunityToolkit.WinUI.Controls.MyExperimentNameHere`. When an experiment is merged into Labs, this code will be bundled automatically in a NuGet package and pushed to the Labs DevOps feed. This will let others try out your experiment and provide feedback to further your experiment.
 You will find an empty class in `MyExperimentNameHere.cs` that you can use as your starting point or one of the templated variants. You can find more info in the `MyExperimentNameHere.md` file in the sample project.
 
 The project `MyExperimentNameHere.Sample`is where you can put code that will allow you to demonstrate and exercise the experiment. In this project you'll find a sample page that includes an example of how to use settings and properties that can be controlled within the sample app. This folder also contains a **markdown** file that contains the documentation for the experiment and how to use it.
@@ -64,7 +64,7 @@ This may require a reboot.
 
 #### Updating NuGet Package
 
-Packages are manually versioned right now, [see this issue here](https://github.com/CommunityToolkit/Labs-Windows/issues/133). In order to update your NuGet package, update the `<Version>` tag in your library's `CommunityToolkit.Labs.WinUI.MyExperimentNameHere.csproj` file.
+Packages are manually versioned right now, [see this issue here](https://github.com/CommunityToolkit/Labs-Windows/issues/133). In order to update your NuGet package, update the `<Version>` tag in your library's `CommunityToolkit.WinUI.Controls.MyExperimentNameHere.csproj` file.
 
 #### WebAssembly Sample Project