diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index af7d96b3d056..7575272e244a 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -258,7 +258,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
-    <PackageReference Update="Microsoft.Generator.CSharp.ClientModel" Version="1.0.0-alpha.20250123.2" />
+    <PackageReference Update="Microsoft.Generator.CSharp.ClientModel" Version="1.0.0-alpha.20250127.1" />
   </ItemGroup>
 
   <!--
diff --git a/eng/packages/http-client-csharp/eng/scripts/Generate.ps1 b/eng/packages/http-client-csharp/eng/scripts/Generate.ps1
index e75aaf22e834..e706a27adf06 100644
--- a/eng/packages/http-client-csharp/eng/scripts/Generate.ps1
+++ b/eng/packages/http-client-csharp/eng/scripts/Generate.ps1
@@ -2,7 +2,8 @@
 param(
     $filter,
     [bool]$Stubbed = $true,
-    [bool]$LaunchOnly = $false
+    [bool]$LaunchOnly = $false,
+    [switch]$ForceNewProject = $false
 )
 
 Import-Module "$PSScriptRoot\Generation.psm1" -DisableNameChecking -Force;
@@ -20,14 +21,14 @@ if (-not $LaunchOnly) {
         $unbrandedTypespecTestProject = Join-Path $testProjectsLocalDir "Basic-TypeSpec"
         $unbrandedTypespecTestProject = $unbrandedTypespecTestProject
 
-        Invoke (Get-TspCommand "$unbrandedTypespecTestProject/Basic-TypeSpec.tsp" $unbrandedTypespecTestProject)
+        Invoke (Get-TspCommand "$unbrandedTypespecTestProject/Basic-TypeSpec.tsp" $unbrandedTypespecTestProject -forceNewProject $ForceNewProject)
 
         # exit if the generation failed
         if ($LASTEXITCODE -ne 0) {
             exit $LASTEXITCODE
         }
 
-        Write-Host "Building UnbrandedTypeSpec" -ForegroundColor Cyan
+        Write-Host "Building BasicTypeSpec" -ForegroundColor Cyan
         Invoke "dotnet build $packageRoot/generator/TestProjects/Local/Basic-TypeSpec/src/BasicTypeSpec.csproj"
 
         # exit if the generation failed
@@ -39,7 +40,7 @@ if (-not $LaunchOnly) {
 
 $specsDirectory = "$packageRoot/node_modules/@typespec/http-specs"
 $azureSpecsDirectory = "$packageRoot/node_modules/@azure-tools/azure-http-specs"
-$cadlRanchRoot = Join-Path $packageRoot 'generator' 'TestProjects' 'CadlRanch'
+$spectorRoot = Join-Path $packageRoot 'generator' 'TestProjects' 'Spector'
 
 function IsSpecDir {
     param (
@@ -95,9 +96,9 @@ $azureAllowSpecs = @(
     Join-Path 'http' 'resiliency' 'srv-driven'
 )
 
-$cadlRanchLaunchProjects = @{}
+$spectorLaunchProjects = @{}
 
-# Loop through all directories and subdirectories of the cadl ranch specs
+# Loop through all directories and subdirectories of the spector specs
 $directories = @(Get-ChildItem -Path "$specsDirectory/specs" -Directory -Recurse)
 $directories += @(Get-ChildItem -Path "$azureSpecsDirectory/specs" -Directory -Recurse)
 foreach ($directory in $directories) {
@@ -128,7 +129,7 @@ foreach ($directory in $directories) {
         continue
     }
 
-    $generationDir = $cadlRanchRoot
+    $generationDir = $spectorRoot
     foreach ($folder in $folders) {
         $generationDir = Join-Path $generationDir $folder
     }
@@ -140,26 +141,26 @@ foreach ($directory in $directories) {
     
     if ($folders.Contains("versioning")) {
         Generate-Versioning $directory.FullName $generationDir -generateStub $stubbed
-        $cadlRanchLaunchProjects.Add($($folders -join "-") + "-v1", $("TestProjects/CadlRanch/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v1")
-        $cadlRanchLaunchProjects.Add($($folders -join "-") + "-v2", $("TestProjects/CadlRanch/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v2")
+        $spectorLaunchProjects.Add($($folders -join "-") + "-v1", $("TestProjects/Spector/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v1")
+        $spectorLaunchProjects.Add($($folders -join "-") + "-v2", $("TestProjects/Spector/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v2")
         continue
     }
 
     # srv-driven contains two separate specs, for two separate clients. We need to generate both.
     if ($folders.Contains("srv-driven")) {
         Generate-Srv-Driven $directory.FullName $generationDir -generateStub $stubbed
-        $cadlRanchLaunchProjects.Add($($folders -join "-") + "-v1", $("TestProjects/CadlRanch/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v1")
-        $cadlRanchLaunchProjects.Add($($folders -join "-") + "-v2", $("TestProjects/CadlRanch/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v2")
+        $spectorLaunchProjects.Add($($folders -join "-") + "-v1", $("TestProjects/Spector/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v1")
+        $spectorLaunchProjects.Add($($folders -join "-") + "-v2", $("TestProjects/Spector/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v2")
         continue
     }
 
-    $cadlRanchLaunchProjects.Add(($folders -join "-"), ("TestProjects/CadlRanch/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))"))
+    $spectorLaunchProjects.Add(($folders -join "-"), ("TestProjects/Spector/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))"))
     if ($LaunchOnly) {
         continue
     }
     
     Write-Host "Generating $subPath" -ForegroundColor Cyan
-    Invoke (Get-TspCommand $specFile $generationDir $stubbed)
+    Invoke (Get-TspCommand $specFile $generationDir $stubbed -forceNewProject $ForceNewProject)
 
     # exit if the generation failed
     if ($LASTEXITCODE -ne 0) {
@@ -181,7 +182,7 @@ if ($null -eq $filter) {
     $launchSettings["profiles"]["Basic-TypeSpec"].Add("commandName", "Executable")
     $launchSettings["profiles"]["Basic-TypeSpec"].Add("executablePath", "dotnet")
 
-    foreach ($kvp in $cadlRanchLaunchProjects.GetEnumerator()) {
+    foreach ($kvp in $spectorLaunchProjects.GetEnumerator()) {
         $launchSettings["profiles"].Add($kvp.Key, @{})
         $launchSettings["profiles"][$kvp.Key].Add("commandLineArgs", "`$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll `$(SolutionDir)/$($kvp.Value) -p AzureStubPlugin")
         $launchSettings["profiles"][$kvp.Key].Add("commandName", "Executable")
@@ -207,5 +208,5 @@ if ($null -eq $filter) {
     # Write the launch settings to the launchSettings.json file
     $launchSettingsPath = Join-Path $solutionDir "Azure.Generator" "src" "Properties" "launchSettings.json"
     # Write the settings to JSON and normalize line endings to Unix style (LF)
-    $sortedLaunchSettings | ConvertTo-Json | ForEach-Object { $_ -replace "`r`n", "`n" } | Set-Content $launchSettingsPath
+    $sortedLaunchSettings | ConvertTo-Json | ForEach-Object { ($_ -replace "`r`n", "`n") + "`n" } | Set-Content -NoNewline $launchSettingsPath
 }
diff --git a/eng/packages/http-client-csharp/eng/scripts/Generation.psm1 b/eng/packages/http-client-csharp/eng/scripts/Generation.psm1
index 849cfc778a28..3cc18d25c221 100644
--- a/eng/packages/http-client-csharp/eng/scripts/Generation.psm1
+++ b/eng/packages/http-client-csharp/eng/scripts/Generation.psm1
@@ -26,7 +26,8 @@ function Get-TspCommand {
         [string]$generationDir,
         [bool]$generateStub = $false,
         [string]$namespaceOverride = $null,
-        [string]$apiVersion = $null
+        [string]$apiVersion = $null,
+        [bool]$forceNewProject = $false
     )
     $command = "npx tsp compile $specFile"
     $command += " --trace @azure-typespec/http-client-csharp"
@@ -49,6 +50,10 @@ function Get-TspCommand {
         $command += " --option @azure-typespec/http-client-csharp.api-version=$apiVersion"
     }
 
+    if ($forceNewProject) {
+        $command += " --option @azure-typespec/http-client-csharp.new-project=true"
+    }
+
     return $command
 }
 
diff --git a/eng/packages/http-client-csharp/eng/scripts/Get-CadlRanch-Coverage.ps1 b/eng/packages/http-client-csharp/eng/scripts/Get-Spector-Coverage.ps1
similarity index 82%
rename from eng/packages/http-client-csharp/eng/scripts/Get-CadlRanch-Coverage.ps1
rename to eng/packages/http-client-csharp/eng/scripts/Get-Spector-Coverage.ps1
index eb27b7965d8d..f2f4f119e3d2 100644
--- a/eng/packages/http-client-csharp/eng/scripts/Get-CadlRanch-Coverage.ps1
+++ b/eng/packages/http-client-csharp/eng/scripts/Get-Spector-Coverage.ps1
@@ -1,7 +1,7 @@
 #Requires -Version 7.0
 
 Import-Module "$PSScriptRoot\Generation.psm1" -DisableNameChecking -Force;
-Import-Module "$PSScriptRoot\CadlRanch-Helper.psm1" -DisableNameChecking -Force;
+Import-Module "$PSScriptRoot\Spector-Helper.psm1" -DisableNameChecking -Force;
 
 $packageRoot = Resolve-Path (Join-Path $PSScriptRoot '..' '..')
 
@@ -9,9 +9,9 @@ Refresh-Build
 
 $specsDirectory = Join-Path $packageRoot 'node_modules' '@typespec' 'http-specs' 'specs'
 $azureSpecsDirectory = Join-Path $packageRoot 'node_modules' '@azure-tools' 'azure-http-specs' 'specs'
-$cadlRanchRoot = Join-Path $packageRoot 'generator' 'TestProjects' 'CadlRanch' 'http'
-$directories = Get-ChildItem -Path "$cadlRanchRoot" -Directory -Recurse
-$cadlRanchCsproj = Join-Path $packageRoot 'generator' 'TestProjects' 'CadlRanch.Tests' 'TestProjects.CadlRanch.Tests.csproj'
+$spectorRoot = Join-Path $packageRoot 'generator' 'TestProjects' 'Spector' 'http'
+$directories = Get-ChildItem -Path "$spectorRoot" -Directory -Recurse
+$spectorCsproj = Join-Path $packageRoot 'generator' 'TestProjects' 'Spector.Tests' 'TestProjects.Spector.Tests.csproj'
 
 $coverageDir = Join-Path $packageRoot 'generator' 'artifacts' 'coverage'
 
@@ -26,7 +26,7 @@ foreach ($directory in $directories) {
     }
 
     $outputDir = $directory.FullName.Substring(0, $directory.FullName.IndexOf("src") - 1)
-    $subPath = $outputDir.Substring($cadlRanchRoot.Length + 1)
+    $subPath = $outputDir.Substring($spectorRoot.Length + 1)
 
     Write-Host "Regenerating $subPath" -ForegroundColor Cyan
 
@@ -66,8 +66,8 @@ foreach ($directory in $directories) {
 }
 
 # test all
-Write-Host "Generating CadlRanch coverage" -ForegroundColor Cyan
-$command  = "dotnet test $cadlRanchCsproj"
+Write-Host "Generating Spector coverage" -ForegroundColor Cyan
+$command  = "dotnet test $spectorCsproj"
 Invoke $command
 # exit if the testing failed
 if ($LASTEXITCODE -ne 0) {
@@ -81,7 +81,7 @@ foreach ($directory in $directories) {
     }
 
     $outputDir = $directory.FullName.Substring(0, $directory.FullName.IndexOf("src") - 1)
-    $subPath = $outputDir.Substring($cadlRanchRoot.Length + 1)
+    $subPath = $outputDir.Substring($spectorRoot.Length + 1)
 
     Write-Host "Restoring $subPath" -ForegroundColor Cyan
     $command = "git clean -xfd $outputDir"
diff --git a/eng/packages/http-client-csharp/eng/scripts/CadlRanch-Helper.psm1 b/eng/packages/http-client-csharp/eng/scripts/Spector-Helper.psm1
similarity index 100%
rename from eng/packages/http-client-csharp/eng/scripts/CadlRanch-Helper.psm1
rename to eng/packages/http-client-csharp/eng/scripts/Spector-Helper.psm1
diff --git a/eng/packages/http-client-csharp/eng/scripts/Test-CadlRanch.ps1 b/eng/packages/http-client-csharp/eng/scripts/Test-Spector.ps1
similarity index 83%
rename from eng/packages/http-client-csharp/eng/scripts/Test-CadlRanch.ps1
rename to eng/packages/http-client-csharp/eng/scripts/Test-Spector.ps1
index ea8b2be1e9c2..649781563307 100644
--- a/eng/packages/http-client-csharp/eng/scripts/Test-CadlRanch.ps1
+++ b/eng/packages/http-client-csharp/eng/scripts/Test-Spector.ps1
@@ -3,7 +3,7 @@
 param($filter)
 
 Import-Module "$PSScriptRoot\Generation.psm1" -DisableNameChecking -Force;
-Import-Module "$PSScriptRoot\CadlRanch-Helper.psm1" -DisableNameChecking -Force;
+Import-Module "$PSScriptRoot\Spector-Helper.psm1" -DisableNameChecking -Force;
 
 $packageRoot = Resolve-Path (Join-Path $PSScriptRoot '..' '..')
 
@@ -11,10 +11,10 @@ Refresh-Build
 
 $specsDirectory = Join-Path $packageRoot 'node_modules' '@typespec' 'http-specs' 'specs'
 $azureSpecsDirectory = Join-Path $packageRoot 'node_modules' '@azure-tools' 'azure-http-specs' 'specs'
-$cadlRanchRoot = Join-Path $packageRoot 'generator' 'TestProjects' 'CadlRanch' 
-$cadlRanchRootHttp = Join-Path $cadlRanchRoot 'http'
-$directories = Get-ChildItem -Path "$cadlRanchRootHttp" -Directory -Recurse
-$cadlRanchCsproj = Join-Path $packageRoot 'generator' 'TestProjects' 'CadlRanch.Tests' 'TestProjects.CadlRanch.Tests.csproj'
+$spectorRoot = Join-Path $packageRoot 'generator' 'TestProjects' 'Spector' 
+$spectorRootHttp = Join-Path $spectorRoot 'http'
+$directories = Get-ChildItem -Path "$spectorRootHttp" -Directory -Recurse
+$spectorCsproj = Join-Path $packageRoot 'generator' 'TestProjects' 'Spector.Tests' 'TestProjects.Spector.Tests.csproj'
 
 $coverageDir = Join-Path $packageRoot 'generator' 'artifacts' 'coverage'
 
@@ -28,15 +28,15 @@ foreach ($directory in $directories) {
     }
 
     $outputDir = $directory.FullName.Substring(0, $directory.FullName.IndexOf("src") - 1)
-    $subPath = $outputDir.Substring($cadlRanchRootHttp.Length + 1)
+    $subPath = $outputDir.Substring($spectorRootHttp.Length + 1)
     $folders = $subPath.Split([System.IO.Path]::DirectorySeparatorChar)
 
     if (-not (Compare-Paths $subPath $filter)) {
         continue
     }
 
-    $testPath = Join-Path "$cadlRanchRoot.Tests" "Http"
-    $testFilter = "TestProjects.CadlRanch.Tests.Http"
+    $testPath = Join-Path "$spectorRoot.Tests" "Http"
+    $testFilter = "TestProjects.Spector.Tests.Http"
     foreach ($folder in $folders) {
         $segment = "$(Get-Namespace $folder)"
         
@@ -87,7 +87,7 @@ foreach ($directory in $directories) {
     }
 
     Write-Host "Testing $subPath" -ForegroundColor Cyan
-    $command  = "dotnet test $cadlRanchCsproj --filter `"FullyQualifiedName~$testFilter`""
+    $command  = "dotnet test $spectorCsproj --filter `"FullyQualifiedName~$testFilter`""
     Invoke $command
     # exit if the testing failed
     if ($LASTEXITCODE -ne 0) {
diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator.StubLibrary/src/AzureStubVisitor.cs b/eng/packages/http-client-csharp/generator/Azure.Generator.StubLibrary/src/AzureStubVisitor.cs
index 790a682805a7..de048e10f6ab 100644
--- a/eng/packages/http-client-csharp/generator/Azure.Generator.StubLibrary/src/AzureStubVisitor.cs
+++ b/eng/packages/http-client-csharp/generator/Azure.Generator.StubLibrary/src/AzureStubVisitor.cs
@@ -23,7 +23,9 @@ internal class AzureStubVisitor : ScmLibraryVisitor
             if (!type.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Public) &&
                 !type.Name.StartsWith("Unknown", StringComparison.Ordinal) &&
                 !type.Name.Equals("MultiPartFormDataBinaryContent", StringComparison.Ordinal))
+            {
                 return null;
+            }
 
             type.Update(xmlDocs: _emptyDocs);
             return type;
@@ -48,7 +50,9 @@ internal class AzureStubVisitor : ScmLibraryVisitor
             if (!IsCallingBaseCtor(constructor) &&
                 !IsEffectivelyPublic(constructor.Signature.Modifiers) &&
                 (constructor.EnclosingType is not ModelProvider model || model.DerivedModels.Count == 0))
+            {
                 return null;
+            }
 
             constructor.Update(
                 bodyStatements: null,
@@ -76,7 +80,9 @@ private static bool IsCallingBaseCtor(ConstructorProvider constructor)
         protected override MethodProvider? Visit(MethodProvider method)
         {
             if (method.Signature.ExplicitInterface is null && !IsEffectivelyPublic(method.Signature.Modifiers))
+            {
                 return null;
+            }
 
             method.Signature.Update(modifiers: method.Signature.Modifiers & ~MethodSignatureModifiers.Async);
 
@@ -95,7 +101,9 @@ private static bool IsCallingBaseCtor(ConstructorProvider constructor)
         protected override PropertyProvider? Visit(PropertyProvider property)
         {
             if (!property.IsDiscriminator && !IsEffectivelyPublic(property.Modifiers))
+            {
                 return null;
+            }
 
             var propertyBody = new ExpressionPropertyBody(_throwNull, property.Body.HasSetter ? _throwNull : null);
 
@@ -109,10 +117,14 @@ private static bool IsCallingBaseCtor(ConstructorProvider constructor)
         private bool IsEffectivelyPublic(MethodSignatureModifiers modifiers)
         {
             if (modifiers.HasFlag(MethodSignatureModifiers.Public))
+            {
                 return true;
+            }
 
             if (modifiers.HasFlag(MethodSignatureModifiers.Protected) && !modifiers.HasFlag(MethodSignatureModifiers.Private))
+            {
                 return true;
+            }
 
             return false;
         }
diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator.sln b/eng/packages/http-client-csharp/generator/Azure.Generator.sln
index 16ffc31ea3c0..c2022838d5dc 100644
--- a/eng/packages/http-client-csharp/generator/Azure.Generator.sln
+++ b/eng/packages/http-client-csharp/generator/Azure.Generator.sln
@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProjects.Local.Tests",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Generator.StubLibrary", "Azure.Generator.StubLibrary\src\Azure.Generator.StubLibrary.csproj", "{CC2E7459-398A-60FA-5138-282707944E43}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProjects.CadlRanch.Tests", "TestProjects\CadlRanch.Tests\TestProjects.CadlRanch.Tests.csproj", "{FD729CC8-FAAC-B384-0328-6F590DCAA5AA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProjects.Spector.Tests", "TestProjects\Spector.Tests\TestProjects.Spector.Tests.csproj", "{FD729CC8-FAAC-B384-0328-6F590DCAA5AA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/src/Primitives/NewAzureProjectScaffolding.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/src/Primitives/NewAzureProjectScaffolding.cs
index f07bbfe7b6fa..08f50f1c43e4 100644
--- a/eng/packages/http-client-csharp/generator/Azure.Generator/src/Primitives/NewAzureProjectScaffolding.cs
+++ b/eng/packages/http-client-csharp/generator/Azure.Generator/src/Primitives/NewAzureProjectScaffolding.cs
@@ -1,20 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Azure.Core;
 using Microsoft.Generator.CSharp;
 using Microsoft.Generator.CSharp.Primitives;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Azure.Generator.Primitives
 {
-	/// <summary>
-	/// Defines the new project scaffolding needed for an azure sdk.
-	/// </summary>
+    /// <summary>
+    /// Defines the new project scaffolding needed for an azure sdk.
+    /// </summary>
     public class NewAzureProjectScaffolding : NewProjectScaffolding
     {
-		/// <inheritdoc/>
+        private const string MSBuildThisFileDirectory = "$(MSBuildThisFileDirectory)";
+        private const string RelativeCoreSegment = "sdk/core/Azure.Core/src/Shared/";
+        private const string ParentDirectory = "../";
+
+        /// <inheritdoc/>
         protected override string GetSourceProjectFileContent()
         {
             var builder = new CSharpProjectWriter()
@@ -30,17 +34,32 @@ protected override string GetSourceProjectFileContent()
                 builder.PackageReferences.Add(packages);
             }
 
-			if (AzureClientPlugin.Instance.InputLibrary.InputNamespace.Auth.ApiKey is not null)
-			{
-				//TODO: need to dynamically determine relative position in the repo and add the right number of ".." directories
-				//potentially expose Configuration.OutputFolder and calculate from there
-				builder.CompileIncludes.Add(new CSharpProjectWriter.CSProjCompileInclude("$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/AzureKeyCredentialPolicy.cs", "Shared/Core"));
-                builder.CompileIncludes.Add(new CSharpProjectWriter.CSProjCompileInclude("$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/RawRequestUriBuilder.cs", "Shared/Core"));
+            if (AzureClientPlugin.Instance.InputLibrary.InputNamespace.Auth.ApiKey is not null)
+            {
+                ReadOnlySpan<char> text = AzureClientPlugin.Instance.Configuration.OutputDirectory.AsSpan();
+                // we are either a spector project in the eng folder or a real sdk in the sdk folder
+                int beginning = text.IndexOf("eng");
+                if (beginning == -1)
+                {
+                    beginning = text.IndexOf("sdk");
+                }
+                text = text.Slice(beginning);
+                // starting with 2 to include eng at the beginning and src at the end
+                int pathSegmentCount = 2 + text.Count('/');
+                // count both path separators to normalize
+                pathSegmentCount += text.Count('\\');
+                builder.CompileIncludes.Add(new CSharpProjectWriter.CSProjCompileInclude(GetCompileInclude("AzureKeyCredentialPolicy.cs", pathSegmentCount), "Shared/Core"));
+                builder.CompileIncludes.Add(new CSharpProjectWriter.CSProjCompileInclude(GetCompileInclude("RawRequestUriBuilder.cs", pathSegmentCount), "Shared/Core"));
             }
 
             return builder.Write();
         }
 
+        private string GetCompileInclude(string fileName, int pathSegmentCount)
+        {
+            return $"{MSBuildThisFileDirectory}{string.Concat(Enumerable.Repeat(ParentDirectory, pathSegmentCount))}{RelativeCoreSegment}{fileName}";
+        }
+
         private static readonly IReadOnlyList<CSharpProjectWriter.CSProjDependencyPackage> _unbrandedDependencyPackages =
         [
             new("Azure.Core"),
@@ -51,55 +70,28 @@ protected override string GetSourceProjectFileContent()
         protected override string GetSolutionFileContent()
         {
             string slnContent = @"Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
 MinimumVisualStudioVersion = 10.0.40219.1
-";
-            slnContent += @"Project(""{{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}}"") = ""{0}"", ""src\{0}.csproj"", ""{{28FF4005-4467-4E36-92E7-DEA27DEB1519}}""
+Project(""{{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}}"") = ""{0}"", ""src\{0}.csproj"", ""{{28FF4005-4467-4E36-92E7-DEA27DEB1519}}""
 EndProject
-";
-            slnContent += @"Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{{B0C276D1-2930-4887-B29A-D1A33E7009A2}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{{B0C276D1-2930-4887-B29A-D1A33E7009A2}}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{{B0C276D1-2930-4887-B29A-D1A33E7009A2}}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{{B0C276D1-2930-4887-B29A-D1A33E7009A2}}.Release|Any CPU.Build.0 = Release|Any CPU
-		{{8E9A77AC-792A-4432-8320-ACFD46730401}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{{8E9A77AC-792A-4432-8320-ACFD46730401}}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{{8E9A77AC-792A-4432-8320-ACFD46730401}}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{{8E9A77AC-792A-4432-8320-ACFD46730401}}.Release|Any CPU.Build.0 = Release|Any CPU
-";
-            slnContent += @"		{{A4241C1F-A53D-474C-9E4E-075054407E74}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{{A4241C1F-A53D-474C-9E4E-075054407E74}}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{{A4241C1F-A53D-474C-9E4E-075054407E74}}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{{A4241C1F-A53D-474C-9E4E-075054407E74}}.Release|Any CPU.Build.0 = Release|Any CPU
-		{{FA8BD3F1-8616-47B6-974C-7576CDF4717E}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{{FA8BD3F1-8616-47B6-974C-7576CDF4717E}}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{{FA8BD3F1-8616-47B6-974C-7576CDF4717E}}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{{FA8BD3F1-8616-47B6-974C-7576CDF4717E}}.Release|Any CPU.Build.0 = Release|Any CPU
-		{{85677AD3-C214-42FA-AE6E-49B956CAC8DC}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{{85677AD3-C214-42FA-AE6E-49B956CAC8DC}}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{{85677AD3-C214-42FA-AE6E-49B956CAC8DC}}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{{85677AD3-C214-42FA-AE6E-49B956CAC8DC}}.Release|Any CPU.Build.0 = Release|Any CPU
-		{{28FF4005-4467-4E36-92E7-DEA27DEB1519}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{{28FF4005-4467-4E36-92E7-DEA27DEB1519}}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{{28FF4005-4467-4E36-92E7-DEA27DEB1519}}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{{28FF4005-4467-4E36-92E7-DEA27DEB1519}}.Release|Any CPU.Build.0 = Release|Any CPU
-		{{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {{A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}}
-	EndGlobalSection
+Global
+    GlobalSection(SolutionConfigurationPlatforms) = preSolution
+        Debug|Any CPU = Debug|Any CPU
+        Release|Any CPU = Release|Any CPU
+    EndGlobalSection
+    GlobalSection(ProjectConfigurationPlatforms) = postSolution
+        {{28FF4005-4467-4E36-92E7-DEA27DEB1519}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        {{28FF4005-4467-4E36-92E7-DEA27DEB1519}}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        {{28FF4005-4467-4E36-92E7-DEA27DEB1519}}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        {{28FF4005-4467-4E36-92E7-DEA27DEB1519}}.Release|Any CPU.Build.0 = Release|Any CPU
+    EndGlobalSection
+    GlobalSection(SolutionProperties) = preSolution
+        HideSolutionNode = FALSE
+    EndGlobalSection
+    GlobalSection(ExtensibilityGlobals) = postSolution
+        SolutionGuid = {{A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}}
+    EndGlobalSection
 EndGlobal
 ";
             return string.Format(slnContent, AzureClientPlugin.Instance.Configuration.RootNamespace);
diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/src/Properties/launchSettings.json b/eng/packages/http-client-csharp/generator/Azure.Generator/src/Properties/launchSettings.json
index d2831527ebf4..1fd60a55a7a8 100644
--- a/eng/packages/http-client-csharp/generator/Azure.Generator/src/Properties/launchSettings.json
+++ b/eng/packages/http-client-csharp/generator/Azure.Generator/src/Properties/launchSettings.json
@@ -6,142 +6,142 @@
       "executablePath": "dotnet"
     },
     "http-authentication-api-key": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/authentication/api-key -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/authentication/api-key -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-authentication-http-custom": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/authentication/http/custom -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/authentication/http/custom -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-authentication-oauth2": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/authentication/oauth2 -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/authentication/oauth2 -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-authentication-union": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/authentication/union -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/authentication/union -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-client-structure-default": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/client/structure/default -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/client/structure/default -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-encode-numeric": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/encode/numeric -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/encode/numeric -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-parameters-basic": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/parameters/basic -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/parameters/basic -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-parameters-body-optionality": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/parameters/body-optionality -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/parameters/body-optionality -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-parameters-spread": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/parameters/spread -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/parameters/spread -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-payload-content-negotiation": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/payload/content-negotiation -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/payload/content-negotiation -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-payload-json-merge-patch": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/payload/json-merge-patch -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/payload/json-merge-patch -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-payload-media-type": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/payload/media-type -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/payload/media-type -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-serialization-encoded-name-json": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/serialization/encoded-name/json -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/serialization/encoded-name/json -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-server-endpoint-not-defined": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/server/endpoint/not-defined -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/server/endpoint/not-defined -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-server-path-single": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/server/path/single -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/server/path/single -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-server-versions-not-versioned": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/server/versions/not-versioned -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/server/versions/not-versioned -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-special-headers-conditional-request": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/special-headers/conditional-request -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/special-headers/conditional-request -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-special-headers-repeatability": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/special-headers/repeatability -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/special-headers/repeatability -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-special-words": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/special-words -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/special-words -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-type-enum-fixed": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/type/enum/fixed -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/type/enum/fixed -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-type-model-empty": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/type/model/empty -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/type/model/empty -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-type-model-inheritance-nested-discriminator": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/type/model/inheritance/nested-discriminator -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-type-model-inheritance-not-discriminated": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/type/model/inheritance/not-discriminated -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-type-model-inheritance-recursive": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/type/model/inheritance/recursive -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/type/model/inheritance/recursive -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-type-model-inheritance-single-discriminator": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/type/model/inheritance/single-discriminator -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-type-model-usage": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/type/model/usage -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/type/model/usage -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-type-model-visibility": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/type/model/visibility -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/type/model/visibility -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     },
     "http-type-property-nullable": {
-      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/CadlRanch/http/type/property/nullable -p AzureStubPlugin",
+      "commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll $(SolutionDir)/TestProjects/Spector/http/type/property/nullable -p AzureStubPlugin",
       "commandName": "Executable",
       "executablePath": "dotnet"
     }
diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Azure.Generator.Tests.csproj b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Azure.Generator.Tests.csproj
index 7c9426be34d8..b61e487a47da 100644
--- a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Azure.Generator.Tests.csproj
+++ b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Azure.Generator.Tests.csproj
@@ -1,33 +1,33 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+  <PropertyGroup>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
-		<!--This is a workaround because `Microsoft.Generator.CSharp` and `Microsoft.Generator.CSharp.Input` is not signed-->
-		<NoWarn>CS8002</NoWarn>
-	</PropertyGroup>
+    <!--This is a workaround because `Microsoft.Generator.CSharp` and `Microsoft.Generator.CSharp.Input` is not signed-->
+    <NoWarn>CS8002</NoWarn>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="../src/Azure.Generator.csproj" />
-		<PackageReference Include="NUnit" />
-		<PackageReference Include="NUnit3TestAdapter" />
-		<PackageReference Include="Moq" />
+  <ItemGroup>
+    <ProjectReference Include="../src/Azure.Generator.csproj" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="Moq" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
   </ItemGroup>
 
-	<ItemGroup>
-	  <None Update="TestHelpers\Configuration.json">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </None>
-	</ItemGroup>
+  <ItemGroup>
+    <None Update="TestHelpers\Configuration.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
-	<ItemGroup>
-		<Compile Remove="**\TestData\**\*.cs" />
-	</ItemGroup>
+  <ItemGroup>
+    <Compile Remove="**\TestData\**\*.cs" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<None Include="**\TestData\**\*.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-	
+  <ItemGroup>
+    <None Include="**\TestData\**\*.cs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  
 </Project>
diff --git a/eng/packages/http-client-csharp/generator/Directory.Build.props b/eng/packages/http-client-csharp/generator/Directory.Build.props
index 74501249cd00..167d97e85200 100644
--- a/eng/packages/http-client-csharp/generator/Directory.Build.props
+++ b/eng/packages/http-client-csharp/generator/Directory.Build.props
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <Nullable>enable</Nullable>
     <ImportDefaultReferences>false</ImportDefaultReferences>
+    <IsShippingLibrary>false</IsShippingLibrary>
     <NoWarn>$(NoWarn);CS8002</NoWarn>
   </PropertyGroup>
   <!--
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/Authentication.ApiKey.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/Authentication.ApiKey.sln
deleted file mode 100644
index f1ddb0abbddb..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/Authentication.ApiKey.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ApiKey", "src\Authentication.ApiKey.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/Authentication.Http.Custom.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/Authentication.Http.Custom.sln
deleted file mode 100644
index 581dd3a832e1..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/Authentication.Http.Custom.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.Http.Custom", "src\Authentication.Http.Custom.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/Authentication.OAuth2.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/Authentication.OAuth2.sln
deleted file mode 100644
index fd59b6fc033e..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/Authentication.OAuth2.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.OAuth2", "src\Authentication.OAuth2.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/Authentication.Union.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/Authentication.Union.sln
deleted file mode 100644
index 47d870aadde2..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/Authentication.Union.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.Union", "src\Authentication.Union.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/Client.Structure.Service.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/Client.Structure.Service.sln
deleted file mode 100644
index 60a838737111..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/Client.Structure.Service.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Structure.Service", "src\Client.Structure.Service.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/Encode.Numeric.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/Encode.Numeric.sln
deleted file mode 100644
index a4ade8828cdd..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/Encode.Numeric.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Encode.Numeric", "src\Encode.Numeric.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/Parameters.Basic.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/Parameters.Basic.sln
deleted file mode 100644
index 3de32ed5c1cf..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/Parameters.Basic.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parameters.Basic", "src\Parameters.Basic.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/Parameters.BodyOptionality.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/Parameters.BodyOptionality.sln
deleted file mode 100644
index 1acbbac5288b..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/Parameters.BodyOptionality.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parameters.BodyOptionality", "src\Parameters.BodyOptionality.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/Parameters.Spread.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/Parameters.Spread.sln
deleted file mode 100644
index 6ef7cdce5469..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/Parameters.Spread.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parameters.Spread", "src\Parameters.Spread.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/Payload.ContentNegotiation.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/Payload.ContentNegotiation.sln
deleted file mode 100644
index af9e98072f59..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/Payload.ContentNegotiation.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Payload.ContentNegotiation", "src\Payload.ContentNegotiation.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/Payload.JsonMergePatch.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/Payload.JsonMergePatch.sln
deleted file mode 100644
index 4bfa9e540310..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/Payload.JsonMergePatch.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Payload.JsonMergePatch", "src\Payload.JsonMergePatch.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/Payload.MediaType.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/Payload.MediaType.sln
deleted file mode 100644
index 5da10c9ad752..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/Payload.MediaType.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Payload.MediaType", "src\Payload.MediaType.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/Serialization.EncodedName.Json.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/Serialization.EncodedName.Json.sln
deleted file mode 100644
index b55ef10bf31e..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/Serialization.EncodedName.Json.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serialization.EncodedName.Json", "src\Serialization.EncodedName.Json.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.sln
deleted file mode 100644
index 1e869abe1ce6..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Endpoint.NotDefined", "src\Server.Endpoint.NotDefined.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/Server.Path.Single.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/Server.Path.Single.sln
deleted file mode 100644
index b69f06d4c9df..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/Server.Path.Single.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Path.Single", "src\Server.Path.Single.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/Server.Versions.NotVersioned.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/Server.Versions.NotVersioned.sln
deleted file mode 100644
index 0690812d4b69..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/Server.Versions.NotVersioned.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Versions.NotVersioned", "src\Server.Versions.NotVersioned.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.sln
deleted file mode 100644
index df8870de1526..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialHeaders.ConditionalRequest", "src\SpecialHeaders.ConditionalRequest.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/SpecialHeaders.Repeatability.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/SpecialHeaders.Repeatability.sln
deleted file mode 100644
index ca4917a35d63..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/SpecialHeaders.Repeatability.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialHeaders.Repeatability", "src\SpecialHeaders.Repeatability.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/SpecialWords.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/SpecialWords.sln
deleted file mode 100644
index 5ef6d9605e3f..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/SpecialWords.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialWords", "src\SpecialWords.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/_Type._Enum.Fixed.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/_Type._Enum.Fixed.sln
deleted file mode 100644
index f112adf2f50a..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/_Type._Enum.Fixed.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type._Enum.Fixed", "src\_Type._Enum.Fixed.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/_Type.Model.Empty.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/_Type.Model.Empty.sln
deleted file mode 100644
index 17bd1a5f3b5c..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/_Type.Model.Empty.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Empty", "src\_Type.Model.Empty.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/_Type.Model.Inheritance.NestedDiscriminator.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/_Type.Model.Inheritance.NestedDiscriminator.sln
deleted file mode 100644
index f2da00137e47..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/_Type.Model.Inheritance.NestedDiscriminator.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Inheritance.NestedDiscriminator", "src\_Type.Model.Inheritance.NestedDiscriminator.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/_Type.Model.Inheritance.NotDiscriminated.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/_Type.Model.Inheritance.NotDiscriminated.sln
deleted file mode 100644
index 0d836d5ba4a9..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/_Type.Model.Inheritance.NotDiscriminated.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Inheritance.NotDiscriminated", "src\_Type.Model.Inheritance.NotDiscriminated.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/_Type.Model.Inheritance.Recursive.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/_Type.Model.Inheritance.Recursive.sln
deleted file mode 100644
index 201e3c0b6a5e..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/_Type.Model.Inheritance.Recursive.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Inheritance.Recursive", "src\_Type.Model.Inheritance.Recursive.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/_Type.Model.Inheritance.SingleDiscriminator.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/_Type.Model.Inheritance.SingleDiscriminator.sln
deleted file mode 100644
index 2b18f8ccc42f..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/_Type.Model.Inheritance.SingleDiscriminator.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Inheritance.SingleDiscriminator", "src\_Type.Model.Inheritance.SingleDiscriminator.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/_Type.Model.Usage.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/_Type.Model.Usage.sln
deleted file mode 100644
index cac29069616c..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/_Type.Model.Usage.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Usage", "src\_Type.Model.Usage.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/_Type.Model.Visibility.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/_Type.Model.Visibility.sln
deleted file mode 100644
index 0b5159155d96..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/_Type.Model.Visibility.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Visibility", "src\_Type.Model.Visibility.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/_Type.Property.Nullable.sln b/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/_Type.Property.Nullable.sln
deleted file mode 100644
index c6b923903639..000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/_Type.Property.Nullable.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Property.Nullable", "src\_Type.Property.Nullable.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
-	EndGlobalSection
-EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/BasicTypeSpec.sln b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/BasicTypeSpec.sln
index 710635bbac0a..a22a4353b1da 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/BasicTypeSpec.sln
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/BasicTypeSpec.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicTypeSpec", "src\BasicTypeSpec.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
 EndProject
@@ -10,34 +10,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C276D1-2930-4887-B29A-D1A33E7009A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E9A77AC-792A-4432-8320-ACFD46730401}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4241C1F-A53D-474C-9E4E-075054407E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA8BD3F1-8616-47B6-974C-7576CDF4717E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85677AD3-C214-42FA-AE6E-49B956CAC8DC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Authentication/ApiKey/ApiKeyTests.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Authentication/ApiKey/ApiKeyTests.cs
similarity index 82%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Authentication/ApiKey/ApiKeyTests.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Authentication/ApiKey/ApiKeyTests.cs
index 850c691f173f..a7edd4f4f6a0 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Http/Authentication/ApiKey/ApiKeyTests.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Http/Authentication/ApiKey/ApiKeyTests.cs
@@ -6,18 +6,18 @@
 using NUnit.Framework;
 using System.Threading.Tasks;
 
-namespace TestProjects.CadlRanch.Tests.Http.Authentication.ApiKey
+namespace TestProjects.Spector.Tests.Http.Authentication.ApiKey
 {
-    public class ApiKeyTests : CadlRanchTestBase
+    public class ApiKeyTests : SpectorTestBase
     {
-        [CadlRanchTest]
+        [SpectorTest]
         public Task Valid() => Test(async (host) =>
         {
             Response response = await new ApiKeyClient(host, new AzureKeyCredential("valid-key"), null).ValidAsync();
             Assert.AreEqual(204, response.Status);
         });
 
-        [CadlRanchTest]
+        [SpectorTest]
         public Task Invalid() => Test((host) =>
         {
             var exception = Assert.ThrowsAsync<RequestFailedException>(() => new ApiKeyClient(host, new AzureKeyCredential("invalid-key"), null).InvalidAsync());
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/AssemblyCleanFixture.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/AssemblyCleanFixture.cs
similarity index 74%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/AssemblyCleanFixture.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/AssemblyCleanFixture.cs
index 6babff83f9e4..3d5865a36078 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/AssemblyCleanFixture.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/AssemblyCleanFixture.cs
@@ -3,7 +3,7 @@
 
 using NUnit.Framework;
 
-namespace TestProjects.CadlRanch.Tests
+namespace TestProjects.Spector.Tests
 {
     [SetUpFixture]
     public static class AssemblyCleanFixture
@@ -11,7 +11,7 @@ public static class AssemblyCleanFixture
         [OneTimeTearDown]
         public static void RunOnAssemblyCleanUp()
         {
-            CadlRanchServerSession.Start().Server?.Dispose();
+            SpectorServerSession.Start().Server?.Dispose();
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/BuildPropertiesAttribute.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/BuildPropertiesAttribute.cs
similarity index 93%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/BuildPropertiesAttribute.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/BuildPropertiesAttribute.cs
index 266c2ddd9b46..2de3a28415d1 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/BuildPropertiesAttribute.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/BuildPropertiesAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace TestProjects.CadlRanch.Tests
+namespace TestProjects.Spector.Tests
 {
     [AttributeUsage(AttributeTargets.Assembly)]
     internal sealed class BuildPropertiesAttribute : Attribute
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/CadlRanchServer.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/SpectorServer.cs
similarity index 85%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/CadlRanchServer.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/SpectorServer.cs
index 978f0f0df25f..72d8e406f82e 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/CadlRanchServer.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/SpectorServer.cs
@@ -5,11 +5,11 @@
 using System.Diagnostics;
 using System.IO;
 
-namespace TestProjects.CadlRanch.Tests
+namespace TestProjects.Spector.Tests
 {
-    public class CadlRanchServer : TestServerBase
+    public class SpectorServer : TestServerBase
     {
-        public CadlRanchServer() : base(GetProcessPath(), $"serve {string.Join(" ", GetScenariosPaths())} --port 0 --coverageFile {GetCoverageFilePath()}")
+        public SpectorServer() : base(GetProcessPath(), $"serve {string.Join(" ", GetScenariosPaths())} --port 0 --coverageFile {GetCoverageFilePath()}")
         {
         }
 
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/CadlRanchServerSession.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/SpectorServerSession.cs
similarity index 55%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/CadlRanchServerSession.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/SpectorServerSession.cs
index 3635aaa5d4f5..1b6086c9e84f 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/CadlRanchServerSession.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/SpectorServerSession.cs
@@ -3,17 +3,17 @@
 
 using System.Threading.Tasks;
 
-namespace TestProjects.CadlRanch.Tests
+namespace TestProjects.Spector.Tests
 {
-    public class CadlRanchServerSession : TestServerSessionBase<CadlRanchServer>
+    public class SpectorServerSession : TestServerSessionBase<SpectorServer>
     {
-        private CadlRanchServerSession() : base()
+        private SpectorServerSession() : base()
         {
         }
 
-        public static CadlRanchServerSession Start()
+        public static SpectorServerSession Start()
         {
-            var server = new CadlRanchServerSession();
+            var server = new SpectorServerSession();
             return server;
         }
 
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/CadlRanchTestAttribute.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/SpectorTestAttribute.cs
similarity index 94%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/CadlRanchTestAttribute.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/SpectorTestAttribute.cs
index e2f52ce79984..c89b3f0736e7 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/CadlRanchTestAttribute.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/SpectorTestAttribute.cs
@@ -12,10 +12,10 @@
 using NUnit.Framework.Interfaces;
 using NUnit.Framework.Internal;
 
-namespace TestProjects.CadlRanch.Tests
+namespace TestProjects.Spector.Tests
 {
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    internal partial class CadlRanchTestAttribute : TestAttribute, IApplyToTest
+    internal partial class SpectorTestAttribute : TestAttribute, IApplyToTest
     {
         [GeneratedRegex("(?<=[a-z])([A-Z])")]
         private static partial Regex ToKebabCase();
@@ -26,7 +26,7 @@ internal partial class CadlRanchTestAttribute : TestAttribute, IApplyToTest
 
             if (!Directory.Exists(clientCodeDirectory))
             {
-                // Not all cadl-ranch scenarios use kebab-case directories, so try again without kebab-case.
+                // Not all spector scenarios use kebab-case directories, so try again without kebab-case.
                 clientCodeDirectory = GetGeneratedDirectory(test, false);
             }
 
@@ -79,7 +79,7 @@ private static string GetGeneratedDirectory(Test test, bool kebabCaseDirectories
         {
             var namespaceParts = test.FullName.Split('.').Skip(3);
             namespaceParts = namespaceParts.Take(namespaceParts.Count() - 2);
-            var clientCodeDirectory = Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..", "..", "eng", "packages", "http-client-csharp", "generator", "TestProjects", "CadlRanch");
+            var clientCodeDirectory = Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..", "..", "eng", "packages", "http-client-csharp", "generator", "TestProjects", "Spector");
             foreach (var part in namespaceParts)
             {
                 clientCodeDirectory = Path.Combine(clientCodeDirectory, FixName(part, kebabCaseDirectories));
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/TestServerBase.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/TestServerBase.cs
similarity index 96%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/TestServerBase.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/TestServerBase.cs
index e66f337defba..d8bcbba79b62 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/TestServerBase.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/TestServerBase.cs
@@ -8,7 +8,7 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 
-namespace TestProjects.CadlRanch.Tests
+namespace TestProjects.Spector.Tests
 {
     public class TestServerBase : IDisposable
     {
@@ -78,7 +78,7 @@ protected static string GetNodeModulesDirectory()
                 return nodeModulesDirectory;
             }
 
-            throw new InvalidOperationException($"Cannot find 'node_modules' in parent directories of {typeof(CadlRanchServer).Assembly.Location}.");
+            throw new InvalidOperationException($"Cannot find 'node_modules' in parent directories of {typeof(SpectorServer).Assembly.Location}.");
         }
 
         private void ReadOutput()
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/TestServerSessionBase.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/TestServerSessionBase.cs
similarity index 98%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/TestServerSessionBase.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/TestServerSessionBase.cs
index 691099c6dafb..a2d40991ed54 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/Infrastructure/TestServerSessionBase.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/Infrastructure/TestServerSessionBase.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace TestProjects.CadlRanch.Tests
+namespace TestProjects.Spector.Tests
 {
     public abstract class TestServerSessionBase<T> : IAsyncDisposable where T : TestServerBase
     {
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/CadlRanchTestBase.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/SpectorTestBase.cs
similarity index 83%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/CadlRanchTestBase.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/SpectorTestBase.cs
index 4705e3303c03..10c00af27ea9 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/CadlRanchTestBase.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/SpectorTestBase.cs
@@ -4,13 +4,13 @@
 using System.Threading.Tasks;
 using System;
 
-namespace TestProjects.CadlRanch.Tests
+namespace TestProjects.Spector.Tests
 {
-    public abstract class CadlRanchTestBase
+    public abstract class SpectorTestBase
     {
         public async Task Test(Func<Uri, Task> test)
         {
-            var server = CadlRanchServerSession.Start();
+            var server = SpectorServerSession.Start();
 
             try
             {
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/TestProjects.CadlRanch.Tests.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/TestProjects.Spector.Tests.csproj
similarity index 85%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/TestProjects.CadlRanch.Tests.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/TestProjects.Spector.Tests.csproj
index 6d63fb0f7189..e8e1eb6879bb 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch.Tests/TestProjects.CadlRanch.Tests.csproj
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector.Tests/TestProjects.Spector.Tests.csproj
@@ -16,11 +16,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="../CadlRanch/**/*.cs" Exclude="../CadlRanch/**/Properties/**/*.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" />
+    <Compile Include="../Spector/**/*.cs" Exclude="../Spector/**/Properties/**/*.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>
-    <AssemblyAttribute Include="TestProjects.CadlRanch.Tests.BuildProperties">
+    <AssemblyAttribute Include="TestProjects.Spector.Tests.BuildProperties">
       <_Parameter1>$(RepoRoot)</_Parameter1>
       <_Parameter2>$(RepoRoot)\eng\packages\http-client-csharp\generator\artifacts</_Parameter2>
     </AssemblyAttribute>
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/Directory.Build.props b/eng/packages/http-client-csharp/generator/TestProjects/Spector/Directory.Build.props
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/Directory.Build.props
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/Directory.Build.props
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Authentication.ApiKey.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Authentication.ApiKey.sln
new file mode 100644
index 000000000000..582c251c0480
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Authentication.ApiKey.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ApiKey", "src\Authentication.ApiKey.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Authentication.ApiKey.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj
similarity index 78%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Authentication.ApiKey.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj
index b0cfe77e5911..59a91f5cc9ff 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Authentication.ApiKey.csproj
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/AzureKeyCredentialPolicy.cs" LinkBase="Shared/Core" />
-    <Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/RawRequestUriBuilder.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../../../sdk/core/Azure.Core/src/Shared/AzureKeyCredentialPolicy.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../../../sdk/core/Azure.Core/src/Shared/RawRequestUriBuilder.cs" LinkBase="Shared/Core" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/ApiKeyClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/ApiKeyClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/ApiKeyClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/src/Generated/ApiKeyClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/ApiKeyClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Authentication.Http.Custom.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Authentication.Http.Custom.sln
new file mode 100644
index 000000000000..002a89bd41b3
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Authentication.Http.Custom.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.Http.Custom", "src\Authentication.Http.Custom.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Authentication.Http.Custom.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj
similarity index 78%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Authentication.Http.Custom.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj
index a818db5b9a2e..f82d53a1393f 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Authentication.Http.Custom.csproj
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/AzureKeyCredentialPolicy.cs" LinkBase="Shared/Core" />
-    <Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/RawRequestUriBuilder.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../../../../sdk/core/Azure.Core/src/Shared/AzureKeyCredentialPolicy.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../../../../sdk/core/Azure.Core/src/Shared/RawRequestUriBuilder.cs" LinkBase="Shared/Core" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/CustomClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/CustomClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/CustomClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/src/Generated/CustomClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/CustomClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Authentication.OAuth2.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Authentication.OAuth2.sln
new file mode 100644
index 000000000000..5f54e6ae7a46
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Authentication.OAuth2.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.OAuth2", "src\Authentication.OAuth2.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Authentication.OAuth2.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Authentication.OAuth2.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/OAuth2Client.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2Client.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/OAuth2Client.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2Client.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/OAuth2ClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2ClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/src/Generated/OAuth2ClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/OAuth2ClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Authentication.Union.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Authentication.Union.sln
new file mode 100644
index 000000000000..db8271863fb2
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Authentication.Union.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.Union", "src\Authentication.Union.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Authentication.Union.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj
similarity index 78%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Authentication.Union.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj
index 50bffe8a7d46..eaec81061be6 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Authentication.Union.csproj
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/AzureKeyCredentialPolicy.cs" LinkBase="Shared/Core" />
-    <Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/RawRequestUriBuilder.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../../../sdk/core/Azure.Core/src/Shared/AzureKeyCredentialPolicy.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../../../sdk/core/Azure.Core/src/Shared/RawRequestUriBuilder.cs" LinkBase="Shared/Core" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/UnionClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/UnionClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/UnionClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/src/Generated/UnionClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/UnionClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/authentication/union/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Client.Structure.Service.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Client.Structure.Service.sln
new file mode 100644
index 000000000000..6145c2ce63ed
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Client.Structure.Service.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Structure.Service", "src\Client.Structure.Service.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Client.Structure.Service.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Client.Structure.Service.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Client.Structure.Service.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Client.Structure.Service.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Bar.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Bar.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Bar.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Bar.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Baz.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Baz.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Baz.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Baz.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/BazFoo.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/BazFoo.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/BazFoo.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/BazFoo.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Foo.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Foo.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Foo.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Foo.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Models/ClientType.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Models/ClientType.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Models/ClientType.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Models/ClientType.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Qux.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Qux.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/Qux.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/Qux.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/QuxBar.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/QuxBar.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/QuxBar.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/QuxBar.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/ServiceClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/ServiceClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/ServiceClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/src/Generated/ServiceClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/ServiceClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Encode.Numeric.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Encode.Numeric.sln
new file mode 100644
index 000000000000..ed9006fadd24
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Encode.Numeric.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Encode.Numeric", "src\Encode.Numeric.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Encode.Numeric.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Encode.Numeric.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Encode.Numeric.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Encode.Numeric.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/EncodeNumericModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/EncodeNumericModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/EncodeNumericModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/EncodeNumericModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/SafeintAsStringProperty.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint32AsStringProperty.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Models/Uint8AsStringProperty.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/NumericClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/NumericClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/NumericClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/NumericClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/NumericClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Property.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Property.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/src/Generated/Property.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/Property.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/encode/numeric/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Parameters.Basic.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Parameters.Basic.sln
new file mode 100644
index 000000000000..5d864c152801
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Parameters.Basic.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parameters.Basic", "src\Parameters.Basic.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/BasicClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/BasicClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/BasicClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/BasicClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/BasicClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ExplicitBody.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/ExplicitBody.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ExplicitBody.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/ExplicitBody.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ImplicitBody.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/ImplicitBody.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ImplicitBody.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/ImplicitBody.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Models/User.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/Models/User.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Models/User.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/Models/User.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Models/User.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/Models/User.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/Models/User.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/Models/User.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ParametersBasicModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/ParametersBasicModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Generated/ParametersBasicModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/ParametersBasicModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Parameters.Basic.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Parameters.Basic.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/src/Parameters.Basic.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Parameters.Basic.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/basic/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Parameters.BodyOptionality.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Parameters.BodyOptionality.sln
new file mode 100644
index 000000000000..5e68d427a287
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Parameters.BodyOptionality.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parameters.BodyOptionality", "src\Parameters.BodyOptionality.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/BodyOptionalityClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/BodyOptionalityClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/BodyOptionalityClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/BodyOptionalityClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/BodyOptionalityClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Models/BodyModel.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/Models/BodyModel.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Models/BodyModel.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/Models/BodyModel.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Models/BodyModel.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/Models/BodyModel.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/Models/BodyModel.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/Models/BodyModel.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/OptionalExplicit.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/OptionalExplicit.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/OptionalExplicit.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/OptionalExplicit.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/ParametersBodyOptionalityModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/ParametersBodyOptionalityModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Generated/ParametersBodyOptionalityModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/ParametersBodyOptionalityModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/body-optionality/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Parameters.Spread.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Parameters.Spread.sln
new file mode 100644
index 000000000000..a412dccd42b3
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Parameters.Spread.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parameters.Spread", "src\Parameters.Spread.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Alias.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Alias.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Alias.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Alias.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Model.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Model.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Model.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Model.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Models/BodyParameter.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Models/BodyParameter.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Models/BodyParameter.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Models/BodyParameter.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Models/BodyParameter.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Models/BodyParameter.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/Models/BodyParameter.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/Models/BodyParameter.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/ParametersSpreadModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/ParametersSpreadModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/ParametersSpreadModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/ParametersSpreadModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/SpreadClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/SpreadClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/SpreadClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Generated/SpreadClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/SpreadClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Parameters.Spread.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Parameters.Spread.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/src/Parameters.Spread.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Parameters.Spread.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/parameters/spread/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Payload.ContentNegotiation.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Payload.ContentNegotiation.sln
new file mode 100644
index 000000000000..f227c17cb31d
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Payload.ContentNegotiation.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Payload.ContentNegotiation", "src\Payload.ContentNegotiation.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/ContentNegotiationClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/ContentNegotiationClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/ContentNegotiationClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/ContentNegotiationClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/ContentNegotiationClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/DifferentBody.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/DifferentBody.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/DifferentBody.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/DifferentBody.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/Models/PngImageAsJson.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/PayloadContentNegotiationModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/PayloadContentNegotiationModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/PayloadContentNegotiationModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/PayloadContentNegotiationModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/SameBody.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/SameBody.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Generated/SameBody.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/SameBody.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/content-negotiation/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Payload.JsonMergePatch.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Payload.JsonMergePatch.sln
new file mode 100644
index 000000000000..308cd4385141
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Payload.JsonMergePatch.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Payload.JsonMergePatch", "src\Payload.JsonMergePatch.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/JsonMergePatchClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/JsonMergePatchClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/JsonMergePatchClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/JsonMergePatchClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/JsonMergePatchClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/InnerModel.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/InnerModel.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/InnerModel.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/InnerModel.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/InnerModel.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/InnerModel.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/InnerModel.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/InnerModel.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/Resource.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/Resource.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/Resource.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/Resource.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/Resource.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/Resource.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/Models/Resource.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/Models/Resource.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/PayloadJsonMergePatchModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/PayloadJsonMergePatchModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Generated/PayloadJsonMergePatchModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/PayloadJsonMergePatchModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/json-merge-patch/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Payload.MediaType.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Payload.MediaType.sln
new file mode 100644
index 000000000000..a25e507fea6e
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Payload.MediaType.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Payload.MediaType", "src\Payload.MediaType.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/MediaTypeClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/MediaTypeClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/MediaTypeClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/MediaTypeClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/MediaTypeClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/StringBody.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/StringBody.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Generated/StringBody.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/StringBody.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Payload.MediaType.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Payload.MediaType.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/src/Payload.MediaType.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Payload.MediaType.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/payload/media-type/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Serialization.EncodedName.Json.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Serialization.EncodedName.Json.sln
new file mode 100644
index 000000000000..8dc3189a35ee
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Serialization.EncodedName.Json.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serialization.EncodedName.Json", "src\Serialization.EncodedName.Json.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/JsonClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/JsonClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/JsonClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/JsonClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/JsonClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/Models/JsonEncodedNameModel.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Property.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/Property.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/Property.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/Property.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/SerializationEncodedNameJsonModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/SerializationEncodedNameJsonModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Generated/SerializationEncodedNameJsonModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/SerializationEncodedNameJsonModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/serialization/encoded-name/json/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.sln
new file mode 100644
index 000000000000..f36aaf740821
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Server.Endpoint.NotDefined.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Endpoint.NotDefined", "src\Server.Endpoint.NotDefined.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/NotDefinedClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/NotDefinedClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/NotDefinedClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Generated/NotDefinedClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/NotDefinedClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/endpoint/not-defined/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Server.Path.Single.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Server.Path.Single.sln
new file mode 100644
index 000000000000..99ac967e6587
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Server.Path.Single.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Path.Single", "src\Server.Path.Single.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/SingleClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/SingleClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/SingleClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Generated/SingleClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/SingleClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Server.Path.Single.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Server.Path.Single.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/src/Server.Path.Single.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Server.Path.Single.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/path/single/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Server.Versions.NotVersioned.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Server.Versions.NotVersioned.sln
new file mode 100644
index 000000000000..837c737d434f
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Server.Versions.NotVersioned.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Versions.NotVersioned", "src\Server.Versions.NotVersioned.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/NotVersionedClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/NotVersionedClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/NotVersionedClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Generated/NotVersionedClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/NotVersionedClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/server/versions/not-versioned/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.sln
new file mode 100644
index 000000000000..9d0fe746c58f
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/SpecialHeaders.ConditionalRequest.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialHeaders.ConditionalRequest", "src\SpecialHeaders.ConditionalRequest.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/ConditionalRequestClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/ConditionalRequestClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/ConditionalRequestClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/Generated/ConditionalRequestClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/ConditionalRequestClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/conditional-request/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/SpecialHeaders.Repeatability.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/SpecialHeaders.Repeatability.sln
new file mode 100644
index 000000000000..890d9e4be2c7
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/SpecialHeaders.Repeatability.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialHeaders.Repeatability", "src\SpecialHeaders.Repeatability.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/RepeatabilityClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/RepeatabilityClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/RepeatabilityClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/Generated/RepeatabilityClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/RepeatabilityClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-headers/repeatability/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/SpecialWords.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/SpecialWords.sln
new file mode 100644
index 000000000000..8f36cfec1750
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/SpecialWords.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialWords", "src\SpecialWords.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/ModelProperties.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/ModelProperties.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/ModelProperties.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/ModelProperties.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/And.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/And.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/And.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/And.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/And.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/And.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/And.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/And.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/As.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/As.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/As.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/As.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/As.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/As.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/As.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/As.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Assert.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Assert.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Assert.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Assert.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Assert.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Assert.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Assert.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Assert.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Async.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Async.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Async.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Async.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Async.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Async.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Async.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Async.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Await.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Await.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Await.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Await.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Await.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Await.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Await.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Await.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Break.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Break.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Break.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Break.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Break.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Break.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Break.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Break.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Class.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Class.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Class.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Class.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Class.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Class.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Class.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Class.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Constructor.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Constructor.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Constructor.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Constructor.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Constructor.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Constructor.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Constructor.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Constructor.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Continue.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Continue.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Continue.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Continue.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Continue.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Continue.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Continue.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Continue.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Def.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Def.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Def.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Def.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Def.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Def.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Def.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Def.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Del.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Del.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Del.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Del.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Del.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Del.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Del.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Del.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Elif.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Elif.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Elif.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Elif.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Elif.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Elif.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Elif.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Elif.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Else.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Else.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Else.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Else.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Else.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Else.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Else.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Else.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Except.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Except.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Except.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Except.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Except.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Except.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Except.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Except.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Exec.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Exec.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Exec.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Exec.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Exec.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Exec.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Exec.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Exec.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Finally.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Finally.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Finally.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Finally.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Finally.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Finally.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Finally.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Finally.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/For.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/For.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/For.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/For.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/For.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/For.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/For.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/For.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/From.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/From.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/From.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/From.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/From.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/From.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/From.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/From.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Global.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Global.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Global.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Global.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Global.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Global.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Global.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Global.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/If.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/If.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/If.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/If.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/If.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/If.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/If.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/If.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Import.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Import.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Import.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Import.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Import.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Import.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Import.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Import.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/In.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/In.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/In.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/In.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/In.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/In.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/In.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/In.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Is.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Is.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Is.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Is.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Is.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Is.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Is.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Is.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Lambda.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Lambda.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Lambda.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Lambda.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Lambda.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Lambda.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Lambda.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Lambda.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Not.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Not.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Not.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Not.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Not.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Not.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Not.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Not.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Or.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Or.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Or.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Or.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Or.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Or.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Or.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Or.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Pass.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Pass.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Pass.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Pass.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Pass.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Pass.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Pass.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Pass.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Raise.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Raise.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Raise.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Raise.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Raise.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Raise.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Raise.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Raise.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Return.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Return.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Return.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Return.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Return.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Return.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Return.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Return.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/SameAsModel.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/SameAsModel.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/SameAsModel.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/SameAsModel.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/SameAsModel.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/SameAsModel.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/SameAsModel.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/SameAsModel.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Try.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Try.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Try.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Try.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Try.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Try.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Try.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Try.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/While.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/While.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/While.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/While.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/While.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/While.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/While.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/While.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/With.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/With.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/With.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/With.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/With.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/With.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/With.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/With.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Yield.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Yield.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Yield.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Yield.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Yield.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Yield.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Models/Yield.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Models/Yield.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/ModelsOps.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/ModelsOps.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/ModelsOps.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/ModelsOps.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Operations.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Operations.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Operations.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Operations.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Parameters.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Parameters.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/Parameters.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/Parameters.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/SpecialWordsClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/SpecialWordsClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/SpecialWordsClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/SpecialWordsClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/SpecialWordsModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/Generated/SpecialWordsModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/SpecialWordsModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/SpecialWords.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/SpecialWords.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/src/SpecialWords.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/SpecialWords.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/special-words/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/_Type._Enum.Fixed.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/_Type._Enum.Fixed.sln
new file mode 100644
index 000000000000..4704608643ca
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/_Type._Enum.Fixed.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type._Enum.Fixed", "src\_Type._Enum.Fixed.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/FixedClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/FixedClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/FixedClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/FixedClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/FixedClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Models/DaysOfWeekEnum.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/Models/DaysOfWeekEnum.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/Models/DaysOfWeekEnum.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/Models/DaysOfWeekEnum.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/String.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/String.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/Generated/String.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/String.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/_Type._Enum.Fixed.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/_Type._Enum.Fixed.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/src/_Type._Enum.Fixed.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/_Type._Enum.Fixed.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/enum/fixed/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/_Type.Model.Empty.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/_Type.Model.Empty.sln
new file mode 100644
index 000000000000..d90af399811a
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/_Type.Model.Empty.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Empty", "src\_Type.Model.Empty.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/EmptyClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/EmptyClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/EmptyClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/EmptyClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/EmptyClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInput.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInput.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInput.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInput.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInput.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInput.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInput.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInput.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInputOutput.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInputOutput.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInputOutput.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInputOutput.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInputOutput.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInputOutput.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyInputOutput.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyInputOutput.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyOutput.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyOutput.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyOutput.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyOutput.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyOutput.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyOutput.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/Models/EmptyOutput.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/Models/EmptyOutput.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/TypeModelEmptyModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/TypeModelEmptyModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/Generated/TypeModelEmptyModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/TypeModelEmptyModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/_Type.Model.Empty.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/_Type.Model.Empty.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/src/_Type.Model.Empty.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/_Type.Model.Empty.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/empty/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/_Type.Model.Inheritance.NestedDiscriminator.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/_Type.Model.Inheritance.NestedDiscriminator.sln
new file mode 100644
index 000000000000..3736e1f215ad
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/_Type.Model.Inheritance.NestedDiscriminator.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Inheritance.NestedDiscriminator", "src\_Type.Model.Inheritance.NestedDiscriminator.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Fish.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/GoblinShark.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Salmon.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/SawShark.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/Shark.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownFish.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/Models/UnknownShark.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/NestedDiscriminatorClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/TypeModelInheritanceNestedDiscriminatorModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/TypeModelInheritanceNestedDiscriminatorModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/Generated/TypeModelInheritanceNestedDiscriminatorModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/TypeModelInheritanceNestedDiscriminatorModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/_Type.Model.Inheritance.NestedDiscriminator.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/_Type.Model.Inheritance.NestedDiscriminator.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/src/_Type.Model.Inheritance.NestedDiscriminator.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/_Type.Model.Inheritance.NestedDiscriminator.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/nested-discriminator/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/_Type.Model.Inheritance.NotDiscriminated.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/_Type.Model.Inheritance.NotDiscriminated.sln
new file mode 100644
index 000000000000..dc6e0d8bd53b
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/_Type.Model.Inheritance.NotDiscriminated.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Inheritance.NotDiscriminated", "src\_Type.Model.Inheritance.NotDiscriminated.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Cat.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Pet.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/Models/Siamese.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/NotDiscriminatedClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/TypeModelInheritanceNotDiscriminatedModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/TypeModelInheritanceNotDiscriminatedModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/Generated/TypeModelInheritanceNotDiscriminatedModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/TypeModelInheritanceNotDiscriminatedModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/_Type.Model.Inheritance.NotDiscriminated.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/_Type.Model.Inheritance.NotDiscriminated.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/src/_Type.Model.Inheritance.NotDiscriminated.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/_Type.Model.Inheritance.NotDiscriminated.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/not-discriminated/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/_Type.Model.Inheritance.Recursive.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/_Type.Model.Inheritance.Recursive.sln
new file mode 100644
index 000000000000..07df0985b67f
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/_Type.Model.Inheritance.Recursive.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Inheritance.Recursive", "src\_Type.Model.Inheritance.Recursive.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Element.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Element.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Element.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Element.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Element.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Element.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Element.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Element.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Extension.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Extension.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Extension.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Extension.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Extension.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Extension.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/Models/Extension.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/Models/Extension.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/RecursiveClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/RecursiveClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/RecursiveClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/RecursiveClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/RecursiveClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/TypeModelInheritanceRecursiveModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/TypeModelInheritanceRecursiveModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/Generated/TypeModelInheritanceRecursiveModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/TypeModelInheritanceRecursiveModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/_Type.Model.Inheritance.Recursive.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/_Type.Model.Inheritance.Recursive.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/src/_Type.Model.Inheritance.Recursive.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/_Type.Model.Inheritance.Recursive.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/recursive/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/_Type.Model.Inheritance.SingleDiscriminator.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/_Type.Model.Inheritance.SingleDiscriminator.sln
new file mode 100644
index 000000000000..897a8e79c599
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/_Type.Model.Inheritance.SingleDiscriminator.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Inheritance.SingleDiscriminator", "src\_Type.Model.Inheritance.SingleDiscriminator.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Bird.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Dinosaur.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Eagle.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Goose.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/SeaGull.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/Sparrow.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/TRex.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownBird.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/Models/UnknownDinosaur.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/SingleDiscriminatorClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/TypeModelInheritanceSingleDiscriminatorModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/TypeModelInheritanceSingleDiscriminatorModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/Generated/TypeModelInheritanceSingleDiscriminatorModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/TypeModelInheritanceSingleDiscriminatorModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/_Type.Model.Inheritance.SingleDiscriminator.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/_Type.Model.Inheritance.SingleDiscriminator.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/src/_Type.Model.Inheritance.SingleDiscriminator.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/_Type.Model.Inheritance.SingleDiscriminator.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/inheritance/single-discriminator/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/_Type.Model.Usage.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/_Type.Model.Usage.sln
new file mode 100644
index 000000000000..2ed72bb228c5
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/_Type.Model.Usage.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Usage", "src\_Type.Model.Usage.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputOutputRecord.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputOutputRecord.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputOutputRecord.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputOutputRecord.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputOutputRecord.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputOutputRecord.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputOutputRecord.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputOutputRecord.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputRecord.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputRecord.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputRecord.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputRecord.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputRecord.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputRecord.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/InputRecord.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/InputRecord.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/OutputRecord.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/OutputRecord.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/OutputRecord.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/OutputRecord.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/OutputRecord.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/OutputRecord.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/Models/OutputRecord.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/Models/OutputRecord.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/TypeModelUsageModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/TypeModelUsageModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/TypeModelUsageModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/TypeModelUsageModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/UsageClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/UsageClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/UsageClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/Generated/UsageClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/UsageClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/_Type.Model.Usage.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/_Type.Model.Usage.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/src/_Type.Model.Usage.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/_Type.Model.Usage.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/usage/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/_Type.Model.Visibility.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/_Type.Model.Visibility.sln
new file mode 100644
index 000000000000..752adf4c2979
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/_Type.Model.Visibility.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Model.Visibility", "src\_Type.Model.Visibility.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/ReadOnlyModel.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/VisibilityModel.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/VisibilityModel.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/VisibilityModel.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/VisibilityModel.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/VisibilityModel.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/VisibilityModel.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/Models/VisibilityModel.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/Models/VisibilityModel.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/TypeModelVisibilityModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/TypeModelVisibilityModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/TypeModelVisibilityModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/TypeModelVisibilityModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/VisibilityClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/VisibilityClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/VisibilityClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/Generated/VisibilityClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/VisibilityClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/_Type.Model.Visibility.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/_Type.Model.Visibility.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/src/_Type.Model.Visibility.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/_Type.Model.Visibility.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/model/visibility/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/Configuration.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Configuration.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/Configuration.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Configuration.json
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/_Type.Property.Nullable.sln b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/_Type.Property.Nullable.sln
new file mode 100644
index 000000000000..bc4c1f278423
--- /dev/null
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/_Type.Property.Nullable.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35201.131
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Type.Property.Nullable", "src\_Type.Property.Nullable.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28FF4005-4467-4E36-92E7-DEA27DEB1519}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A97F4B90-2591-4689-B1F8-5F21FE6D6CAE}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Bytes.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Bytes.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Bytes.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Bytes.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsByte.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsByte.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsByte.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsByte.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsModel.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsModel.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsModel.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsModel.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsString.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsString.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/CollectionsString.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/CollectionsString.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Datetime.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Datetime.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Datetime.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Datetime.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Duration.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Duration.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Duration.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Duration.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/BytesProperty.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/BytesProperty.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/BytesProperty.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/BytesProperty.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/BytesProperty.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/BytesProperty.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/BytesProperty.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/BytesProperty.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsByteProperty.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsModelProperty.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/CollectionsStringProperty.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DatetimeProperty.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DatetimeProperty.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DatetimeProperty.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DatetimeProperty.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DatetimeProperty.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DatetimeProperty.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DatetimeProperty.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DatetimeProperty.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DurationProperty.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DurationProperty.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DurationProperty.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DurationProperty.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DurationProperty.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DurationProperty.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/DurationProperty.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/DurationProperty.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/InnerModel.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/InnerModel.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/InnerModel.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/InnerModel.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/InnerModel.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/InnerModel.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/InnerModel.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/InnerModel.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/StringProperty.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/StringProperty.Serialization.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/StringProperty.Serialization.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/StringProperty.Serialization.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/StringProperty.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/StringProperty.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/Models/StringProperty.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/Models/StringProperty.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/NullableClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClient.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/NullableClient.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClient.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/NullableClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClientOptions.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/NullableClientOptions.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/NullableClientOptions.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/String.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/String.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/String.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/String.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/TypePropertyNullableModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/TypePropertyNullableModelFactory.cs
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/Generated/TypePropertyNullableModelFactory.cs
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/TypePropertyNullableModelFactory.cs
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/_Type.Property.Nullable.csproj b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/_Type.Property.Nullable.csproj
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/src/_Type.Property.Nullable.csproj
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/_Type.Property.Nullable.csproj
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/tspCodeModel.json
similarity index 100%
rename from eng/packages/http-client-csharp/generator/TestProjects/CadlRanch/http/type/property/nullable/tspCodeModel.json
rename to eng/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/tspCodeModel.json
diff --git a/eng/packages/http-client-csharp/package-lock.json b/eng/packages/http-client-csharp/package-lock.json
index 2fbd036f775b..b6a79327d600 100644
--- a/eng/packages/http-client-csharp/package-lock.json
+++ b/eng/packages/http-client-csharp/package-lock.json
@@ -8,7 +8,7 @@
       "name": "@azure-typespec/http-client-csharp",
       "version": "1.0.0",
       "dependencies": {
-        "@typespec/http-client-csharp": "0.1.9-alpha.20250123.2"
+        "@typespec/http-client-csharp": "0.1.9-alpha.20250127.1"
       },
       "devDependencies": {
         "@azure-tools/azure-http-specs": "0.1.0-alpha.5",
@@ -1930,9 +1930,9 @@
       }
     },
     "node_modules/@typespec/http-client-csharp": {
-      "version": "0.1.9-alpha.20250123.2",
-      "resolved": "https://registry.npmjs.org/@typespec/http-client-csharp/-/http-client-csharp-0.1.9-alpha.20250123.2.tgz",
-      "integrity": "sha512-akOMywVV/Xc1KDp18ZXsHpA/lUK/NDbaiA+8Z1OsfEZZDMbRYNTZcDlBiMjACPfbkUDv3BWHkL7WMrZlENRh6g==",
+      "version": "0.1.9-alpha.20250127.1",
+      "resolved": "https://registry.npmjs.org/@typespec/http-client-csharp/-/http-client-csharp-0.1.9-alpha.20250127.1.tgz",
+      "integrity": "sha512-PWwN3sB1WJ0Urytm1yUaTAYy43GVN4gWDHZk4udz89KF8GBdr4TBIp+2VA9vCa75HJJfUXWsjf8kF7sXcOga3w==",
       "dependencies": {
         "json-serialize-refs": "0.1.0-0"
       },
diff --git a/eng/packages/http-client-csharp/package.json b/eng/packages/http-client-csharp/package.json
index 51e696aeeeee..ac00b30a7536 100644
--- a/eng/packages/http-client-csharp/package.json
+++ b/eng/packages/http-client-csharp/package.json
@@ -23,7 +23,7 @@
     "dist/**"
   ],
   "dependencies": {
-    "@typespec/http-client-csharp": "0.1.9-alpha.20250123.2"
+    "@typespec/http-client-csharp": "0.1.9-alpha.20250127.1"
   },
   "devDependencies": {
     "@typespec/http-specs": "0.1.0-alpha.7",