43 files changed, 62 insertions, 62 deletions

diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index f59c9742..a14cf55a 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -6,9 +6,9 @@
     <PackageVersion Include="WixToolset.Dtf.Resources" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.Dtf.WindowsInstaller" Version="{packageversion}" />
 
-    <PackageVersion Include="WixBuildTools.TestSupport" Version="{packageversion}" />
-    <PackageVersion Include="WixBuildTools.TestSupport.Native" Version="{packageversion}" />
-    <PackageVersion Include="WixToolset.BaseBuildTasks.Sources" Version="{packageversion}" />
+    <PackageVersion Include="WixInternal.TestSupport" Version="{packageversion}" />
+    <PackageVersion Include="WixInternal.TestSupport.Native" Version="{packageversion}" />
+    <PackageVersion Include="WixInternal.BaseBuildTasks.Sources" Version="{packageversion}" />
 
     <PackageVersion Include="WixToolset.DUtil" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.WcaUtil" Version="{packageversion}" />
@@ -28,7 +28,7 @@
     <PackageVersion Include="WixToolset.Core" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.Core.Burn" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.Core.WindowsInstaller" Version="{packageversion}" />
-    <PackageVersion Include="WixToolset.Core.TestPackage" Version="{packageversion}" />
+    <PackageVersion Include="WixInternal.Core.TestPackage" Version="{packageversion}" />
 
     <PackageVersion Include="WixToolset.Heat" Version="{packageversion}" />
 
@@ -83,7 +83,7 @@
     <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" />
   </ItemGroup>
 
-  <!-- Keep the following versions in sync with internal\WixBuildTools.TestSupport.Native\packages.config -->
+  <!-- Keep the following versions in sync with internal\WixInternal.TestSupport.Native\packages.config -->
   <ItemGroup>
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="GitInfo" Version="2.2.0" />
diff --git a/src/internal/WixToolset.BaseBuildTasks.Sources/BaseToolsetTask.cs b/src/internal/WixInternal.BaseBuildTasks.Sources/BaseToolsetTask.cs
index d9e3b5e8..d9e3b5e8 100644
--- a/src/internal/WixToolset.BaseBuildTasks.Sources/BaseToolsetTask.cs
+++ b/src/internal/WixInternal.BaseBuildTasks.Sources/BaseToolsetTask.cs
diff --git a/src/internal/WixToolset.BaseBuildTasks.Sources/WixCommandLineBuilder.cs b/src/internal/WixInternal.BaseBuildTasks.Sources/WixCommandLineBuilder.cs
index d950bca9..d950bca9 100644
--- a/src/internal/WixToolset.BaseBuildTasks.Sources/WixCommandLineBuilder.cs
+++ b/src/internal/WixInternal.BaseBuildTasks.Sources/WixCommandLineBuilder.cs
diff --git a/src/internal/WixToolset.BaseBuildTasks.Sources/WixToolset.BaseBuildTasks.Sources.csproj b/src/internal/WixInternal.BaseBuildTasks.Sources/WixInternal.BaseBuildTasks.Sources.csproj
index 6ae5165e..6ae5165e 100644
--- a/src/internal/WixToolset.BaseBuildTasks.Sources/WixToolset.BaseBuildTasks.Sources.csproj
+++ b/src/internal/WixInternal.BaseBuildTasks.Sources/WixInternal.BaseBuildTasks.Sources.csproj
diff --git a/src/internal/WixBuildTools.TestSupport.Native/AssemblyInfo.cpp b/src/internal/WixInternal.TestSupport.Native/AssemblyInfo.cpp
index 23a48993..e1c47dfa 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/AssemblyInfo.cpp
+++ b/src/internal/WixInternal.TestSupport.Native/AssemblyInfo.cpp
@@ -11,7 +11,7 @@ using namespace System::Runtime::InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 //
-[assembly: AssemblyTitleAttribute("WixBuildTools.TestSupport.Native")];
+[assembly: AssemblyTitleAttribute("WixInternal.TestSupport.Native")];
 [assembly: AssemblyDescriptionAttribute("")];
 [assembly: AssemblyCultureAttribute("")];
 [assembly: ComVisible(false)];
diff --git a/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h b/src/internal/WixInternal.TestSupport.Native/NativeAssert.h
index b0206b14..9ca04fea 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h
+++ b/src/internal/WixInternal.TestSupport.Native/NativeAssert.h
@@ -2,7 +2,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
 
-namespace WixBuildTools {
+namespace WixInternal {
 namespace TestSupport {
 
     using namespace System;
diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj b/src/internal/WixInternal.TestSupport.Native/WixInternal.TestSupport.Native.vcxproj
index 47d79745..554347b8 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
+++ b/src/internal/WixInternal.TestSupport.Native/WixInternal.TestSupport.Native.vcxproj
@@ -2,7 +2,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="build\WixBuildTools.TestSupport.Native.props" />
+  <Import Project="build\WixInternal.TestSupport.Native.props" />
 
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -26,12 +26,12 @@
   <PropertyGroup Label="Globals">
     <ProjectTypes>{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>
     <ProjectGuid>{95BABD97-FBDB-453A-AF8A-FA031A07B599}</ProjectGuid>
-    <RootNamespace>WixBuildTools::TestSupport</RootNamespace>
+    <RootNamespace>WixInternal::TestSupport</RootNamespace>
     <Keyword>ManagedCProj</Keyword>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
-    <Description>WixBuildTools C++/CLI Test Support</Description>
+    <Description>WixInternal C++/CLI Test Support</Description>
     <SignOutput>false</SignOutput>
     <IsWixTestSupportProject>true</IsWixTestSupportProject>
   </PropertyGroup>
@@ -63,12 +63,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj">
+    <ProjectReference Include="..\WixInternal.TestSupport\WixInternal.TestSupport.csproj">
       <Project>{6C57EF2C-979A-4106-A9E5-FE342810619A}</Project>
     </ProjectReference>
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="build\WixBuildTools.TestSupport.Native.targets" />
+  <Import Project="build\WixInternal.TestSupport.Native.targets" />
   <Target Name="Pack" DependsOnTargets="Build" />
 </Project>
diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj.filters b/src/internal/WixInternal.TestSupport.Native/WixInternal.TestSupport.Native.vcxproj.filters
index 34c1380f..34c1380f 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj.filters
+++ b/src/internal/WixInternal.TestSupport.Native/WixInternal.TestSupport.Native.vcxproj.filters
diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props
index d9d9dab4..d9d9dab4 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props
+++ b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props
diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets
index 3d28ed57..6525e65a 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
+++ b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets
@@ -7,13 +7,13 @@
     <Reference Include="System.Core" />
   </ItemGroup>
 
-  <!-- Include these references only when not referenced by the WixBuildTools.TestSupport.Native.vcxproj -->
+  <!-- Include these references only when not referenced by the WixInternal.TestSupport.Native.vcxproj -->
   <ItemGroup Condition="'$(MSBuildProjectName)'!='$(MSBuildThisFileName)'">
-    <Reference Include="WixBuildTools.TestSupport">
-      <HintPath>$(RootBuildFolder)internal\$(Configuration)\$(PlatformTarget)\WixBuildTools.TestSupport.dll</HintPath>
+    <Reference Include="WixInternal.TestSupport">
+      <HintPath>$(RootBuildFolder)internal\$(Configuration)\$(PlatformTarget)\WixInternal.TestSupport.dll</HintPath>
     </Reference>
-    <Reference Include="WixBuildTools.TestSupport.Native">
-      <HintPath>$(RootBuildFolder)internal\$(Configuration)\$(PlatformTarget)\WixBuildTools.TestSupport.Native.dll</HintPath>
+    <Reference Include="WixInternal.TestSupport.Native">
+      <HintPath>$(RootBuildFolder)internal\$(Configuration)\$(PlatformTarget)\WixInternal.TestSupport.Native.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/src/internal/WixBuildTools.TestSupport.Native/packages.config b/src/internal/WixInternal.TestSupport.Native/packages.config
index 060bff6b..ef2b43c8 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/packages.config
+++ b/src/internal/WixInternal.TestSupport.Native/packages.config
@@ -3,7 +3,7 @@
 
 <packages>
   <!--
-    Update build\WixBuildTools.TestSupport.native.props and build\WixBuildTools.TestSupport.native.targets
+    Update build\WixInternal.TestSupport.Native.props and build\WixInternal.TestSupport.Native.targets
     when any of these versions are updated.
   -->
   <package id="GitInfo" version="2.2.0" />
diff --git a/src/internal/WixBuildTools.TestSupport.Native/precomp.cpp b/src/internal/WixInternal.TestSupport.Native/precomp.cpp
index 37664a1c..37664a1c 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/precomp.cpp
+++ b/src/internal/WixInternal.TestSupport.Native/precomp.cpp
diff --git a/src/internal/WixBuildTools.TestSupport.Native/precomp.h b/src/internal/WixInternal.TestSupport.Native/precomp.h
index f54b55be..f54b55be 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/precomp.h
+++ b/src/internal/WixInternal.TestSupport.Native/precomp.h
diff --git a/src/internal/WixBuildTools.TestSupport/Builder.cs b/src/internal/WixInternal.TestSupport/Builder.cs
index 31df0084..fa6e0064 100644
--- a/src/internal/WixBuildTools.TestSupport/Builder.cs
+++ b/src/internal/WixInternal.TestSupport/Builder.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/internal/WixBuildTools.TestSupport/DisposableFileSystem.cs b/src/internal/WixInternal.TestSupport/DisposableFileSystem.cs
index f096db72..b03bbaa4 100644
--- a/src/internal/WixBuildTools.TestSupport/DisposableFileSystem.cs
+++ b/src/internal/WixInternal.TestSupport/DisposableFileSystem.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/internal/WixBuildTools.TestSupport/DotnetRunner.cs b/src/internal/WixInternal.TestSupport/DotnetRunner.cs
index 82391178..befd8952 100644
--- a/src/internal/WixBuildTools.TestSupport/DotnetRunner.cs
+++ b/src/internal/WixInternal.TestSupport/DotnetRunner.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/internal/WixBuildTools.TestSupport/ExternalExecutable.cs b/src/internal/WixInternal.TestSupport/ExternalExecutable.cs
index 4a932645..e0345dfb 100644
--- a/src/internal/WixBuildTools.TestSupport/ExternalExecutable.cs
+++ b/src/internal/WixInternal.TestSupport/ExternalExecutable.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System;
     using System.Collections.Concurrent;
diff --git a/src/internal/WixBuildTools.TestSupport/ExternalExecutableResult.cs b/src/internal/WixInternal.TestSupport/ExternalExecutableResult.cs
index 950ee4bd..a142e07a 100644
--- a/src/internal/WixBuildTools.TestSupport/ExternalExecutableResult.cs
+++ b/src/internal/WixInternal.TestSupport/ExternalExecutableResult.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System.Diagnostics;
 
diff --git a/src/internal/WixBuildTools.TestSupport/FakeBuildEngine.cs b/src/internal/WixInternal.TestSupport/FakeBuildEngine.cs
index 20545970..c1f07708 100644
--- a/src/internal/WixBuildTools.TestSupport/FakeBuildEngine.cs
+++ b/src/internal/WixInternal.TestSupport/FakeBuildEngine.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System.Collections;
     using System.Text;
diff --git a/src/internal/WixBuildTools.TestSupport/MsbuildRunner.cs b/src/internal/WixInternal.TestSupport/MsbuildRunner.cs
index ac7caf0e..2cbf5e91 100644
--- a/src/internal/WixBuildTools.TestSupport/MsbuildRunner.cs
+++ b/src/internal/WixInternal.TestSupport/MsbuildRunner.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/internal/WixBuildTools.TestSupport/MsbuildRunnerResult.cs b/src/internal/WixInternal.TestSupport/MsbuildRunnerResult.cs
index fb61122d..b85acb16 100644
--- a/src/internal/WixBuildTools.TestSupport/MsbuildRunnerResult.cs
+++ b/src/internal/WixInternal.TestSupport/MsbuildRunnerResult.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System;
     using Xunit;
diff --git a/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs b/src/internal/WixInternal.TestSupport/MsbuildUtilities.cs
index 3271cc20..5560f993 100644
--- a/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs
+++ b/src/internal/WixInternal.TestSupport/MsbuildUtilities.cs
@@ -6,7 +6,7 @@ namespace WixToolsetTest.Sdk
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
-    using WixBuildTools.TestSupport;
+    using WixInternal.TestSupport;
 
     public enum BuildSystem
     {
diff --git a/src/internal/WixBuildTools.TestSupport/Pushd.cs b/src/internal/WixInternal.TestSupport/Pushd.cs
index d0545215..43737382 100644
--- a/src/internal/WixBuildTools.TestSupport/Pushd.cs
+++ b/src/internal/WixInternal.TestSupport/Pushd.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System;
     using System.IO;
diff --git a/src/internal/WixBuildTools.TestSupport/Query.cs b/src/internal/WixInternal.TestSupport/Query.cs
index 101a8890..38f5df64 100644
--- a/src/internal/WixBuildTools.TestSupport/Query.cs
+++ b/src/internal/WixInternal.TestSupport/Query.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/internal/WixBuildTools.TestSupport/RobocopyRunner.cs b/src/internal/WixInternal.TestSupport/RobocopyRunner.cs
index 49d53351..d93fbaa0 100644
--- a/src/internal/WixBuildTools.TestSupport/RobocopyRunner.cs
+++ b/src/internal/WixInternal.TestSupport/RobocopyRunner.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     public class RobocopyRunner : ExternalExecutable
     {
diff --git a/src/internal/WixBuildTools.TestSupport/TestData.cs b/src/internal/WixInternal.TestSupport/TestData.cs
index fc1ae4cc..05691e8c 100644
--- a/src/internal/WixBuildTools.TestSupport/TestData.cs
+++ b/src/internal/WixInternal.TestSupport/TestData.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System;
     using System.IO;
diff --git a/src/internal/WixBuildTools.TestSupport/TestDataFolderFileSystem.cs b/src/internal/WixInternal.TestSupport/TestDataFolderFileSystem.cs
index 15b7631d..38b05101 100644
--- a/src/internal/WixBuildTools.TestSupport/TestDataFolderFileSystem.cs
+++ b/src/internal/WixInternal.TestSupport/TestDataFolderFileSystem.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System;
 
diff --git a/src/internal/WixBuildTools.TestSupport/VswhereRunner.cs b/src/internal/WixInternal.TestSupport/VswhereRunner.cs
index 0197e125..f7361423 100644
--- a/src/internal/WixBuildTools.TestSupport/VswhereRunner.cs
+++ b/src/internal/WixInternal.TestSupport/VswhereRunner.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System;
     using System.IO;
diff --git a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj b/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj
index 4e1c3c26..4e1c3c26 100644
--- a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
+++ b/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj
diff --git a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkipTestException.cs b/src/internal/WixInternal.TestSupport/XunitExtensions/SkipTestException.cs
index bd7d23f9..6ef30829 100644
--- a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkipTestException.cs
+++ b/src/internal/WixInternal.TestSupport/XunitExtensions/SkipTestException.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport.XunitExtensions
+namespace WixInternal.TestSupport.XunitExtensions
 {
     using System;
 
diff --git a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkippableFactAttribute.cs b/src/internal/WixInternal.TestSupport/XunitExtensions/SkippableFactAttribute.cs
index 4974d489..ba4678c8 100644
--- a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkippableFactAttribute.cs
+++ b/src/internal/WixInternal.TestSupport/XunitExtensions/SkippableFactAttribute.cs
@@ -1,12 +1,12 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport.XunitExtensions
+namespace WixInternal.TestSupport.XunitExtensions
 {
     using Xunit;
     using Xunit.Sdk;
 
     // https://github.com/xunit/samples.xunit/blob/5dc1d35a63c3394a8678ac466b882576a70f56f6/DynamicSkipExample
-    [XunitTestCaseDiscoverer("WixBuildTools.TestSupport.XunitExtensions.SkippableFactDiscoverer", "WixBuildTools.TestSupport")]
+    [XunitTestCaseDiscoverer("WixInternal.TestSupport.XunitExtensions.SkippableFactDiscoverer", "WixInternal.TestSupport")]
     public class SkippableFactAttribute : FactAttribute
     {
     }
diff --git a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkippableFactDiscoverer.cs b/src/internal/WixInternal.TestSupport/XunitExtensions/SkippableFactDiscoverer.cs
index b692c912..d5061b04 100644
--- a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkippableFactDiscoverer.cs
+++ b/src/internal/WixInternal.TestSupport/XunitExtensions/SkippableFactDiscoverer.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport.XunitExtensions
+namespace WixInternal.TestSupport.XunitExtensions
 {
     using System.Collections.Generic;
     using Xunit.Abstractions;
diff --git a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkippableFactMessageBus.cs b/src/internal/WixInternal.TestSupport/XunitExtensions/SkippableFactMessageBus.cs
index 6d01889e..dd143c93 100644
--- a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkippableFactMessageBus.cs
+++ b/src/internal/WixInternal.TestSupport/XunitExtensions/SkippableFactMessageBus.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport.XunitExtensions
+namespace WixInternal.TestSupport.XunitExtensions
 {
     using System.Linq;
     using Xunit.Abstractions;
diff --git a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkippableFactTestCase.cs b/src/internal/WixInternal.TestSupport/XunitExtensions/SkippableFactTestCase.cs
index f13fec83..7a78b820 100644
--- a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkippableFactTestCase.cs
+++ b/src/internal/WixInternal.TestSupport/XunitExtensions/SkippableFactTestCase.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport.XunitExtensions
+namespace WixInternal.TestSupport.XunitExtensions
 {
     using System;
     using System.ComponentModel;
diff --git a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkippableTheoryAttribute.cs b/src/internal/WixInternal.TestSupport/XunitExtensions/SkippableTheoryAttribute.cs
index e026bb59..1ed04e01 100644
--- a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkippableTheoryAttribute.cs
+++ b/src/internal/WixInternal.TestSupport/XunitExtensions/SkippableTheoryAttribute.cs
@@ -1,11 +1,11 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport.XunitExtensions
+namespace WixInternal.TestSupport.XunitExtensions
 {
     using Xunit;
     using Xunit.Sdk;
 
-    [XunitTestCaseDiscoverer("WixBuildTools.TestSupport.XunitExtensions.SkippableFactDiscoverer", "WixBuildTools.TestSupport")]
+    [XunitTestCaseDiscoverer("WixInternal.TestSupport.XunitExtensions.SkippableFactDiscoverer", "WixInternal.TestSupport")]
     public class SkippableTheoryAttribute : TheoryAttribute
     {
     }
diff --git a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkippableTheoryDiscoverer.cs b/src/internal/WixInternal.TestSupport/XunitExtensions/SkippableTheoryDiscoverer.cs
index cf4e2b43..bf850cba 100644
--- a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkippableTheoryDiscoverer.cs
+++ b/src/internal/WixInternal.TestSupport/XunitExtensions/SkippableTheoryDiscoverer.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport.XunitExtensions
+namespace WixInternal.TestSupport.XunitExtensions
 {
     using System.Collections.Generic;
     using Xunit.Abstractions;
diff --git a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkippableTheoryTestCase.cs b/src/internal/WixInternal.TestSupport/XunitExtensions/SkippableTheoryTestCase.cs
index 3299fe7e..d9b7d068 100644
--- a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SkippableTheoryTestCase.cs
+++ b/src/internal/WixInternal.TestSupport/XunitExtensions/SkippableTheoryTestCase.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport.XunitExtensions
+namespace WixInternal.TestSupport.XunitExtensions
 {
     using System;
     using System.ComponentModel;
diff --git a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SpecificReturnCodeException.cs b/src/internal/WixInternal.TestSupport/XunitExtensions/SpecificReturnCodeException.cs
index c703e90a..49be13d5 100644
--- a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SpecificReturnCodeException.cs
+++ b/src/internal/WixInternal.TestSupport/XunitExtensions/SpecificReturnCodeException.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System;
     using Xunit.Sdk;
diff --git a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SucceededException.cs b/src/internal/WixInternal.TestSupport/XunitExtensions/SucceededException.cs
index 704fba28..d50c07ed 100644
--- a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SucceededException.cs
+++ b/src/internal/WixInternal.TestSupport/XunitExtensions/SucceededException.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System;
     using Xunit.Sdk;
diff --git a/src/internal/WixBuildTools.TestSupport/XunitExtensions/WixAssert.cs b/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs
index a8513bfb..66f831a1 100644
--- a/src/internal/WixBuildTools.TestSupport/XunitExtensions/WixAssert.cs
+++ b/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs
@@ -1,13 +1,13 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixBuildTools.TestSupport
+namespace WixInternal.TestSupport
 {
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
     using System.Xml.Linq;
-    using WixBuildTools.TestSupport.XunitExtensions;
+    using WixInternal.TestSupport.XunitExtensions;
     using Xunit;
     using Xunit.Sdk;
 
@@ -46,8 +46,8 @@ namespace WixBuildTools.TestSupport
 
         /// <summary>
         /// Dynamically skips the test.
-        /// Requires that the test was marked with a fact attribute derived from <see cref="WixBuildTools.TestSupport.XunitExtensions.SkippableFactAttribute" />
-        /// or <see cref="WixBuildTools.TestSupport.XunitExtensions.SkippableTheoryAttribute" />
+        /// Requires that the test was marked with a fact attribute derived from <see cref="WixInternal.TestSupport.XunitExtensions.SkippableFactAttribute" />
+        /// or <see cref="WixInternal.TestSupport.XunitExtensions.SkippableTheoryAttribute" />
         /// </summary>
         public static void Skip(string message)
         {
diff --git a/src/internal/internal.cmd b/src/internal/internal.cmd
index 32df26e9..18b7b418 100644
--- a/src/internal/internal.cmd
+++ b/src/internal/internal.cmd
@@ -31,12 +31,12 @@ msbuild internal_t.proj -p:Configuration=%_C% -nologo -warnaserror -bl:%_L%\inte
 
 :clean
 @rd /s/q "..\..\build\internal" 2> nul
-@del "..\..\build\artifacts\WixBuildTools.TestSupport.*.nupkg" 2> nul
-@del "..\..\build\artifacts\WixBuildTools.TestSupport.Native.*.nupkg" 2> nul
-@del "..\..\build\artifacts\WixToolset.BaseBuildTasks.Sources.*.nupkg" 2> nul
-@rd /s/q "%USERPROFILE%\.nuget\packages\wixbuildtools.testsupport" 2> nul
-@rd /s/q "%USERPROFILE%\.nuget\packages\wixbuildtools.testsupport.native" 2> nul
-@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.basebuildtasks.sources" 2> nul
+@del "..\..\build\artifacts\WixInternal.TestSupport.*.nupkg" 2> nul
+@del "..\..\build\artifacts\WixInternal.TestSupport.Native.*.nupkg" 2> nul
+@del "..\..\build\artifacts\WixInternal.BaseBuildTasks.Sources.*.nupkg" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixinternal.testsupport" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixinternal.testsupport.native" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixinternal.basebuildtasks.sources" 2> nul
 @exit /b
 
 :end
diff --git a/src/internal/internal.sln b/src/internal/internal.sln
index fe36efbe..e8d8db17 100644
--- a/src/internal/internal.sln
+++ b/src/internal/internal.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.TestSupport", "WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj", "{8E082709-7355-41D5-AF86-6BBF9C89BDD7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixInternal.TestSupport", "WixInternal.TestSupport\WixInternal.TestSupport.csproj", "{8E082709-7355-41D5-AF86-6BBF9C89BDD7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixBuildTools.TestSupport.Native", "WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj", "{95BABD97-FBDB-453A-AF8A-FA031A07B599}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixInternal.TestSupport.Native", "WixInternal.TestSupport.Native\WixInternal.TestSupport.Native.vcxproj", "{95BABD97-FBDB-453A-AF8A-FA031A07B599}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BaseBuildTasks.Sources", "WixToolset.BaseBuildTasks.Sources\WixToolset.BaseBuildTasks.Sources.csproj", "{6B654490-AB0D-4F94-B564-DAA80044D5A3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixInternal.BaseBuildTasks.Sources", "WixInternal.BaseBuildTasks.Sources\WixInternal.BaseBuildTasks.Sources.csproj", "{6B654490-AB0D-4F94-B564-DAA80044D5A3}"
 EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/internal/internal_t.proj b/src/internal/internal_t.proj
index fc4956d2..7dd52354 100644
--- a/src/internal/internal_t.proj
+++ b/src/internal/internal_t.proj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="WixToolset.BaseBuildTasks.Sources\WixToolset.BaseBuildTasks.Sources.csproj" Targets="Pack" />
-    <ProjectReference Include="WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" Targets="Pack" />
-    <ProjectReference Include="WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj" Properties="Platform=x86" />
-    <ProjectReference Include="WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj" Properties="Platform=x64" />
+    <ProjectReference Include="WixInternal.BaseBuildTasks.Sources\WixInternal.BaseBuildTasks.Sources.csproj" Targets="Pack" />
+    <ProjectReference Include="WixInternal.TestSupport\WixInternal.TestSupport.csproj" Targets="Pack" />
+    <ProjectReference Include="WixInternal.TestSupport.Native\WixInternal.TestSupport.Native.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="WixInternal.TestSupport.Native\WixInternal.TestSupport.Native.vcxproj" Properties="Platform=x64" />
   </ItemGroup>
 </Project>