diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fca439c2c38d..4ac803009c2d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,88 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="10.0.100-preview.4.25214.2">
+    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="10.0.100-preview.4.25214.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>d92055f1223d7c91b96cbea90afe0f7ca7f0542b</Sha>
+      <Sha>c11fe71ebb773ca6070fb078a5eda02406831667</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Edge" Version="10.0.100-preview.4.25214.2">
+    <Dependency Name="Microsoft.TemplateEngine.Edge" Version="10.0.100-preview.4.25214.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>d92055f1223d7c91b96cbea90afe0f7ca7f0542b</Sha>
+      <Sha>c11fe71ebb773ca6070fb078a5eda02406831667</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="10.0.100-preview.4.25214.2">
+    <Dependency Name="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="10.0.100-preview.4.25214.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>d92055f1223d7c91b96cbea90afe0f7ca7f0542b</Sha>
+      <Sha>c11fe71ebb773ca6070fb078a5eda02406831667</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Utils" Version="10.0.100-preview.4.25214.2">
+    <Dependency Name="Microsoft.TemplateEngine.Utils" Version="10.0.100-preview.4.25214.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>d92055f1223d7c91b96cbea90afe0f7ca7f0542b</Sha>
+      <Sha>c11fe71ebb773ca6070fb078a5eda02406831667</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateSearch.Common" Version="10.0.100-preview.4.25214.2">
+    <Dependency Name="Microsoft.TemplateSearch.Common" Version="10.0.100-preview.4.25214.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>d92055f1223d7c91b96cbea90afe0f7ca7f0542b</Sha>
+      <Sha>c11fe71ebb773ca6070fb078a5eda02406831667</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="10.0.100-preview.4.25214.2">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="10.0.100-preview.4.25214.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>d92055f1223d7c91b96cbea90afe0f7ca7f0542b</Sha>
+      <Sha>c11fe71ebb773ca6070fb078a5eda02406831667</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.TestHelper" Version="10.0.100-preview.4.25214.2">
+    <Dependency Name="Microsoft.TemplateEngine.TestHelper" Version="10.0.100-preview.4.25214.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>d92055f1223d7c91b96cbea90afe0f7ca7f0542b</Sha>
+      <Sha>c11fe71ebb773ca6070fb078a5eda02406831667</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Authoring.TemplateVerifier" Version="10.0.100-preview.4.25214.2">
+    <Dependency Name="Microsoft.TemplateEngine.Authoring.TemplateVerifier" Version="10.0.100-preview.4.25214.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>d92055f1223d7c91b96cbea90afe0f7ca7f0542b</Sha>
+      <Sha>c11fe71ebb773ca6070fb078a5eda02406831667</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateSearch.TemplateDiscovery" Version="10.0.100-preview.4.25214.2">
+    <Dependency Name="Microsoft.TemplateSearch.TemplateDiscovery" Version="10.0.100-preview.4.25214.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>d92055f1223d7c91b96cbea90afe0f7ca7f0542b</Sha>
+      <Sha>c11fe71ebb773ca6070fb078a5eda02406831667</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="10.0.100-preview.4.25214.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="10.0.100-preview.4.25214.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>d92055f1223d7c91b96cbea90afe0f7ca7f0542b</Sha>
+      <Sha>c11fe71ebb773ca6070fb078a5eda02406831667</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.10.0" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.10.0" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.HostModel" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.NET.HostModel" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Hashing" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.IO.Hashing" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
       <SourceBuild RepoName="runtime" ManagedOnly="false" />
     </Dependency>
     <!-- Change blob version in GenerateInstallerLayout.targets if this is unpinned to service targeting pack -->
@@ -120,116 +120,116 @@
       <Sha>4ba36db1f42f33a66d9677f0b9d589d39b204a9c</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25213.1">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25214.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>e2700e893c8884ccdcb15bdb294c89d624f597af</Sha>
+      <Sha>959bcb76028fa383d6e1388c60bef630c75470d3</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="5.0.0-1.25213.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="5.0.0-1.25214.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>e2700e893c8884ccdcb15bdb294c89d624f597af</Sha>
+      <Sha>959bcb76028fa383d6e1388c60bef630c75470d3</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="5.0.0-1.25213.1">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="5.0.0-1.25214.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>e2700e893c8884ccdcb15bdb294c89d624f597af</Sha>
+      <Sha>959bcb76028fa383d6e1388c60bef630c75470d3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-1.25213.1">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-1.25214.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>e2700e893c8884ccdcb15bdb294c89d624f597af</Sha>
+      <Sha>959bcb76028fa383d6e1388c60bef630c75470d3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25213.1">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25214.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>e2700e893c8884ccdcb15bdb294c89d624f597af</Sha>
+      <Sha>959bcb76028fa383d6e1388c60bef630c75470d3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="5.0.0-1.25213.1">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="5.0.0-1.25214.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>e2700e893c8884ccdcb15bdb294c89d624f597af</Sha>
+      <Sha>959bcb76028fa383d6e1388c60bef630c75470d3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25213.1">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25214.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>e2700e893c8884ccdcb15bdb294c89d624f597af</Sha>
+      <Sha>959bcb76028fa383d6e1388c60bef630c75470d3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25213.1">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25214.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>e2700e893c8884ccdcb15bdb294c89d624f597af</Sha>
+      <Sha>959bcb76028fa383d6e1388c60bef630c75470d3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25213.1">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25214.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>e2700e893c8884ccdcb15bdb294c89d624f597af</Sha>
+      <Sha>959bcb76028fa383d6e1388c60bef630c75470d3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25213.1">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25214.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>e2700e893c8884ccdcb15bdb294c89d624f597af</Sha>
+      <Sha>959bcb76028fa383d6e1388c60bef630c75470d3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.102">
+    <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.Build.Tasks" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
       <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks.Console" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.Build.Tasks.Console" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks.Pack" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.Build.Tasks.Pack" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Commands" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.Commands" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.CommandLine.XPlat" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.CommandLine.XPlat" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Common" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.Common" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Configuration" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.Configuration" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Credentials" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.Credentials" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.DependencyResolver.Core" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.DependencyResolver.Core" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Frameworks" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.Frameworks" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.LibraryModel" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.LibraryModel" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.ProjectModel" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.ProjectModel" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Protocol" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.Protocol" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Packaging" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.Packaging" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Versioning" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.Versioning" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Localization" Version="6.14.0-preview.1.102">
+    <Dependency Name="NuGet.Localization" Version="6.15.0-preview.1.7">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>7f50923823cb8fe4dab9b6565ece9516407de498</Sha>
+      <Sha>d535886475b1eeda1813eb1947af23bd046abb25</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.15.0-preview-25211-01">
       <Uri>https://github.com/microsoft/vstest</Uri>
@@ -249,29 +249,29 @@
       <Sha>92a3cb95e0d1b901ab0eb77f511e4cabe76edd61</Sha>
       <SourceBuild RepoName="vstest" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.CodeDom" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.CodeDom" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.ProtectedData" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Security.Cryptography.ProtectedData" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encoding.CodePages" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Text.Encoding.CodePages" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.4.25215.1">
       <Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -462,9 +462,9 @@
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
       <Sha>00e30d424e17e74fd2c28ffd8f65c2757113ca9f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25213.1">
+    <Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25214.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>e2700e893c8884ccdcb15bdb294c89d624f597af</Sha>
+      <Sha>959bcb76028fa383d6e1388c60bef630c75470d3</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
     <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="10.0.0-preview.25215.1">
@@ -472,13 +472,9 @@
       <Sha>00e30d424e17e74fd2c28ffd8f65c2757113ca9f</Sha>
       <SourceBuild RepoName="roslyn-analyzers" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="System.CommandLine" Version="2.0.0-beta4.25071.2">
+    <Dependency Name="System.CommandLine" Version="2.0.0-beta5.25208.1">
       <Uri>https://github.com/dotnet/command-line-api</Uri>
-      <Sha>3bbb940ceeb3254790899d751a8d418348563d40</Sha>
-    </Dependency>
-    <Dependency Name="System.CommandLine.Rendering" Version="0.4.0-alpha.25071.2">
-      <Uri>https://github.com/dotnet/command-line-api</Uri>
-      <Sha>3bbb940ceeb3254790899d751a8d418348563d40</Sha>
+      <Sha>48bd86bdcd926a194e1581a60d820d12a64ef3c6</Sha>
     </Dependency>
     <!-- Microsoft.CodeAnalysis.Workspaces.MSBuild transitively references M.Bcl.AsyncInterfaces.
          Adding an explicit dependency to make sure the latest version is used instead of the SBRP
@@ -489,9 +485,9 @@
       <Sha>d1c0c096d93db9c45001409afbb3dfec4bce89bb</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.607102">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.620801">
       <Uri>https://github.com/dotnet/command-line-api</Uri>
-      <Sha>3bbb940ceeb3254790899d751a8d418348563d40</Sha>
+      <Sha>48bd86bdcd926a194e1581a60d820d12a64ef3c6</Sha>
       <SourceBuild RepoName="command-line-api" ManagedOnly="true" />
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
@@ -510,34 +506,34 @@
       <Uri>https://github.com/dotnet/deployment-tools</Uri>
       <Sha>dd4d34c5adceabc4a02c345473a5baaece64d8bd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Tasks.Git" Version="10.0.0-beta.25203.1">
+    <Dependency Name="Microsoft.Build.Tasks.Git" Version="10.0.0-beta.25214.2">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>ccdd470400fb56274ddaafc64ee1bbd1f953f361</Sha>
+      <Sha>9a5858c6363b00b244aeddeac982a33b7e660f68</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.Common" Version="10.0.0-beta.25203.1">
+    <Dependency Name="Microsoft.SourceLink.Common" Version="10.0.0-beta.25214.2">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>ccdd470400fb56274ddaafc64ee1bbd1f953f361</Sha>
+      <Sha>9a5858c6363b00b244aeddeac982a33b7e660f68</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25203.1">
+    <Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25214.2">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>ccdd470400fb56274ddaafc64ee1bbd1f953f361</Sha>
+      <Sha>9a5858c6363b00b244aeddeac982a33b7e660f68</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25203.1">
+    <Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25214.2">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>ccdd470400fb56274ddaafc64ee1bbd1f953f361</Sha>
+      <Sha>9a5858c6363b00b244aeddeac982a33b7e660f68</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.GitLab" Version="10.0.0-beta.25203.1">
+    <Dependency Name="Microsoft.SourceLink.GitLab" Version="10.0.0-beta.25214.2">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>ccdd470400fb56274ddaafc64ee1bbd1f953f361</Sha>
+      <Sha>9a5858c6363b00b244aeddeac982a33b7e660f68</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.Bitbucket.Git" Version="10.0.0-beta.25203.1">
+    <Dependency Name="Microsoft.SourceLink.Bitbucket.Git" Version="10.0.0-beta.25214.2">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>ccdd470400fb56274ddaafc64ee1bbd1f953f361</Sha>
+      <Sha>9a5858c6363b00b244aeddeac982a33b7e660f68</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.sourcelink" Version="10.0.0-beta.25203.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.sourcelink" Version="10.0.0-beta.25214.2">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>ccdd470400fb56274ddaafc64ee1bbd1f953f361</Sha>
+      <Sha>9a5858c6363b00b244aeddeac982a33b7e660f68</Sha>
       <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
@@ -553,85 +549,85 @@
       <SourceBuild RepoName="symreader" ManagedOnly="true" />
     </Dependency>
     <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
-    <Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
     <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
     <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
     <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
-    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
     <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
-    <Dependency Name="System.ServiceProcess.ServiceController" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.ServiceProcess.ServiceController" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Text.Json" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Composition.AttributedModel" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Composition.AttributedModel" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Composition.Convention" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Composition.Convention" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Composition.Hosting" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Composition.Hosting" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Composition.Runtime" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Composition.Runtime" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Composition.TypedParts" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Composition.TypedParts" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Permissions" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Security.Permissions" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
@@ -673,9 +669,9 @@
       <Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25215.3">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -712,9 +708,9 @@
       <Uri>https://github.com/microsoft/testfx</Uri>
       <Sha>64d2eef45f4ee825d1ab2ae48ea315ba3f25c8c1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-preview.4.25211.19">
+    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-preview.4.25215.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>464e5fe6fbe499012445cbd6371010748b89dba3</Sha>
+      <Sha>d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index ffe391e3773e..1ecc4617a39d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -59,7 +59,7 @@
     <SystemDataSqlClientPackageVersion>4.8.6</SystemDataSqlClientPackageVersion>
     <StyleCopAnalyzersPackageVersion>1.2.0-beta.435</StyleCopAnalyzersPackageVersion>
     <WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
-    <SystemCommandLineVersion>2.0.0-beta4.25071.2</SystemCommandLineVersion>
+    <SystemCommandLineVersion>2.0.0-beta5.25208.1</SystemCommandLineVersion>
     <MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
     <MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
     <MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
@@ -96,44 +96,44 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.4.25211.19</MicrosoftNETCoreAppRefPackageVersion>
-    <VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.4.25211.19</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-preview.4.25211.19</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETHostModelVersion>10.0.0-preview.4.25211.19</MicrosoftNETHostModelVersion>
-    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.4.25211.19</MicrosoftNETILLinkTasksPackageVersion>
-    <MicrosoftExtensionsConfigurationIniVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsConfigurationIniVersion>
-    <SystemServiceProcessServiceControllerVersion>10.0.0-preview.4.25211.19</SystemServiceProcessServiceControllerVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.4.25215.12</MicrosoftNETCoreAppRefPackageVersion>
+    <VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.4.25215.12</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-preview.4.25215.12</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-preview.4.25215.12</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftNETHostModelVersion>10.0.0-preview.4.25215.12</MicrosoftNETHostModelVersion>
+    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.0-preview.4.25215.12</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-preview.4.25215.12</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>10.0.0-preview.4.25215.12</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingVersion>10.0.0-preview.4.25215.12</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.4.25215.12</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftExtensionsConfigurationIniVersion>10.0.0-preview.4.25215.12</MicrosoftExtensionsConfigurationIniVersion>
+    <SystemServiceProcessServiceControllerVersion>10.0.0-preview.4.25215.12</SystemServiceProcessServiceControllerVersion>
     <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.4.25211.19</MicrosoftNETCorePlatformsPackageVersion>
-    <VSRedistCommonNetCoreTargetingPackx64100PackageVersion>10.0.0-preview.4.25211.19</VSRedistCommonNetCoreTargetingPackx64100PackageVersion>
-    <MicrosoftNETCoreAppHostwinx64PackageVersion>10.0.0-preview.4.25211.19</MicrosoftNETCoreAppHostwinx64PackageVersion>
-    <MicrosoftBclAsyncInterfacesPackageVersion>10.0.0-preview.4.25211.19</MicrosoftBclAsyncInterfacesPackageVersion>
-    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>10.0.0-preview.4.25211.19</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
-    <MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.4.25211.19</MicrosoftWin32SystemEventsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.4.25215.12</MicrosoftNETCorePlatformsPackageVersion>
+    <VSRedistCommonNetCoreTargetingPackx64100PackageVersion>10.0.0-preview.4.25215.12</VSRedistCommonNetCoreTargetingPackx64100PackageVersion>
+    <MicrosoftNETCoreAppHostwinx64PackageVersion>10.0.0-preview.4.25215.12</MicrosoftNETCoreAppHostwinx64PackageVersion>
+    <MicrosoftBclAsyncInterfacesPackageVersion>10.0.0-preview.4.25215.12</MicrosoftBclAsyncInterfacesPackageVersion>
+    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>10.0.0-preview.4.25215.12</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
+    <MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.4.25215.12</MicrosoftWin32SystemEventsPackageVersion>
     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
-    <SystemCodeDomPackageVersion>10.0.0-preview.4.25211.19</SystemCodeDomPackageVersion>
-    <SystemCompositionAttributedModelPackageVersion>10.0.0-preview.4.25211.19</SystemCompositionAttributedModelPackageVersion>
-    <SystemCompositionConventionPackageVersion>10.0.0-preview.4.25211.19</SystemCompositionConventionPackageVersion>
-    <SystemCompositionHostingPackageVersion>10.0.0-preview.4.25211.19</SystemCompositionHostingPackageVersion>
-    <SystemCompositionRuntimePackageVersion>10.0.0-preview.4.25211.19</SystemCompositionRuntimePackageVersion>
-    <SystemCompositionTypedPartsPackageVersion>10.0.0-preview.4.25211.19</SystemCompositionTypedPartsPackageVersion>
-    <SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.4.25211.19</SystemConfigurationConfigurationManagerPackageVersion>
-    <SystemReflectionMetadataLoadContextVersion>10.0.0-preview.4.25211.19</SystemReflectionMetadataLoadContextVersion>
-    <SystemResourcesExtensionsPackageVersion>10.0.0-preview.4.25211.19</SystemResourcesExtensionsPackageVersion>
-    <SystemSecurityCryptographyPkcsPackageVersion>10.0.0-preview.4.25211.19</SystemSecurityCryptographyPkcsPackageVersion>
-    <SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0-preview.4.25211.19</SystemSecurityCryptographyProtectedDataPackageVersion>
-    <SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.4.25211.19</SystemSecurityCryptographyXmlPackageVersion>
-    <SystemSecurityPermissionsPackageVersion>10.0.0-preview.4.25211.19</SystemSecurityPermissionsPackageVersion>
-    <SystemTextEncodingCodePagesPackageVersion>10.0.0-preview.4.25211.19</SystemTextEncodingCodePagesPackageVersion>
-    <SystemTextJsonPackageVersion>10.0.0-preview.4.25211.19</SystemTextJsonPackageVersion>
-    <SystemWindowsExtensionsPackageVersion>10.0.0-preview.4.25211.19</SystemWindowsExtensionsPackageVersion>
-    <SystemIOHashingPackageVersion>10.0.0-preview.4.25211.19</SystemIOHashingPackageVersion>
-    <SystemFormatsAsn1Version>10.0.0-preview.4.25211.19</SystemFormatsAsn1Version>
+    <SystemCodeDomPackageVersion>10.0.0-preview.4.25215.12</SystemCodeDomPackageVersion>
+    <SystemCompositionAttributedModelPackageVersion>10.0.0-preview.4.25215.12</SystemCompositionAttributedModelPackageVersion>
+    <SystemCompositionConventionPackageVersion>10.0.0-preview.4.25215.12</SystemCompositionConventionPackageVersion>
+    <SystemCompositionHostingPackageVersion>10.0.0-preview.4.25215.12</SystemCompositionHostingPackageVersion>
+    <SystemCompositionRuntimePackageVersion>10.0.0-preview.4.25215.12</SystemCompositionRuntimePackageVersion>
+    <SystemCompositionTypedPartsPackageVersion>10.0.0-preview.4.25215.12</SystemCompositionTypedPartsPackageVersion>
+    <SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.4.25215.12</SystemConfigurationConfigurationManagerPackageVersion>
+    <SystemReflectionMetadataLoadContextVersion>10.0.0-preview.4.25215.12</SystemReflectionMetadataLoadContextVersion>
+    <SystemResourcesExtensionsPackageVersion>10.0.0-preview.4.25215.12</SystemResourcesExtensionsPackageVersion>
+    <SystemSecurityCryptographyPkcsPackageVersion>10.0.0-preview.4.25215.12</SystemSecurityCryptographyPkcsPackageVersion>
+    <SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0-preview.4.25215.12</SystemSecurityCryptographyProtectedDataPackageVersion>
+    <SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.4.25215.12</SystemSecurityCryptographyXmlPackageVersion>
+    <SystemSecurityPermissionsPackageVersion>10.0.0-preview.4.25215.12</SystemSecurityPermissionsPackageVersion>
+    <SystemTextEncodingCodePagesPackageVersion>10.0.0-preview.4.25215.12</SystemTextEncodingCodePagesPackageVersion>
+    <SystemTextJsonPackageVersion>10.0.0-preview.4.25215.12</SystemTextJsonPackageVersion>
+    <SystemWindowsExtensionsPackageVersion>10.0.0-preview.4.25215.12</SystemWindowsExtensionsPackageVersion>
+    <SystemIOHashingPackageVersion>10.0.0-preview.4.25215.12</SystemIOHashingPackageVersion>
+    <SystemFormatsAsn1Version>10.0.0-preview.4.25215.12</SystemFormatsAsn1Version>
     <!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
          Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
     <MicrosoftBclAsyncInterfacesToolsetPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesToolsetPackageVersion>
@@ -155,18 +155,18 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/nuget/nuget.client -->
-    <NuGetBuildTasksPackageVersion>6.14.0-preview.1.102</NuGetBuildTasksPackageVersion>
-    <NuGetBuildTasksConsolePackageVersion>6.14.0-preview.1.102</NuGetBuildTasksConsolePackageVersion>
-    <NuGetLocalizationPackageVersion>6.14.0-preview.1.102</NuGetLocalizationPackageVersion>
-    <NuGetBuildTasksPackPackageVersion>6.14.0-preview.1.102</NuGetBuildTasksPackPackageVersion>
-    <NuGetCommandLineXPlatPackageVersion>6.14.0-preview.1.102</NuGetCommandLineXPlatPackageVersion>
-    <NuGetProjectModelPackageVersion>6.14.0-preview.1.102</NuGetProjectModelPackageVersion>
-    <MicrosoftBuildNuGetSdkResolverPackageVersion>6.14.0-preview.1.102</MicrosoftBuildNuGetSdkResolverPackageVersion>
-    <NuGetCommonPackageVersion>6.14.0-preview.1.102</NuGetCommonPackageVersion>
-    <NuGetConfigurationPackageVersion>6.14.0-preview.1.102</NuGetConfigurationPackageVersion>
-    <NuGetFrameworksPackageVersion>6.14.0-preview.1.102</NuGetFrameworksPackageVersion>
-    <NuGetPackagingPackageVersion>6.14.0-preview.1.102</NuGetPackagingPackageVersion>
-    <NuGetVersioningPackageVersion>6.14.0-preview.1.102</NuGetVersioningPackageVersion>
+    <NuGetBuildTasksPackageVersion>6.15.0-preview.1.7</NuGetBuildTasksPackageVersion>
+    <NuGetBuildTasksConsolePackageVersion>6.15.0-preview.1.7</NuGetBuildTasksConsolePackageVersion>
+    <NuGetLocalizationPackageVersion>6.15.0-preview.1.7</NuGetLocalizationPackageVersion>
+    <NuGetBuildTasksPackPackageVersion>6.15.0-preview.1.7</NuGetBuildTasksPackPackageVersion>
+    <NuGetCommandLineXPlatPackageVersion>6.15.0-preview.1.7</NuGetCommandLineXPlatPackageVersion>
+    <NuGetProjectModelPackageVersion>6.15.0-preview.1.7</NuGetProjectModelPackageVersion>
+    <MicrosoftBuildNuGetSdkResolverPackageVersion>6.15.0-preview.1.7</MicrosoftBuildNuGetSdkResolverPackageVersion>
+    <NuGetCommonPackageVersion>6.15.0-preview.1.7</NuGetCommonPackageVersion>
+    <NuGetConfigurationPackageVersion>6.15.0-preview.1.7</NuGetConfigurationPackageVersion>
+    <NuGetFrameworksPackageVersion>6.15.0-preview.1.7</NuGetFrameworksPackageVersion>
+    <NuGetPackagingPackageVersion>6.15.0-preview.1.7</NuGetPackagingPackageVersion>
+    <NuGetVersioningPackageVersion>6.15.0-preview.1.7</NuGetVersioningPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/vstest -->
@@ -204,16 +204,16 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/templating -->
-    <MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-preview.4.25214.2</MicrosoftTemplateEngineAbstractionsPackageVersion>
-    <MicrosoftTemplateEngineEdgePackageVersion>10.0.100-preview.4.25214.2</MicrosoftTemplateEngineEdgePackageVersion>
-    <MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>10.0.100-preview.4.25214.2</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
-    <MicrosoftTemplateEngineUtilsPackageVersion>10.0.100-preview.4.25214.2</MicrosoftTemplateEngineUtilsPackageVersion>
-    <MicrosoftTemplateSearchCommonPackageVersion>10.0.100-preview.4.25214.2</MicrosoftTemplateSearchCommonPackageVersion>
+    <MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-preview.4.25214.8</MicrosoftTemplateEngineAbstractionsPackageVersion>
+    <MicrosoftTemplateEngineEdgePackageVersion>10.0.100-preview.4.25214.8</MicrosoftTemplateEngineEdgePackageVersion>
+    <MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>10.0.100-preview.4.25214.8</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
+    <MicrosoftTemplateEngineUtilsPackageVersion>10.0.100-preview.4.25214.8</MicrosoftTemplateEngineUtilsPackageVersion>
+    <MicrosoftTemplateSearchCommonPackageVersion>10.0.100-preview.4.25214.8</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>10.0.100-preview.4.25214.2</MicrosoftTemplateEngineMocksPackageVersion>
-    <MicrosoftTemplateEngineTestHelperPackageVersion>10.0.100-preview.4.25214.2</MicrosoftTemplateEngineTestHelperPackageVersion>
-    <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>10.0.100-preview.4.25214.2</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
-    <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>10.0.100-preview.4.25214.2</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>10.0.100-preview.4.25214.8</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineTestHelperPackageVersion>10.0.100-preview.4.25214.8</MicrosoftTemplateEngineTestHelperPackageVersion>
+    <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>10.0.100-preview.4.25214.8</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
+    <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>10.0.100-preview.4.25214.8</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
@@ -221,16 +221,16 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn -->
-    <MicrosoftNetCompilersToolsetVersion>5.0.0-1.25213.1</MicrosoftNetCompilersToolsetVersion>
-    <MicrosoftNetCompilersToolsetFrameworkPackageVersion>5.0.0-1.25213.1</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
-    <MicrosoftCodeAnalysisPackageVersion>5.0.0-1.25213.1</MicrosoftCodeAnalysisPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25213.1</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>5.0.0-1.25213.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
-    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25213.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25213.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25213.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25213.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
-    <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25213.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
+    <MicrosoftNetCompilersToolsetVersion>5.0.0-1.25214.5</MicrosoftNetCompilersToolsetVersion>
+    <MicrosoftNetCompilersToolsetFrameworkPackageVersion>5.0.0-1.25214.5</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
+    <MicrosoftCodeAnalysisPackageVersion>5.0.0-1.25214.5</MicrosoftCodeAnalysisPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25214.5</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>5.0.0-1.25214.5</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
+    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25214.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25214.5</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25214.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25214.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25214.5</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -291,12 +291,12 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sourcelink -->
-    <MicrosoftBuildTasksGitVersion>10.0.0-beta.25203.1</MicrosoftBuildTasksGitVersion>
-    <MicrosoftSourceLinkCommonVersion>10.0.0-beta.25203.1</MicrosoftSourceLinkCommonVersion>
-    <MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25203.1</MicrosoftSourceLinkAzureReposGitVersion>
-    <MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25203.1</MicrosoftSourceLinkGitHubVersion>
-    <MicrosoftSourceLinkGitLabVersion>10.0.0-beta.25203.1</MicrosoftSourceLinkGitLabVersion>
-    <MicrosoftSourceLinkBitbucketGitVersion>10.0.0-beta.25203.1</MicrosoftSourceLinkBitbucketGitVersion>
+    <MicrosoftBuildTasksGitVersion>10.0.0-beta.25214.2</MicrosoftBuildTasksGitVersion>
+    <MicrosoftSourceLinkCommonVersion>10.0.0-beta.25214.2</MicrosoftSourceLinkCommonVersion>
+    <MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25214.2</MicrosoftSourceLinkAzureReposGitVersion>
+    <MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25214.2</MicrosoftSourceLinkGitHubVersion>
+    <MicrosoftSourceLinkGitLabVersion>10.0.0-beta.25214.2</MicrosoftSourceLinkGitLabVersion>
+    <MicrosoftSourceLinkBitbucketGitVersion>10.0.0-beta.25214.2</MicrosoftSourceLinkBitbucketGitVersion>
   </PropertyGroup>
   <!-- Get .NET Framework reference assemblies from NuGet packages -->
   <PropertyGroup>
diff --git a/src/BlazorWasmSdk/Tool/Program.cs b/src/BlazorWasmSdk/Tool/Program.cs
index c4f497eef7e3..7b9d504df849 100644
--- a/src/BlazorWasmSdk/Tool/Program.cs
+++ b/src/BlazorWasmSdk/Tool/Program.cs
@@ -12,20 +12,20 @@ internal static class Program
     {
         public static int Main(string[] args)
         {
-            CliRootCommand rootCommand = new();
-            CliCommand brotli = new("brotli");
+            RootCommand rootCommand = new();
+            Command brotli = new("brotli");
 
-            CliOption<CompressionLevel> compressionLevelOption = new("-c")
+            Option<CompressionLevel> compressionLevelOption = new("-c")
             {
                 DefaultValueFactory = _ => CompressionLevel.SmallestSize,
                 Description = "System.IO.Compression.CompressionLevel for the Brotli compression algorithm.",
             };
-            CliOption<List<string>> sourcesOption = new("-s")
+            Option<List<string>> sourcesOption = new("-s")
             {
                 Description = "A list of files to compress.",
                 AllowMultipleArgumentsPerToken = false
             };
-            CliOption<List<string>> outputsOption = new("-o")
+            Option<List<string>> outputsOption = new("-o")
             {
                 Description = "The filenames to output the compressed file to.",
                 AllowMultipleArgumentsPerToken = false
diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatAnalyzersCommand.cs b/src/BuiltInTools/dotnet-format/Commands/FormatAnalyzersCommand.cs
index 1fc765d41cf5..c8da566ff3a9 100644
--- a/src/BuiltInTools/dotnet-format/Commands/FormatAnalyzersCommand.cs
+++ b/src/BuiltInTools/dotnet-format/Commands/FormatAnalyzersCommand.cs
@@ -12,9 +12,9 @@ internal static class FormatAnalyzersCommand
     {
         private static readonly FormatAnalyzersHandler s_analyzerHandler = new();
 
-        internal static CliCommand GetCommand()
+        internal static Command GetCommand()
         {
-            var command = new CliCommand("analyzers", Resources.Run_3rd_party_analyzers__and_apply_fixes)
+            var command = new Command("analyzers", Resources.Run_3rd_party_analyzers__and_apply_fixes)
             {
                 DiagnosticsOption,
                 ExcludeDiagnosticsOption,
@@ -25,7 +25,7 @@ internal static CliCommand GetCommand()
             return command;
         }
 
-        private class FormatAnalyzersHandler : AsynchronousCliAction
+        private class FormatAnalyzersHandler : AsynchronousCommandLineAction
         {
             public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken)
             {
diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs b/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs
index 48acb26267d4..63e764517474 100644
--- a/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs
+++ b/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs
@@ -19,67 +19,67 @@ internal static class FormatCommandCommon
         private static string[] VerbosityLevels => new[] { "q", "quiet", "m", "minimal", "n", "normal", "d", "detailed", "diag", "diagnostic" };
         private static string[] SeverityLevels => new[] { "info", "warn", "error" };
 
-        public static readonly CliArgument<string> SlnOrProjectArgument = new CliArgument<string>(Resources.SolutionOrProjectArgumentName)
+        public static readonly Argument<string> SlnOrProjectArgument = new Argument<string>(Resources.SolutionOrProjectArgumentName)
         {
             Description = Resources.SolutionOrProjectArgumentDescription,
             Arity = ArgumentArity.ZeroOrOne
         }.DefaultToCurrentDirectory();
 
-        internal static readonly CliOption<bool> FolderOption = new("--folder")
+        internal static readonly Option<bool> FolderOption = new("--folder")
         {
             Description = Resources.Whether_to_treat_the_workspace_argument_as_a_simple_folder_of_files,
         };
-        internal static readonly CliOption<bool> NoRestoreOption = new("--no-restore")
+        internal static readonly Option<bool> NoRestoreOption = new("--no-restore")
         {
             Description = Resources.Doesnt_execute_an_implicit_restore_before_formatting,
         };
-        internal static readonly CliOption<bool> VerifyNoChanges = new("--verify-no-changes")
+        internal static readonly Option<bool> VerifyNoChanges = new("--verify-no-changes")
         {
             Description = Resources.Verify_no_formatting_changes_would_be_performed_Terminates_with_a_non_zero_exit_code_if_any_files_would_have_been_formatted,
         };
-        internal static readonly CliOption<string[]> DiagnosticsOption = new("--diagnostics")
+        internal static readonly Option<string[]> DiagnosticsOption = new("--diagnostics")
         {
             AllowMultipleArgumentsPerToken = true,
             DefaultValueFactory = _ => Array.Empty<string>(),
             Description = Resources.A_space_separated_list_of_diagnostic_ids_to_use_as_a_filter_when_fixing_code_style_or_3rd_party_issues,
         };
-        internal static readonly CliOption<string[]> ExcludeDiagnosticsOption = new("--exclude-diagnostics")
+        internal static readonly Option<string[]> ExcludeDiagnosticsOption = new("--exclude-diagnostics")
         {
             AllowMultipleArgumentsPerToken = true,
             DefaultValueFactory = _ => Array.Empty<string>(),
             Description = Resources.A_space_separated_list_of_diagnostic_ids_to_ignore_when_fixing_code_style_or_3rd_party_issues,
         };
-        internal static readonly CliOption<string> SeverityOption = new CliOption<string>("--severity")
+        internal static readonly Option<string> SeverityOption = new Option<string>("--severity")
         {
             Description = Resources.The_severity_of_diagnostics_to_fix_Allowed_values_are_info_warn_and_error,
         };
-        internal static readonly CliOption<string[]> IncludeOption = new("--include")
+        internal static readonly Option<string[]> IncludeOption = new("--include")
         {
             AllowMultipleArgumentsPerToken = true,
             DefaultValueFactory = _ => Array.Empty<string>(),
             Description = Resources.A_list_of_relative_file_or_folder_paths_to_include_in_formatting_All_files_are_formatted_if_empty,
         };
-        internal static readonly CliOption<string[]> ExcludeOption = new("--exclude")
+        internal static readonly Option<string[]> ExcludeOption = new("--exclude")
         {
             AllowMultipleArgumentsPerToken = true,
             DefaultValueFactory = _ => Array.Empty<string>(),
             Description = Resources.A_list_of_relative_file_or_folder_paths_to_exclude_from_formatting,
         };
-        internal static readonly CliOption<bool> IncludeGeneratedOption = new("--include-generated")
+        internal static readonly Option<bool> IncludeGeneratedOption = new("--include-generated")
         {
             Description = Resources.Format_files_generated_by_the_SDK,
         };
-        internal static readonly CliOption<string> VerbosityOption = new CliOption<string>("--verbosity", "-v")
+        internal static readonly Option<string> VerbosityOption = new Option<string>("--verbosity", "-v")
         {
             Description = Resources.Set_the_verbosity_level_Allowed_values_are_quiet_minimal_normal_detailed_and_diagnostic,
         };
-        internal static readonly CliOption<string> BinarylogOption = new CliOption<string>("--binarylog")
+        internal static readonly Option<string> BinarylogOption = new Option<string>("--binarylog")
         {
             HelpName = "binary-log-path",
             Arity = ArgumentArity.ZeroOrOne,
             Description = Resources.Log_all_project_or_solution_load_information_to_a_binary_log_file,
         };
-        internal static readonly CliOption<string> ReportOption = new CliOption<string>("--report")
+        internal static readonly Option<string> ReportOption = new Option<string>("--report")
         {
             HelpName = "report-path",
             Arity = ArgumentArity.ZeroOrOne,
@@ -118,7 +118,7 @@ internal static async Task<int> FormatAsync(FormatOptions formatOptions, ILogger
             return formatResult.GetExitCode(formatOptions.ChangesAreErrors);
         }
 
-        public static void AddCommonOptions(this CliCommand command)
+        public static void AddCommonOptions(this Command command)
         {
             command.Arguments.Add(SlnOrProjectArgument);
             command.Options.Add(NoRestoreOption);
@@ -131,7 +131,7 @@ public static void AddCommonOptions(this CliCommand command)
             command.Options.Add(ReportOption);
         }
 
-        public static CliArgument<string> DefaultToCurrentDirectory(this CliArgument<string> arg)
+        public static Argument<string> DefaultToCurrentDirectory(this Argument<string> arg)
         {
             arg.DefaultValueFactory = _ => EnsureTrailingSlash(Directory.GetCurrentDirectory());
             return arg;
diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatStyleCommand.cs b/src/BuiltInTools/dotnet-format/Commands/FormatStyleCommand.cs
index 12d96959c6bc..bd33b2708e83 100644
--- a/src/BuiltInTools/dotnet-format/Commands/FormatStyleCommand.cs
+++ b/src/BuiltInTools/dotnet-format/Commands/FormatStyleCommand.cs
@@ -12,9 +12,9 @@ internal static class FormatStyleCommand
     {
         private static readonly FormatStyleHandler s_styleHandler = new();
 
-        internal static CliCommand GetCommand()
+        internal static Command GetCommand()
         {
-            var command = new CliCommand("style", Resources.Run_code_style_analyzers_and_apply_fixes)
+            var command = new Command("style", Resources.Run_code_style_analyzers_and_apply_fixes)
             {
                 DiagnosticsOption,
                 ExcludeDiagnosticsOption,
@@ -25,7 +25,7 @@ internal static CliCommand GetCommand()
             return command;
         }
 
-        private class FormatStyleHandler : AsynchronousCliAction
+        private class FormatStyleHandler : AsynchronousCommandLineAction
         {
             public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken)
             {
diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatWhitespaceCommand.cs b/src/BuiltInTools/dotnet-format/Commands/FormatWhitespaceCommand.cs
index 0885f96f284d..b5179f379ef1 100644
--- a/src/BuiltInTools/dotnet-format/Commands/FormatWhitespaceCommand.cs
+++ b/src/BuiltInTools/dotnet-format/Commands/FormatWhitespaceCommand.cs
@@ -12,9 +12,9 @@ internal static class FormatWhitespaceCommand
     {
         private static readonly FormatWhitespaceHandler s_formattingHandler = new();
 
-        internal static CliCommand GetCommand()
+        internal static Command GetCommand()
         {
-            var command = new CliCommand("whitespace", Resources.Run_whitespace_formatting)
+            var command = new Command("whitespace", Resources.Run_whitespace_formatting)
             {
                 FolderOption
             };
@@ -45,7 +45,7 @@ internal static void EnsureFolderNotSpecifiedWhenLoggingBinlog(CommandResult sym
             }
         }
 
-        private class FormatWhitespaceHandler : AsynchronousCliAction
+        private class FormatWhitespaceHandler : AsynchronousCommandLineAction
         {
             public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken)
             {
diff --git a/src/BuiltInTools/dotnet-format/Commands/RootFormatCommand.cs b/src/BuiltInTools/dotnet-format/Commands/RootFormatCommand.cs
index 66d036f85c2b..050c12622402 100644
--- a/src/BuiltInTools/dotnet-format/Commands/RootFormatCommand.cs
+++ b/src/BuiltInTools/dotnet-format/Commands/RootFormatCommand.cs
@@ -12,9 +12,9 @@ internal static class RootFormatCommand
     {
         private static readonly FormatCommandDefaultHandler s_formatCommandHandler = new();
 
-        public static CliRootCommand GetCommand()
+        public static RootCommand GetCommand()
         {
-            var formatCommand = new CliRootCommand(Resources.Formats_code_to_match_editorconfig_settings)
+            var formatCommand = new RootCommand(Resources.Formats_code_to_match_editorconfig_settings)
             {
                 FormatWhitespaceCommand.GetCommand(),
                 FormatStyleCommand.GetCommand(),
@@ -28,7 +28,7 @@ public static CliRootCommand GetCommand()
             return formatCommand;
         }
 
-        private class FormatCommandDefaultHandler : AsynchronousCliAction
+        private class FormatCommandDefaultHandler : AsynchronousCommandLineAction
         {
             public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken)
             {
diff --git a/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs b/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs
index e193514a1269..d31633af7d91 100644
--- a/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs
+++ b/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs
@@ -31,15 +31,15 @@ internal sealed class CommandLineOptions
     public string Command => ExplicitCommand ?? DefaultCommand;
 
     // this option is referenced from inner logic and so needs to be reference-able
-    public static CliOption<bool> NonInteractiveOption = new CliOption<bool>("--non-interactive") { Description = Resources.Help_NonInteractive, Arity = ArgumentArity.Zero };
+    public static Option<bool> NonInteractiveOption = new Option<bool>("--non-interactive") { Description = Resources.Help_NonInteractive, Arity = ArgumentArity.Zero };
 
     public static CommandLineOptions? Parse(IReadOnlyList<string> args, IReporter reporter, TextWriter output, out int errorCode)
     {
         // dotnet watch specific options:
-        var quietOption = new CliOption<bool>("--quiet", "-q") { Description = Resources.Help_Quiet, Arity = ArgumentArity.Zero };
-        var verboseOption = new CliOption<bool>("--verbose") { Description = Resources.Help_Verbose, Arity = ArgumentArity.Zero };
-        var listOption = new CliOption<bool>("--list") { Description = Resources.Help_List, Arity = ArgumentArity.Zero };
-        var noHotReloadOption = new CliOption<bool>("--no-hot-reload") { Description = Resources.Help_NoHotReload, Arity = ArgumentArity.Zero };
+        var quietOption = new Option<bool>("--quiet", "-q") { Description = Resources.Help_Quiet, Arity = ArgumentArity.Zero };
+        var verboseOption = new Option<bool>("--verbose") { Description = Resources.Help_Verbose, Arity = ArgumentArity.Zero };
+        var listOption = new Option<bool>("--list") { Description = Resources.Help_List, Arity = ArgumentArity.Zero };
+        var noHotReloadOption = new Option<bool>("--no-hot-reload") { Description = Resources.Help_NoHotReload, Arity = ArgumentArity.Zero };
 
         verboseOption.Validators.Add(v =>
         {
@@ -49,7 +49,7 @@ internal sealed class CommandLineOptions
             }
         });
 
-        CliOption[] watchOptions =
+        Option[] watchOptions =
         [
             quietOption,
             verboseOption,
@@ -59,12 +59,12 @@ internal sealed class CommandLineOptions
         ];
 
         // Options we need to know about that are passed through to the subcommand:
-        var shortProjectOption = new CliOption<string>("-p") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false };
-        var longProjectOption = new CliOption<string>("--project") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false };
-        var launchProfileOption = new CliOption<string>("--launch-profile", "-lp") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false };
-        var noLaunchProfileOption = new CliOption<bool>("--no-launch-profile") { Hidden = true, Arity = ArgumentArity.Zero };
+        var shortProjectOption = new Option<string>("-p") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false };
+        var longProjectOption = new Option<string>("--project") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false };
+        var launchProfileOption = new Option<string>("--launch-profile", "-lp") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false };
+        var noLaunchProfileOption = new Option<bool>("--no-launch-profile") { Hidden = true, Arity = ArgumentArity.Zero };
 
-        var rootCommand = new CliRootCommand(Resources.Help)
+        var rootCommand = new RootCommand(Resources.Help)
         {
             Directives = { new EnvironmentVariablesDirective() },
         };
@@ -90,7 +90,7 @@ internal sealed class CommandLineOptions
         var rootCommandInvoked = false;
         rootCommand.SetAction(parseResult => rootCommandInvoked = true);
 
-        var cliConfig = new CliConfiguration(rootCommand)
+        var cliConfig = new CommandLineConfiguration(rootCommand)
         {
             Output = output,
             Error = output,
@@ -148,7 +148,7 @@ internal sealed class CommandLineOptions
 
         // We assume that forwarded options, if any, are intended for dotnet build.
         var buildArguments = buildOptions.Select(option => ((IForwardedOption)option).GetForwardingFunction()(parseResult)).SelectMany(args => args).ToArray();
-        var targetFrameworkOption = (CliOption<string>?)buildOptions.SingleOrDefault(option => option.Name == "--framework");
+        var targetFrameworkOption = (Option<string>?)buildOptions.SingleOrDefault(option => option.Name == "--framework");
 
         return new()
         {
@@ -174,8 +174,8 @@ internal sealed class CommandLineOptions
 
     private static IReadOnlyList<string> GetCommandArguments(
         ParseResult parseResult,
-        IReadOnlyList<CliOption> watchOptions,
-        CliCommand? explicitCommand)
+        IReadOnlyList<Option> watchOptions,
+        Command? explicitCommand)
     {
         var arguments = new List<string>();
 
@@ -251,7 +251,7 @@ private static IReadOnlyList<string> GetCommandArguments(
         return arguments;
     }
 
-    private static CliCommand? TryGetSubcommand(ParseResult parseResult)
+    private static Command? TryGetSubcommand(ParseResult parseResult)
     {
         // Assuming that all tokens after "--" are unmatched:
         var dashDashIndex = IndexOf(parseResult.Tokens, t => t.Value == "--");
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/ChoiceTemplateParameter.cs b/src/Cli/Microsoft.TemplateEngine.Cli/ChoiceTemplateParameter.cs
index 9114f923d212..0246160fc869 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/ChoiceTemplateParameter.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/ChoiceTemplateParameter.cs
@@ -68,11 +68,11 @@ internal ChoiceTemplateParameter(ChoiceTemplateParameter choiceTemplateParameter
             };
         }
 
-        protected override CliOption GetBaseOption(IReadOnlySet<string> aliases)
+        protected override Option GetBaseOption(IReadOnlySet<string> aliases)
         {
             string name = GetName(aliases);
 
-            CliOption<string> option = new(name)
+            Option<string> option = new(name)
             {
                 CustomParser = result => GetParseChoiceArgument(this)(result),
                 Arity = new ArgumentArity(DefaultIfOptionWithoutValue == null ? 1 : 0, AllowMultipleValues ? _choices.Count : 1),
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateParameter.cs b/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateParameter.cs
index c528f549c72c..59aa48581d4f 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateParameter.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateParameter.cs
@@ -134,12 +134,12 @@ internal CliTemplateParameter(CliTemplateParameter other)
         protected bool AllowMultipleValues { get; private init; }
 
         /// <summary>
-        /// Creates <see cref="CliOption"/> for template parameter.
+        /// Creates <see cref="Option"/> for template parameter.
         /// </summary>
         /// <param name="aliases">aliases to be used for option.</param>
-        internal CliOption GetOption(IReadOnlySet<string> aliases)
+        internal Option GetOption(IReadOnlySet<string> aliases)
         {
-            CliOption option = GetBaseOption(aliases);
+            Option option = GetBaseOption(aliases);
             option.Hidden = IsHidden;
 
             //if parameter is required, the default value is ignored.
@@ -151,13 +151,13 @@ internal CliOption GetOption(IReadOnlySet<string> aliases)
                 {
                     switch (option)
                     {
-                        case CliOption<string> stringOption:
+                        case Option<string> stringOption:
                             stringOption.DefaultValueFactory = (_) => DefaultValue;
                             break;
-                        case CliOption<bool> booleanOption:
+                        case Option<bool> booleanOption:
                             booleanOption.DefaultValueFactory = (_) => bool.Parse(DefaultValue);
                             break;
-                        case CliOption<long> integerOption:
+                        case Option<long> integerOption:
                             if (Type == ParameterType.Hex)
                             {
                                 integerOption.DefaultValueFactory = (_) => Convert.ToInt64(DefaultValue, 16);
@@ -167,10 +167,10 @@ internal CliOption GetOption(IReadOnlySet<string> aliases)
                                 integerOption.DefaultValueFactory = (_) => long.Parse(DefaultValue);
                             }
                             break;
-                        case CliOption<float> floatOption:
+                        case Option<float> floatOption:
                             floatOption.DefaultValueFactory = (_) => float.Parse(DefaultValue);
                             break;
-                        case CliOption<double> doubleOption:
+                        case Option<double> doubleOption:
                             doubleOption.DefaultValueFactory = (_) => double.Parse(DefaultValue);
                             break;
                         default:
@@ -203,31 +203,31 @@ internal CliOption GetOption(IReadOnlySet<string> aliases)
             };
         }
 
-        protected virtual CliOption GetBaseOption(IReadOnlySet<string> aliases)
+        protected virtual Option GetBaseOption(IReadOnlySet<string> aliases)
         {
             string name = GetName(aliases);
-            CliOption cliOption = Type switch
+            Option cliOption = Type switch
             {
-                ParameterType.Boolean => new CliOption<bool>(name)
+                ParameterType.Boolean => new Option<bool>(name)
                 {
                     Arity = new ArgumentArity(0, 1)
                 },
-                ParameterType.Integer => new CliOption<long>(name)
+                ParameterType.Integer => new Option<long>(name)
                 {
                     CustomParser = result => GetParseArgument(this, ConvertValueToInt)(result),
                     Arity = new ArgumentArity(string.IsNullOrWhiteSpace(DefaultIfOptionWithoutValue) ? 1 : 0, 1)
                 },
-                ParameterType.String => new CliOption<string>(name)
+                ParameterType.String => new Option<string>(name)
                 {
                     CustomParser = result => GetParseArgument(this, ConvertValueToString)(result),
                     Arity = new ArgumentArity(DefaultIfOptionWithoutValue == null ? 1 : 0, 1)
                 },
-                ParameterType.Float => new CliOption<double>(name)
+                ParameterType.Float => new Option<double>(name)
                 {
                     CustomParser = result => GetParseArgument(this, ConvertValueToFloat)(result),
                     Arity = new ArgumentArity(string.IsNullOrWhiteSpace(DefaultIfOptionWithoutValue) ? 1 : 0, 1)
                 },
-                ParameterType.Hex => new CliOption<long>(name)
+                ParameterType.Hex => new Option<long>(name)
                 {
                     CustomParser = result => GetParseArgument(this, ConvertValueToHex)(result),
                     Arity = new ArgumentArity(string.IsNullOrWhiteSpace(DefaultIfOptionWithoutValue) ? 1 : 0, 1)
@@ -271,7 +271,7 @@ static int GetPrefixLength(string alias)
             }
         }
 
-        protected void AddAliases(CliOption option, IReadOnlySet<string> aliases)
+        protected void AddAliases(Option option, IReadOnlySet<string> aliases)
         {
             foreach (string alias in aliases)
             {
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/BaseCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/BaseCommand.cs
index 1eafc78d68c0..3d9db345fd6d 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/BaseCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/BaseCommand.cs
@@ -13,10 +13,11 @@
 using Microsoft.TemplateEngine.Edge;
 using Microsoft.TemplateEngine.Edge.Settings;
 using Microsoft.TemplateEngine.Utils;
+using Command = System.CommandLine.Command;
 
 namespace Microsoft.TemplateEngine.Cli.Commands
 {
-    internal abstract class BaseCommand : CliCommand
+    internal abstract class BaseCommand : Command
     {
         private readonly Func<ParseResult, ITemplateEngineHost> _hostBuilder;
 
@@ -97,9 +98,9 @@ protected internal static async Task CheckTemplatesWithSubCommandName(
             Reporter.Output.WriteLine();
         }
 
-        protected static void PrintDeprecationMessage<TDepr, TNew>(ParseResult parseResult, CliOption? additionalOption = null)
-            where TDepr : CliCommand
-            where TNew : CliCommand
+        protected static void PrintDeprecationMessage<TDepr, TNew>(ParseResult parseResult, Option? additionalOption = null)
+            where TDepr : Command
+            where TNew : Command
         {
             var newCommandExample = Example.For<TNew>(parseResult);
             if (additionalOption != null)
@@ -121,17 +122,17 @@ protected static void PrintDeprecationMessage<TDepr, TNew>(ParseResult parseResu
 
         protected abstract TArgs ParseContext(ParseResult parseResult);
 
-        protected virtual CliOption GetFilterOption(FilterOptionDefinition def)
+        protected virtual Option GetFilterOption(FilterOptionDefinition def)
         {
             return def.OptionFactory();
         }
 
-        protected IReadOnlyDictionary<FilterOptionDefinition, CliOption> SetupFilterOptions(IReadOnlyList<FilterOptionDefinition> filtersToSetup)
+        protected IReadOnlyDictionary<FilterOptionDefinition, Option> SetupFilterOptions(IReadOnlyList<FilterOptionDefinition> filtersToSetup)
         {
-            Dictionary<FilterOptionDefinition, CliOption> options = new();
+            Dictionary<FilterOptionDefinition, Option> options = new();
             foreach (FilterOptionDefinition filterDef in filtersToSetup)
             {
-                CliOption newOption = GetFilterOption(filterDef);
+                Option newOption = GetFilterOption(filterDef);
                 Options.Add(newOption);
                 options[filterDef] = newOption;
             }
@@ -221,7 +222,7 @@ private static void HandleDebugShowConfig(TArgs args, IEngineEnvironmentSettings
             Reporter.Output.WriteLine();
         }
 
-        private sealed class CommandAction : AsynchronousCliAction
+        private sealed class CommandAction : AsynchronousCommandLineAction
         {
             private readonly BaseCommand<TArgs> _command;
 
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/CommandLineUtils.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/CommandLineUtils.cs
index 82315d97fdb1..150fb896a520 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/CommandLineUtils.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/CommandLineUtils.cs
@@ -9,7 +9,7 @@ internal class CommandLineUtils
     {
         // This code is from System.CommandLine, HelpBuilder class.
         // Ideally those methods are exposed, we may switch to use them.
-        internal static string FormatArgumentUsage(IReadOnlyList<CliArgument> arguments)
+        internal static string FormatArgumentUsage(IReadOnlyList<Argument> arguments)
         {
             var sb = new StringBuilder();
             var end = default(Stack<char>);
@@ -56,20 +56,20 @@ internal static string FormatArgumentUsage(IReadOnlyList<CliArgument> arguments)
             }
 
             return sb.ToString();
-            bool IsMultiParented(CliArgument argument) =>
+            bool IsMultiParented(Argument argument) =>
                 argument.Parents.Count() > 1;
 
-            bool IsOptional(CliArgument argument) =>
+            bool IsOptional(Argument argument) =>
                 IsMultiParented(argument) ||
                 argument.Arity.MinimumNumberOfValues == 0;
         }
 
-        internal static string FormatArgumentUsage(CliArgument argument) => FormatArgumentUsage(new[] { argument });
+        internal static string FormatArgumentUsage(Argument argument) => FormatArgumentUsage(new[] { argument });
 
-        internal static string FormatArgumentUsage(CliOption option) => FormatArgumentUsage(new[] { option });
+        internal static string FormatArgumentUsage(Option option) => FormatArgumentUsage(new[] { option });
 
         // separate instance as Option.Argument is internal.
-        internal static string FormatArgumentUsage(IReadOnlyList<CliOption> options)
+        internal static string FormatArgumentUsage(IReadOnlyList<Option> options)
         {
             var sb = new StringBuilder();
             var end = default(Stack<char>);
@@ -116,10 +116,10 @@ internal static string FormatArgumentUsage(IReadOnlyList<CliOption> options)
             }
 
             return sb.ToString();
-            bool IsMultiParented(CliOption option) =>
+            bool IsMultiParented(Option option) =>
                 option.Parents.Count() > 1;
 
-            bool IsOptional(CliOption option) =>
+            bool IsOptional(Option option) =>
                 IsMultiParented(option) ||
                 option.Arity.MinimumNumberOfValues == 0;
         }
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/Example.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/Example.cs
index a1a273cf7603..9ee48e0ccdd0 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/Example.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/Example.cs
@@ -9,9 +9,9 @@ namespace Microsoft.TemplateEngine.Cli.Commands
     internal class Example
     {
         private List<string> _commandParts = new();
-        private CliCommand _currentCommand;
+        private Command _currentCommand;
 
-        private Example(CliCommand currentCommand, params string[] commandParts)
+        private Example(Command currentCommand, params string[] commandParts)
         {
             _commandParts.AddRange(commandParts);
             _currentCommand = currentCommand;
@@ -24,7 +24,7 @@ public override string ToString()
             return string.Join(" ", _commandParts);
         }
 
-        internal static Example For<T>(ParseResult parseResult) where T : CliCommand
+        internal static Example For<T>(ParseResult parseResult) where T : Command
         {
             var commandResult = parseResult.CommandResult;
 
@@ -47,13 +47,13 @@ internal static Example For<T>(ParseResult parseResult) where T : CliCommand
             }
 
             // if the command is not found in parents of command result, try to search it in the whole command tree
-            CliCommand siblingCommand = SearchForSiblingCommand<T>(parseResult.CommandResult.Command);
+            Command siblingCommand = SearchForSiblingCommand<T>(parseResult.CommandResult.Command);
             List<string> parentCommands2 = new();
-            CliCommand? nextCommand = siblingCommand;
+            Command? nextCommand = siblingCommand;
             while (nextCommand != null)
             {
                 parentCommands2.Add(nextCommand.Name);
-                nextCommand = nextCommand.Parents.OfType<CliCommand>().FirstOrDefault();
+                nextCommand = nextCommand.Parents.OfType<Command>().FirstOrDefault();
             }
             parentCommands2.Reverse();
             return new Example(siblingCommand, parentCommands2.ToArray());
@@ -66,7 +66,7 @@ internal static Example FromExistingTokens(ParseResult parseResult)
             return new Example(parseResult.CommandResult.Command, commandParts.ToArray());
         }
 
-        internal Example WithOption(CliOption option, params string[] args)
+        internal Example WithOption(Option option, params string[] args)
         {
             if (!_currentCommand.Options.Contains(option) && !_currentCommand.Options.Any(o => o.Name == option.Name))
             {
@@ -88,7 +88,7 @@ internal Example WithOption(CliOption option, params string[] args)
             return this;
         }
 
-        internal Example WithArgument(CliArgument argument, params string[] args)
+        internal Example WithArgument(Argument argument, params string[] args)
         {
             if (!_currentCommand.Arguments.Contains(argument))
             {
@@ -104,7 +104,7 @@ internal Example WithArgument(CliArgument argument, params string[] args)
             return this;
         }
 
-        internal Example WithSubcommand(CliCommand command)
+        internal Example WithSubcommand(Command command)
         {
             if (!_currentCommand.Subcommands.Contains(command))
             {
@@ -118,7 +118,7 @@ internal Example WithSubcommand(CliCommand command)
 
         internal Example WithSubcommand(string token)
         {
-            CliCommand? commandToUse = _currentCommand.Subcommands.FirstOrDefault(c => c.Name.Equals(token) || c.Aliases.Contains(token));
+            Command? commandToUse = _currentCommand.Subcommands.FirstOrDefault(c => c.Name.Equals(token) || c.Aliases.Contains(token));
 
             if (commandToUse is null)
             {
@@ -130,7 +130,7 @@ internal Example WithSubcommand(string token)
             return this;
         }
 
-        internal Example WithSubcommand<T>() where T : CliCommand
+        internal Example WithSubcommand<T>() where T : Command
         {
             if (!_currentCommand.Subcommands.Any(c => c is T))
             {
@@ -148,22 +148,22 @@ internal Example WithHelpOption()
             return this;
         }
 
-        private static T SearchForSiblingCommand<T>(CliCommand currentCommand) where T : CliCommand
+        private static T SearchForSiblingCommand<T>(Command currentCommand) where T : Command
         {
-            CliCommand? next = currentCommand;
-            CliCommand root = currentCommand;
+            Command? next = currentCommand;
+            Command root = currentCommand;
 
             while (next != null)
             {
                 root = next;
-                next = next?.Parents.OfType<CliCommand>().FirstOrDefault();
+                next = next?.Parents.OfType<Command>().FirstOrDefault();
             }
 
-            Queue<CliCommand> probes = new();
+            Queue<Command> probes = new();
             probes.Enqueue(root);
             while (probes.Count > 0)
             {
-                CliCommand current = probes.Dequeue();
+                Command current = probes.Dequeue();
                 if (current is T typedCommand)
                 {
                     return typedCommand;
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/Extensions.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/Extensions.cs
index 3537635e573f..c535d2a218e7 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/Extensions.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/Extensions.cs
@@ -12,7 +12,7 @@ namespace Microsoft.TemplateEngine.Cli.Commands
 {
     internal static class Extensions
     {
-        internal static string? GetValueForOptionOrNull(this ParseResult parseResult, CliOption option)
+        internal static string? GetValueForOptionOrNull(this ParseResult parseResult, Option option)
         {
             OptionResult? result = parseResult.GetResult(option);
             if (result == null)
@@ -25,21 +25,21 @@ internal static class Extensions
         /// <summary>
         /// Checks if <paramref name="parseResult"/> contains an error for <paramref name="option"/>.
         /// </summary>
-        internal static bool HasErrorFor(this ParseResult parseResult, CliOption option, [NotNullWhen(true)] out ParseError? error)
+        internal static bool HasErrorFor(this ParseResult parseResult, Option option, [NotNullWhen(true)] out ParseError? error)
         {
             error = parseResult.Errors.FirstOrDefault(e => IsOptionResult(e.SymbolResult, option)
                 || IsOptionResult(e.SymbolResult?.Parent, option));
 
             return error is not null;
 
-            static bool IsOptionResult(SymbolResult? symbolResult, CliOption option)
+            static bool IsOptionResult(SymbolResult? symbolResult, Option option)
                 => symbolResult is OptionResult optionResult && optionResult.Option == option;
         }
 
         /// <summary>
-        /// Case insensitive version for <see cref="System.CommandLine.CliOption{TOption}.AcceptOnlyFromAmong(string[])"/>.
+        /// Case insensitive version for <see cref="System.CommandLine.Option{TOption}.AcceptOnlyFromAmong(string[])"/>.
         /// </summary>
-        internal static void FromAmongCaseInsensitive(this CliOption<string> option, string[]? allowedValues = null, string? allowedHiddenValue = null)
+        internal static void FromAmongCaseInsensitive(this Option<string> option, string[]? allowedValues = null, string? allowedHiddenValue = null)
         {
             allowedValues ??= Array.Empty<string>();
             option.Validators.Add(optionResult => ValidateAllowedValues(optionResult, allowedValues, allowedHiddenValue));
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/FilterOptionDefinition.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/FilterOptionDefinition.cs
index cea685b5ac1b..ef5725f870cf 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/FilterOptionDefinition.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/FilterOptionDefinition.cs
@@ -16,7 +16,7 @@ namespace Microsoft.TemplateEngine.Cli.Commands
     /// </summary>
     internal class FilterOptionDefinition
     {
-        internal FilterOptionDefinition(Func<CliOption> optionFactory)
+        internal FilterOptionDefinition(Func<Option> optionFactory)
         {
             OptionFactory = optionFactory ?? throw new ArgumentNullException(nameof(optionFactory));
         }
@@ -64,7 +64,7 @@ internal FilterOptionDefinition(Func<CliOption> optionFactory)
         /// <summary>
         /// A predicate that creates instance of option.
         /// </summary>
-        internal Func<CliOption> OptionFactory { get; }
+        internal Func<Option> OptionFactory { get; }
 
         private static Func<ITemplatePackageInfo, bool> PackageMatchFilter(string? packageArg)
         {
@@ -85,7 +85,7 @@ private static Func<ITemplatePackageInfo, bool> PackageMatchFilter(string? packa
     internal class TemplateFilterOptionDefinition : FilterOptionDefinition
     {
         internal TemplateFilterOptionDefinition(
-            Func<CliOption> optionFactory,
+            Func<Option> optionFactory,
             Func<string?, Func<ITemplateInfo, MatchInfo?>> matchFilter,
             Func<TemplateResolutionResult, bool> mismatchCriteria,
             string matchInfoName) : base(optionFactory)
@@ -121,7 +121,7 @@ internal TemplateFilterOptionDefinition(
     internal class PackageFilterOptionDefinition : FilterOptionDefinition
     {
         internal PackageFilterOptionDefinition(
-            Func<CliOption> optionFactory,
+            Func<Option> optionFactory,
             Func<string?, Func<ITemplatePackageInfo, bool>> matchFilter) : base(optionFactory)
         {
             PackageMatchFilter = matchFilter ?? throw new ArgumentNullException(nameof(matchFilter));
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/GlobalArgs.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/GlobalArgs.cs
index 4c4e5278a4aa..09b5e51ca77b 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/GlobalArgs.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/GlobalArgs.cs
@@ -31,7 +31,7 @@ protected GlobalArgs(GlobalArgs args) : this(args.Command, args.ParseResult) { }
 
         public ParseResult ParseResult { get; }
 
-        CliCommand ICommandArgs.Command => Command;
+        Command ICommandArgs.Command => Command;
 
         internal bool DebugAttach { get; private set; }
 
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ICommandArgs.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ICommandArgs.cs
index a807e6617b43..6d60b750a095 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ICommandArgs.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ICommandArgs.cs
@@ -14,9 +14,9 @@ internal interface ICommandArgs
         internal NewCommand RootCommand { get; }
 
         /// <summary>
-        /// Gets the executing <see cref="System.CommandLine.CliCommand"/>.
+        /// Gets the executing <see cref="System.CommandLine.Command"/>.
         /// </summary>
-        internal CliCommand Command { get; }
+        internal Command Command { get; }
 
         /// <summary>
         /// Gets the <see cref="System.CommandLine.ParseResult"/> for the command to be executed.
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ICommandDocument.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ICommandDocument.cs
index 2af15b6d0c20..dc11c8327f36 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ICommandDocument.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ICommandDocument.cs
@@ -6,7 +6,7 @@
 namespace Microsoft.TemplateEngine.Cli.Commands;
 
 /// <summary>
-/// If a <see cref="CliCommand"/> implements this interface, it can open
+/// If a <see cref="Command"/> implements this interface, it can open
 /// its documentation page online.
 /// </summary>
 public interface ICommandDocument
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ICustomHelp.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ICustomHelp.cs
index db32c6c644a3..cbecaba9149b 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ICustomHelp.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ICustomHelp.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.TemplateEngine.Cli.Commands
 {
     /// <summary>
-    /// If <see cref="CliCommand"/> implements this interface, it can create custom help
+    /// If <see cref="Command"/> implements this interface, it can create custom help
     /// that should be used when building the parser.
     /// </summary>
     public interface ICustomHelp
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/IFilterableCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/IFilterableCommand.cs
index 4f5788fecd48..a8a824e51dfd 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/IFilterableCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/IFilterableCommand.cs
@@ -7,6 +7,6 @@ namespace Microsoft.TemplateEngine.Cli.Commands
 {
     internal interface IFilterableCommand
     {
-        IReadOnlyDictionary<FilterOptionDefinition, CliOption> Filters { get; }
+        IReadOnlyDictionary<FilterOptionDefinition, Option> Filters { get; }
     }
 }
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ITabularOutputCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ITabularOutputCommand.cs
index 10609361542a..96e4057d8cac 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ITabularOutputCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ITabularOutputCommand.cs
@@ -7,9 +7,9 @@ namespace Microsoft.TemplateEngine.Cli.Commands
 {
     internal interface ITabularOutputCommand
     {
-        internal CliOption<bool> ColumnsAllOption { get; }
+        internal Option<bool> ColumnsAllOption { get; }
 
-        internal CliOption<string[]> ColumnsOption { get; }
+        internal Option<string[]> ColumnsOption { get; }
     }
 
     internal interface ITabularOutputArgs
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/NewCommand.Legacy.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/NewCommand.Legacy.cs
index 315bb73e4c1d..4470c1cd82e8 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/NewCommand.Legacy.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/NewCommand.Legacy.cs
@@ -19,7 +19,7 @@ internal partial class NewCommand : BaseCommand<NewCommandArgs>
             FilterOptionDefinition.PackageFilter
         };
 
-        internal IEnumerable<CliOption> LegacyOptions
+        internal IEnumerable<Option> LegacyOptions
         {
             get
             {
@@ -27,29 +27,29 @@ internal IEnumerable<CliOption> LegacyOptions
                 yield return AddSourceOption;
                 yield return ColumnsAllOption;
                 yield return ColumnsOption;
-                foreach (CliOption filter in LegacyFilters.Values)
+                foreach (Option filter in LegacyFilters.Values)
                 {
                     yield return filter;
                 }
             }
         }
 
-        internal CliOption<bool> InteractiveOption { get; } = SharedOptionsFactory.CreateInteractiveOption().AsHidden();
+        internal Option<bool> InteractiveOption { get; } = SharedOptionsFactory.CreateInteractiveOption().AsHidden();
 
-        internal CliOption<string[]> AddSourceOption { get; } = SharedOptionsFactory.CreateAddSourceOption().AsHidden().DisableAllowMultipleArgumentsPerToken();
+        internal Option<string[]> AddSourceOption { get; } = SharedOptionsFactory.CreateAddSourceOption().AsHidden().DisableAllowMultipleArgumentsPerToken();
 
-        internal CliOption<bool> ColumnsAllOption { get; } = SharedOptionsFactory.CreateColumnsAllOption().AsHidden();
+        internal Option<bool> ColumnsAllOption { get; } = SharedOptionsFactory.CreateColumnsAllOption().AsHidden();
 
-        internal CliOption<string[]> ColumnsOption { get; } = SharedOptionsFactory.CreateColumnsOption().AsHidden().DisableAllowMultipleArgumentsPerToken();
+        internal Option<string[]> ColumnsOption { get; } = SharedOptionsFactory.CreateColumnsOption().AsHidden().DisableAllowMultipleArgumentsPerToken();
 
-        internal IReadOnlyDictionary<FilterOptionDefinition, CliOption> LegacyFilters { get; private set; } = new Dictionary<FilterOptionDefinition, CliOption>();
+        internal IReadOnlyDictionary<FilterOptionDefinition, Option> LegacyFilters { get; private set; } = new Dictionary<FilterOptionDefinition, Option>();
 
-        internal void AddNoLegacyUsageValidators(CliCommand command, params CliSymbol[] except)
+        internal void AddNoLegacyUsageValidators(Command command, params Symbol[] except)
         {
-            IEnumerable<CliOption> optionsToVerify = LegacyFilters.Values.Concat(new CliOption[] { ColumnsAllOption, ColumnsOption, InteractiveOption, AddSourceOption });
-            IEnumerable<CliArgument> argumentsToVerify = new CliArgument[] { ShortNameArgument, RemainingArguments };
+            IEnumerable<Option> optionsToVerify = LegacyFilters.Values.Concat(new Option[] { ColumnsAllOption, ColumnsOption, InteractiveOption, AddSourceOption });
+            IEnumerable<Argument> argumentsToVerify = new Argument[] { ShortNameArgument, RemainingArguments };
 
-            foreach (CliOption option in optionsToVerify)
+            foreach (Option option in optionsToVerify)
             {
                 if (!except.Contains(option))
                 {
@@ -57,7 +57,7 @@ internal void AddNoLegacyUsageValidators(CliCommand command, params CliSymbol[]
                 }
             }
 
-            foreach (CliArgument argument in argumentsToVerify)
+            foreach (Argument argument in argumentsToVerify)
             {
                 if (!except.Contains(argument))
                 {
@@ -76,7 +76,7 @@ internal void ValidateArgumentsAreNotUsed(CommandResult commandResult)
             ValidateArgumentUsage(commandResult, ShortNameArgument, RemainingArguments);
         }
 
-        internal void ValidateOptionUsage(CommandResult commandResult, CliOption option)
+        internal void ValidateOptionUsage(CommandResult commandResult, Option option)
         {
             if (commandResult.Parent is not CommandResult parentResult)
             {
@@ -103,7 +103,7 @@ internal void ValidateOptionUsage(CommandResult commandResult, CliOption option)
             }
         }
 
-        private static void ValidateArgumentUsage(CommandResult commandResult, params CliArgument[] arguments)
+        private static void ValidateArgumentUsage(CommandResult commandResult, params Argument[] arguments)
         {
             if (commandResult.Parent is not CommandResult parentResult)
             {
@@ -111,7 +111,7 @@ private static void ValidateArgumentUsage(CommandResult commandResult, params Cl
             }
 
             List<string> wrongTokens = new();
-            foreach (CliArgument argument in arguments)
+            foreach (Argument argument in arguments)
             {
                 var newCommandArgument = parentResult.Children.OfType<ArgumentResult>().FirstOrDefault(result => result.Argument == argument);
                 if (newCommandArgument == null)
@@ -139,7 +139,7 @@ private void BuildLegacySymbols(Func<ParseResult, ITemplateEngineHost> hostBuild
             Arguments.Add(RemainingArguments);
 
             //legacy options
-            Dictionary<FilterOptionDefinition, CliOption> options = new();
+            Dictionary<FilterOptionDefinition, Option> options = new();
             foreach (var filterDef in LegacyFilterDefinitions)
             {
                 options[filterDef] = filterDef.OptionFactory().AsHidden();
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/NewCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/NewCommand.cs
index d94840fe09d5..3db21ea63d74 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/NewCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/NewCommand.cs
@@ -46,63 +46,63 @@ internal NewCommand(
 
         public string DocsLink { get; } = "https://aka.ms/dotnet-new";
 
-        internal static CliOption<string?> DebugCustomSettingsLocationOption { get; } = new("--debug:custom-hive")
+        internal static Option<string?> DebugCustomSettingsLocationOption { get; } = new("--debug:custom-hive")
         {
             Description = SymbolStrings.Option_Debug_CustomSettings,
             Hidden = true,
             Recursive = true
         };
 
-        internal static CliOption<bool> DebugVirtualizeSettingsOption { get; } = new("--debug:ephemeral-hive", "--debug:virtual-hive")
+        internal static Option<bool> DebugVirtualizeSettingsOption { get; } = new("--debug:ephemeral-hive", "--debug:virtual-hive")
         {
             Description = SymbolStrings.Option_Debug_VirtualSettings,
             Hidden = true,
             Recursive = true
         };
 
-        internal static CliOption<bool> DebugAttachOption { get; } = new("--debug:attach")
+        internal static Option<bool> DebugAttachOption { get; } = new("--debug:attach")
         {
             Description = SymbolStrings.Option_Debug_Attach,
             Hidden = true,
             Recursive = true
         };
 
-        internal static CliOption<bool> DebugReinitOption { get; } = new("--debug:reinit")
+        internal static Option<bool> DebugReinitOption { get; } = new("--debug:reinit")
         {
             Description = SymbolStrings.Option_Debug_Reinit,
             Hidden = true,
             Recursive = true
         };
 
-        internal static CliOption<bool> DebugRebuildCacheOption { get; } = new("--debug:rebuild-cache", "--debug:rebuildcache")
+        internal static Option<bool> DebugRebuildCacheOption { get; } = new("--debug:rebuild-cache", "--debug:rebuildcache")
         {
             Description = SymbolStrings.Option_Debug_RebuildCache,
             Hidden = true,
             Recursive = true
         };
 
-        internal static CliOption<bool> DebugShowConfigOption { get; } = new("--debug:show-config", "--debug:showconfig")
+        internal static Option<bool> DebugShowConfigOption { get; } = new("--debug:show-config", "--debug:showconfig")
         {
             Description = SymbolStrings.Option_Debug_ShowConfig,
             Hidden = true,
             Recursive = true
         };
 
-        internal static CliArgument<string> ShortNameArgument { get; } = new("template-short-name")
+        internal static Argument<string> ShortNameArgument { get; } = new("template-short-name")
         {
             Description = SymbolStrings.Command_Instantiate_Argument_ShortName,
             Arity = new ArgumentArity(0, 1),
             Hidden = true
         };
 
-        internal static CliArgument<string[]> RemainingArguments { get; } = new("template-args")
+        internal static Argument<string[]> RemainingArguments { get; } = new("template-args")
         {
             Description = SymbolStrings.Command_Instantiate_Argument_TemplateOptions,
             Arity = new ArgumentArity(0, 999),
             Hidden = true
         };
 
-        internal IReadOnlyList<CliOption> PassByOptions { get; } = new CliOption[]
+        internal IReadOnlyList<Option> PassByOptions { get; } = new Option[]
         {
             SharedOptions.ForceOption,
             SharedOptions.NameOption,
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/NewCommandArgs.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/NewCommandArgs.cs
index 559c3f73cd24..212fd2eb03df 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/NewCommandArgs.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/NewCommandArgs.cs
@@ -11,7 +11,7 @@ internal class NewCommandArgs : GlobalArgs
     {
         public NewCommandArgs(NewCommand command, ParseResult parseResult) : base(command, parseResult)
         {
-            List<CliToken> tokensToEvaluate = new();
+            List<Token> tokensToEvaluate = new();
             foreach (var childrenResult in parseResult.CommandResult.Children)
             {
                 if (childrenResult is OptionResult o)
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ParserFactory.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ParserFactory.cs
index 9e1a78b02622..bf19f440af4d 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ParserFactory.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/ParserFactory.cs
@@ -8,9 +8,9 @@ namespace Microsoft.TemplateEngine.Cli.Commands
 {
     internal static class ParserFactory
     {
-        internal static CliConfiguration CreateParser(CliCommand command, bool disableHelp = false)
+        internal static CommandLineConfiguration CreateParser(Command command, bool disableHelp = false)
         {
-            CliConfiguration config = new(command)
+            CommandLineConfiguration config = new(command)
             //TODO: decide if it's needed to implement it; and implement if needed
             //.UseParseDirective()
             //.UseSuggestDirective()
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/SharedOptions.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/SharedOptions.cs
index 0fae1afbea26..e9963f51aa21 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/SharedOptions.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/SharedOptions.cs
@@ -7,35 +7,35 @@ namespace Microsoft.TemplateEngine.Cli.Commands
 {
     public static class SharedOptions
     {
-        public static CliOption<FileInfo> OutputOption { get; } = new("--output", "-o")
+        public static Option<FileInfo> OutputOption { get; } = new("--output", "-o")
         {
             Description = SymbolStrings.Option_Output,
             Required = false,
             Arity = new ArgumentArity(1, 1)
         };
 
-        public static CliOption<FileInfo> ProjectPathOption { get; } = new CliOption<FileInfo>("--project")
+        public static Option<FileInfo> ProjectPathOption { get; } = new Option<FileInfo>("--project")
         {
             Description = SymbolStrings.Option_ProjectPath
         }.AcceptExistingOnly();
 
-        public static CliOption<bool> InteractiveOption { get; } = SharedOptionsFactory.CreateInteractiveOption();
+        public static Option<bool> InteractiveOption { get; } = SharedOptionsFactory.CreateInteractiveOption();
 
-        internal static CliOption<bool> ForceOption { get; } = SharedOptionsFactory.CreateForceOption();
+        internal static Option<bool> ForceOption { get; } = SharedOptionsFactory.CreateForceOption();
 
-        internal static CliOption<string> NameOption { get; } = new("--name", "-n")
+        internal static Option<string> NameOption { get; } = new("--name", "-n")
         {
             Description = SymbolStrings.TemplateCommand_Option_Name,
             Arity = new ArgumentArity(1, 1)
         };
 
-        internal static CliOption<bool> DryRunOption { get; } = new("--dry-run")
+        internal static Option<bool> DryRunOption { get; } = new("--dry-run")
         {
             Description = SymbolStrings.TemplateCommand_Option_DryRun,
             Arity = new ArgumentArity(0, 1)
         };
 
-        internal static CliOption<bool> NoUpdateCheckOption { get; } = new("--no-update-check")
+        internal static Option<bool> NoUpdateCheckOption { get; } = new("--no-update-check")
         {
             Description = SymbolStrings.TemplateCommand_Option_NoUpdateCheck,
             Arity = new ArgumentArity(0, 1)
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/SharedOptionsFactory.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/SharedOptionsFactory.cs
index 1d8aac0bfd4c..341aca451b24 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/SharedOptionsFactory.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/SharedOptionsFactory.cs
@@ -9,40 +9,40 @@ namespace Microsoft.TemplateEngine.Cli.Commands
 {
     public static class SharedOptionsFactory
     {
-        public static CliOption AsHidden(this CliOption o)
+        public static Option AsHidden(this Option o)
         {
             o.Hidden = true;
             return o;
         }
 
-        public static CliOption<T> AsHidden<T>(this CliOption<T> o)
+        public static Option<T> AsHidden<T>(this Option<T> o)
         {
             o.Hidden = true;
             return o;
         }
 
-        public static CliOption<T> WithDescription<T>(this CliOption<T> o, string description)
+        public static Option<T> WithDescription<T>(this Option<T> o, string description)
         {
             o.Description = description;
             return o;
         }
 
-        public static CliOption<T> DisableAllowMultipleArgumentsPerToken<T>(this CliOption<T> o)
+        public static Option<T> DisableAllowMultipleArgumentsPerToken<T>(this Option<T> o)
         {
             o.AllowMultipleArgumentsPerToken = false;
             return o;
         }
 
-        internal static CliOption<bool> CreateInteractiveOption()
+        internal static Option<bool> CreateInteractiveOption()
         {
-            return new CliOption<bool>("--interactive")
+            return new Option<bool>("--interactive")
             {
                 Arity = new ArgumentArity(0, 1),
                 Description = SymbolStrings.Option_Interactive
             };
         }
 
-        internal static CliOption<string[]> CreateAddSourceOption()
+        internal static Option<string[]> CreateAddSourceOption()
         {
             return new("--add-source", "--nuget-source")
             {
@@ -53,7 +53,7 @@ internal static CliOption<string[]> CreateAddSourceOption()
             };
         }
 
-        internal static CliOption<bool> CreateForceOption()
+        internal static Option<bool> CreateForceOption()
         {
             return new("--force")
             {
@@ -62,7 +62,7 @@ internal static CliOption<bool> CreateForceOption()
             };
         }
 
-        internal static CliOption<string> CreateAuthorOption()
+        internal static Option<string> CreateAuthorOption()
         {
             return new("--author")
             {
@@ -71,7 +71,7 @@ internal static CliOption<string> CreateAuthorOption()
             };
         }
 
-        internal static CliOption<string> CreateBaselineOption()
+        internal static Option<string> CreateBaselineOption()
         {
             return new("--baseline")
             {
@@ -81,7 +81,7 @@ internal static CliOption<string> CreateBaselineOption()
             };
         }
 
-        internal static CliOption<string> CreateLanguageOption()
+        internal static Option<string> CreateLanguageOption()
         {
             return new("--language", "-lang")
             {
@@ -90,7 +90,7 @@ internal static CliOption<string> CreateLanguageOption()
             };
         }
 
-        internal static CliOption<string> CreateTypeOption()
+        internal static Option<string> CreateTypeOption()
         {
             return new("--type")
             {
@@ -99,7 +99,7 @@ internal static CliOption<string> CreateTypeOption()
             };
         }
 
-        internal static CliOption<string> CreateTagOption()
+        internal static Option<string> CreateTagOption()
         {
             return new("--tag")
             {
@@ -108,7 +108,7 @@ internal static CliOption<string> CreateTagOption()
             };
         }
 
-        internal static CliOption<string> CreatePackageOption()
+        internal static Option<string> CreatePackageOption()
         {
             return new("--package")
             {
@@ -117,7 +117,7 @@ internal static CliOption<string> CreatePackageOption()
             };
         }
 
-        internal static CliOption<bool> CreateColumnsAllOption()
+        internal static Option<bool> CreateColumnsAllOption()
         {
             return new("--columns-all")
             {
@@ -126,9 +126,9 @@ internal static CliOption<bool> CreateColumnsAllOption()
             };
         }
 
-        internal static CliOption<string[]> CreateColumnsOption()
+        internal static Option<string[]> CreateColumnsOption()
         {
-            CliOption<string[]> option = new("--columns")
+            Option<string[]> option = new("--columns")
             {
                 Arity = new ArgumentArity(1, 4),
                 Description = SymbolStrings.Option_Columns,
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.Help.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.Help.cs
index ef71e9bcb602..23e04dd714e2 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.Help.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.Help.cs
@@ -9,6 +9,7 @@
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Edge.Settings;
 using Microsoft.TemplateEngine.Utils;
+using Command = System.CommandLine.Command;
 
 namespace Microsoft.TemplateEngine.Cli.Commands
 {
@@ -16,7 +17,7 @@ internal partial class InstantiateCommand
     {
         private const string Indent = "  ";
         private static Lazy<ResourceManager> _resourceManager = new(
-            () => new ResourceManager("System.CommandLine.Properties.Resources", typeof(System.CommandLine.CliSymbol).Assembly));
+            () => new ResourceManager("System.CommandLine.Properties.Resources", typeof(System.CommandLine.Symbol).Assembly));
 
         public static void WriteHelp(HelpContext context, InstantiateCommandArgs instantiateCommandArgs, IEngineEnvironmentSettings environmentSettings)
         {
@@ -287,7 +288,7 @@ internal static void ShowCommandOptions(
             IEnumerable<TemplateCommand> templatesToShow,
             HelpContext context)
         {
-            List<CliOption> optionsToShow = new()
+            List<Option> optionsToShow = new()
             {
                 SharedOptions.NameOption,
                 SharedOptions.OutputOption,
@@ -322,7 +323,7 @@ internal static void ShowCommandOptions(
                 }
             }
 
-            foreach (CliOption cliOption in optionsToShow)
+            foreach (Option cliOption in optionsToShow)
             {
                 cliOption.EnsureHelpName();
             }
@@ -367,7 +368,7 @@ internal static IEnumerable<TemplateCommand> GetMatchingTemplates(
             return matchingTemplates;
         }
 
-        internal static void ShowUsage(CliCommand? command, IReadOnlyList<string> shortNames, HelpContext context)
+        internal static void ShowUsage(Command? command, IReadOnlyList<string> shortNames, HelpContext context)
         {
             List<string> usageParts = new();
             while (command is not null)
@@ -376,7 +377,7 @@ internal static void ShowUsage(CliCommand? command, IReadOnlyList<string> shortN
                 {
                     usageParts.Add(command.Name);
                 }
-                command = command.Parents.FirstOrDefault(c => c is CliCommand) as CliCommand;
+                command = command.Parents.FirstOrDefault(c => c is Command) as Command;
             }
 
             usageParts.Reverse();
@@ -440,10 +441,10 @@ private static IEnumerable<TemplateOption> CollectOptionsToShow(IEnumerable<Temp
             return optionsToShow;
         }
 
-        private static void WriteCustomInstantiateHelp(HelpContext context, CliCommand command)
+        private static void WriteCustomInstantiateHelp(HelpContext context, Command command)
         {
             //unhide arguments of NewCommand. They are hidden not to appear in subcommands help.
-            foreach (CliArgument arg in command.Arguments)
+            foreach (Argument arg in command.Arguments)
             {
                 arg.Hidden = false;
             }
@@ -460,7 +461,7 @@ private static void WriteCustomInstantiateHelp(HelpContext context, CliCommand c
             context.Output.WriteLine();
         }
 
-        private static void CustomUsageSection(HelpContext context, CliCommand command)
+        private static void CustomUsageSection(HelpContext context, Command command)
         {
             context.Output.WriteLine(HelpUsageTitle());
             context.Output.WriteLine(Indent + string.Join(" ", GetCustomUsageParts(context, command, showSubcommands: false)));
@@ -473,21 +474,21 @@ private static void CustomUsageSection(HelpContext context, CliCommand command)
 
         private static IEnumerable<string> GetCustomUsageParts(
             HelpContext context,
-            CliCommand command,
+            Command command,
             bool showSubcommands = true,
             bool showArguments = true,
             bool showOptions = true)
         {
-            List<CliCommand> parentCommands = new();
-            CliCommand? nextCommand = command;
+            List<Command> parentCommands = new();
+            Command? nextCommand = command;
             while (nextCommand is not null)
             {
                 parentCommands.Add(nextCommand);
-                nextCommand = nextCommand.Parents.FirstOrDefault(c => c is CliCommand) as CliCommand;
+                nextCommand = nextCommand.Parents.FirstOrDefault(c => c is Command) as Command;
             }
             parentCommands.Reverse();
 
-            foreach (CliCommand parentCommand in parentCommands)
+            foreach (Command parentCommand in parentCommands)
             {
                 yield return parentCommand.Name;
             }
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.NoMatchHandling.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.NoMatchHandling.cs
index 59e07fba086f..a9612bfb0c49 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.NoMatchHandling.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.NoMatchHandling.cs
@@ -6,7 +6,7 @@
 using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Edge.Settings;
-using Command = System.CommandLine.CliCommand;
+using Command = System.CommandLine.Command;
 
 namespace Microsoft.TemplateEngine.Cli.Commands
 {
@@ -168,16 +168,16 @@ private static NewCommandStatus HandleNoTemplateFoundResult(
 
         private static void HandleNoMatchOnTemplateBaseOptions(IEnumerable<TemplateResult> matchInfos, InstantiateCommandArgs args, TemplateGroup templateGroup)
         {
-            CliOption<string> languageOption = SharedOptionsFactory.CreateLanguageOption();
-            CliOption<string> typeOption = SharedOptionsFactory.CreateTypeOption();
-            CliOption<string> baselineOption = SharedOptionsFactory.CreateBaselineOption();
+            Option<string> languageOption = SharedOptionsFactory.CreateLanguageOption();
+            Option<string> typeOption = SharedOptionsFactory.CreateTypeOption();
+            Option<string> baselineOption = SharedOptionsFactory.CreateBaselineOption();
 
             Command reparseCommand = new("reparse-only")
             {
                 languageOption,
                 typeOption,
                 baselineOption,
-                new CliArgument<string[]>("rem-args")
+                new Argument<string[]>("rem-args")
                 {
                     Arity = new ArgumentArity(0, 999)
                 }
@@ -185,7 +185,7 @@ private static void HandleNoMatchOnTemplateBaseOptions(IEnumerable<TemplateResul
 
             ParseResult result = ParserFactory.CreateParser(reparseCommand).Parse(args.RemainingArguments ?? Array.Empty<string>());
             string baseInputParameters = $"'{args.ShortName}'";
-            foreach (CliOption<string> option in new[] { languageOption, typeOption, baselineOption })
+            foreach (Option<string> option in new[] { languageOption, typeOption, baselineOption })
             {
                 if (result.GetResult(option) is { } optionResult && optionResult.IdentifierToken is { } token)
                 {
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.TabCompletion.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.TabCompletion.cs
index 5dbd34f8485d..8056bb028fd3 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.TabCompletion.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.TabCompletion.cs
@@ -60,7 +60,7 @@ internal static IEnumerable<CompletionItem> GetTemplateCompletions(
                                 templateGroup,
                                 template);
 
-                            CliConfiguration parser = ParserFactory.CreateParser(command);
+                            CommandLineConfiguration parser = ParserFactory.CreateParser(command);
 
                             //it is important to pass raw text to get the completion
                             //completions for args passed as array are not supported
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.cs
index c77c42e53532..c8af9158f0ef 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.cs
@@ -39,19 +39,19 @@ internal InstantiateCommand(
             Validators.Add(symbolResult => parentCommand.ValidateOptionUsage(symbolResult, SharedOptions.ProjectPathOption));
         }
 
-        internal static CliArgument<string> ShortNameArgument { get; } = new CliArgument<string>("template-short-name")
+        internal static Argument<string> ShortNameArgument { get; } = new Argument<string>("template-short-name")
         {
             Description = SymbolStrings.Command_Instantiate_Argument_ShortName,
             Arity = new ArgumentArity(0, 1)
         };
 
-        internal CliArgument<string[]> RemainingArguments { get; } = new CliArgument<string[]>("template-args")
+        internal Argument<string[]> RemainingArguments { get; } = new Argument<string[]>("template-args")
         {
             Description = SymbolStrings.Command_Instantiate_Argument_TemplateOptions,
             Arity = new ArgumentArity(0, 999)
         };
 
-        internal IReadOnlyList<CliOption> PassByOptions { get; } = new CliOption[]
+        internal IReadOnlyList<Option> PassByOptions { get; } = new Option[]
         {
             SharedOptions.ForceOption,
             SharedOptions.NameOption,
@@ -435,7 +435,7 @@ private static (TemplateCommand? Command, ParseResult? ParseResult)? ReparseForT
                     template,
                     validateDefaultLanguage);
 
-                CliConfiguration parser = ParserFactory.CreateParser(command);
+                CommandLineConfiguration parser = ParserFactory.CreateParser(command);
                 ParseResult parseResult = parser.Parse(args.RemainingArguments ?? Array.Empty<string>());
                 return (command, parseResult);
             }
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommand.cs
index 8f5a3e489ce4..f078574630c2 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommand.cs
@@ -10,10 +10,11 @@
 using Microsoft.TemplateEngine.Edge;
 using Microsoft.TemplateEngine.Edge.Settings;
 using Microsoft.TemplateEngine.Utils;
+using Command = System.CommandLine.Command;
 
 namespace Microsoft.TemplateEngine.Cli.Commands
 {
-    internal class TemplateCommand : CliCommand
+    internal class TemplateCommand : Command
     {
         private static readonly TimeSpan ConstraintEvaluationTimeout = TimeSpan.FromMilliseconds(1000);
         private static readonly string[] _helpAliases = new[] { "-h", "/h", "--help", "-?", "/?" };
@@ -100,7 +101,7 @@ public TemplateCommand(
 
             if (HasRunScriptPostActionDefined(template))
             {
-                AllowScriptsOption = new CliOption<AllowRunScripts>("--allow-scripts")
+                AllowScriptsOption = new Option<AllowRunScripts>("--allow-scripts")
                 {
                     Description = SymbolStrings.TemplateCommand_Option_AllowScripts,
                     Arity = new ArgumentArity(1, 1),
@@ -114,13 +115,13 @@ public TemplateCommand(
 
         internal static IReadOnlyList<string> KnownHelpAliases => _helpAliases;
 
-        internal CliOption<AllowRunScripts>? AllowScriptsOption { get; }
+        internal Option<AllowRunScripts>? AllowScriptsOption { get; }
 
-        internal CliOption<string>? LanguageOption { get; }
+        internal Option<string>? LanguageOption { get; }
 
-        internal CliOption<string>? TypeOption { get; }
+        internal Option<string>? TypeOption { get; }
 
-        internal CliOption<string>? BaselineOption { get; }
+        internal Option<string>? BaselineOption { get; }
 
         internal IReadOnlyDictionary<string, TemplateOption> TemplateOptions => _templateSpecificOptions;
 
@@ -274,9 +275,9 @@ private HashSet<string> GetReservedAliases()
             }
             return reservedAliases;
 
-            static void AddReservedNamesAndAliases(HashSet<string> reservedAliases, CliCommand command)
+            static void AddReservedNamesAndAliases(HashSet<string> reservedAliases, Command command)
             {
-                foreach (CliOption option in command.Options)
+                foreach (Option option in command.Options)
                 {
                     reservedAliases.Add(option.Name);
                     foreach (string alias in option.Aliases)
@@ -284,7 +285,7 @@ static void AddReservedNamesAndAliases(HashSet<string> reservedAliases, CliComma
                         reservedAliases.Add(alias);
                     }
                 }
-                foreach (CliCommand subCommand in command.Subcommands)
+                foreach (Command subCommand in command.Subcommands)
                 {
                     reservedAliases.Add(subCommand.Name);
                     foreach (string alias in subCommand.Aliases)
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommandArgs.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommandArgs.cs
index 368bbcf6177c..cdcc2680513f 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommandArgs.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommandArgs.cs
@@ -80,7 +80,7 @@ public TemplateCommandArgs(TemplateCommand command, BaseCommand parentCommand, P
 
         public ParseResult ParseResult { get; }
 
-        public CliCommand Command => _command;
+        public Command Command => _command;
 
         public NewCommand RootCommand { get; }
 
@@ -115,7 +115,7 @@ public bool TryGetAliasForCanonicalName(string canonicalName, out string? alias)
             {
                 throw new InvalidOperationException($"Parameter {parameterName} is not defined for {Template.Identity}.");
             }
-            if (parameter.Type == ParameterType.Hex && optionResult.Option is CliOption<long>)
+            if (parameter.Type == ParameterType.Hex && optionResult.Option is Option<long>)
             {
                 var intValue = (long)optionValue;
                 return $"0x{intValue.ToString("X")}";
@@ -129,10 +129,10 @@ private NewCommand GetRootCommand(BaseCommand command)
             {
                 return newCommand;
             }
-            CliCommand? currentCommand = command;
+            Command? currentCommand = command;
             while (currentCommand != null && currentCommand is not NewCommand)
             {
-                currentCommand = currentCommand.Parents.OfType<CliCommand>().SingleOrDefault();
+                currentCommand = currentCommand.Parents.OfType<Command>().SingleOrDefault();
             }
             return currentCommand as NewCommand ?? throw new Exception($"Command structure is not correct: {nameof(NewCommand)} is not found.");
         }
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateOption.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateOption.cs
index f6b20702bfb8..61164096ca7b 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateOption.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateOption.cs
@@ -7,7 +7,7 @@ namespace Microsoft.TemplateEngine.Cli.Commands
 {
     internal class TemplateOption : IEquatable<TemplateOption>
     {
-        private CliOption _option;
+        private Option _option;
 
         internal TemplateOption(
             CliTemplateParameter parameter,
@@ -22,7 +22,7 @@ internal TemplateOption(
 
         internal IReadOnlySet<string> Aliases { get; private set; }
 
-        internal CliOption Option => _option;
+        internal Option Option => _option;
 
         public bool Equals(TemplateOption? other)
         {
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/details/DetailsCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/details/DetailsCommand.cs
index 0f49518164f7..31224d978541 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/details/DetailsCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/details/DetailsCommand.cs
@@ -19,22 +19,22 @@ internal DetailsCommand(
             Options.Add(AddSourceOption);
         }
 
-        internal static CliArgument<string> NameArgument { get; } = new("package-identifier")
+        internal static Argument<string> NameArgument { get; } = new("package-identifier")
         {
             Description = LocalizableStrings.DetailsCommand_Argument_PackageIdentifier,
             Arity = new ArgumentArity(1, 1)
         };
 
         // Option disabled until https://github.com/dotnet/templating/issues/6811 is solved
-        //internal static CliOption<string> VersionOption { get; } = new("-version", "--version")
+        //internal static Option<string> VersionOption { get; } = new("-version", "--version")
         //{
         //    Description = LocalizableStrings.DetailsCommand_Option_Version,
         //    Arity = new ArgumentArity(1, 1)
         //};
 
-        internal virtual CliOption<bool> InteractiveOption { get; } = SharedOptions.InteractiveOption;
+        internal virtual Option<bool> InteractiveOption { get; } = SharedOptions.InteractiveOption;
 
-        internal virtual CliOption<string[]> AddSourceOption { get; } = SharedOptionsFactory.CreateAddSourceOption();
+        internal virtual Option<string[]> AddSourceOption { get; } = SharedOptionsFactory.CreateAddSourceOption();
 
         protected override async Task<NewCommandStatus> ExecuteAsync(
             DetailsCommandArgs args,
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/install/BaseInstallCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/install/BaseInstallCommand.cs
index dede54123642..b3821ebed5d1 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/install/BaseInstallCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/install/BaseInstallCommand.cs
@@ -22,17 +22,17 @@ internal BaseInstallCommand(
             Options.Add(ForceOption);
         }
 
-        internal static CliArgument<string[]> NameArgument { get; } = new("package")
+        internal static Argument<string[]> NameArgument { get; } = new("package")
         {
             Description = SymbolStrings.Command_Install_Argument_Package,
             Arity = new ArgumentArity(1, 99)
         };
 
-        internal static CliOption<bool> ForceOption { get; } = SharedOptionsFactory.CreateForceOption().WithDescription(SymbolStrings.Option_Install_Force);
+        internal static Option<bool> ForceOption { get; } = SharedOptionsFactory.CreateForceOption().WithDescription(SymbolStrings.Option_Install_Force);
 
-        internal virtual CliOption<bool> InteractiveOption { get; } = SharedOptions.InteractiveOption;
+        internal virtual Option<bool> InteractiveOption { get; } = SharedOptions.InteractiveOption;
 
-        internal virtual CliOption<string[]> AddSourceOption { get; } = SharedOptionsFactory.CreateAddSourceOption();
+        internal virtual Option<string[]> AddSourceOption { get; } = SharedOptionsFactory.CreateAddSourceOption();
 
         protected NewCommand ParentCommand { get; }
 
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/install/LegacyInstallCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/install/LegacyInstallCommand.cs
index 7f322dce877d..3d7688e5dab1 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/install/LegacyInstallCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/install/LegacyInstallCommand.cs
@@ -15,12 +15,12 @@ public LegacyInstallCommand(NewCommand parentCommand, Func<ParseResult, ITemplat
             Hidden = true;
             Aliases.Add("-i");
 
-            parentCommand.AddNoLegacyUsageValidators(this, except: new CliOption[] { InteractiveOption, AddSourceOption });
+            parentCommand.AddNoLegacyUsageValidators(this, except: new Option[] { InteractiveOption, AddSourceOption });
         }
 
-        internal override CliOption<bool> InteractiveOption => ParentCommand.InteractiveOption;
+        internal override Option<bool> InteractiveOption => ParentCommand.InteractiveOption;
 
-        internal override CliOption<string[]> AddSourceOption => ParentCommand.AddSourceOption;
+        internal override Option<string[]> AddSourceOption => ParentCommand.AddSourceOption;
 
         protected override Task<NewCommandStatus> ExecuteAsync(InstallCommandArgs args, IEngineEnvironmentSettings environmentSettings, TemplatePackageManager templatePackageManager, ParseResult parseResult, CancellationToken cancellationToken)
         {
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/list/BaseListCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/list/BaseListCommand.cs
index a49c6fd94928..79c3ad8fe7b1 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/list/BaseListCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/list/BaseListCommand.cs
@@ -34,19 +34,19 @@ internal BaseListCommand(
             SetupTabularOutputOptions(this);
         }
 
-        public virtual CliOption<bool> ColumnsAllOption { get; } = SharedOptionsFactory.CreateColumnsAllOption();
+        public virtual Option<bool> ColumnsAllOption { get; } = SharedOptionsFactory.CreateColumnsAllOption();
 
-        public virtual CliOption<string[]> ColumnsOption { get; } = SharedOptionsFactory.CreateColumnsOption();
+        public virtual Option<string[]> ColumnsOption { get; } = SharedOptionsFactory.CreateColumnsOption();
 
-        public IReadOnlyDictionary<FilterOptionDefinition, CliOption> Filters { get; protected set; }
+        public IReadOnlyDictionary<FilterOptionDefinition, Option> Filters { get; protected set; }
 
-        internal static CliOption<bool> IgnoreConstraintsOption { get; } = new("--ignore-constraints")
+        internal static Option<bool> IgnoreConstraintsOption { get; } = new("--ignore-constraints")
         {
             Description = SymbolStrings.ListCommand_Option_IgnoreConstraints,
             Arity = ArgumentArity.Zero
         };
 
-        internal static CliArgument<string> NameArgument { get; } = new("template-name")
+        internal static Argument<string> NameArgument { get; } = new("template-name")
         {
             Description = SymbolStrings.Command_List_Argument_Name,
             Arity = new ArgumentArity(0, 1)
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/list/LegacyListCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/list/LegacyListCommand.cs
index ebe50dcb2480..348f3eff3bc3 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/list/LegacyListCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/list/LegacyListCommand.cs
@@ -19,14 +19,14 @@ public LegacyListCommand(
             Aliases.Add("-l");
             Validators.Add(ValidateParentCommandArguments);
 
-            parentCommand.AddNoLegacyUsageValidators(this, except: Filters.Values.Concat(new CliSymbol[] { ColumnsAllOption, ColumnsOption, NewCommand.ShortNameArgument }).ToArray());
+            parentCommand.AddNoLegacyUsageValidators(this, except: Filters.Values.Concat(new Symbol[] { ColumnsAllOption, ColumnsOption, NewCommand.ShortNameArgument }).ToArray());
         }
 
-        public override CliOption<bool> ColumnsAllOption => ParentCommand.ColumnsAllOption;
+        public override Option<bool> ColumnsAllOption => ParentCommand.ColumnsAllOption;
 
-        public override CliOption<string[]> ColumnsOption => ParentCommand.ColumnsOption;
+        public override Option<string[]> ColumnsOption => ParentCommand.ColumnsOption;
 
-        protected override CliOption GetFilterOption(FilterOptionDefinition def)
+        protected override Option GetFilterOption(FilterOptionDefinition def)
         {
             return ParentCommand.LegacyFilters[def];
         }
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/search/BaseSearchCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/search/BaseSearchCommand.cs
index 4602c70bed46..25d52fc404cf 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/search/BaseSearchCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/search/BaseSearchCommand.cs
@@ -33,13 +33,13 @@ internal BaseSearchCommand(
             SetupTabularOutputOptions(this);
         }
 
-        public virtual CliOption<bool> ColumnsAllOption { get; } = SharedOptionsFactory.CreateColumnsAllOption();
+        public virtual Option<bool> ColumnsAllOption { get; } = SharedOptionsFactory.CreateColumnsAllOption();
 
-        public virtual CliOption<string[]> ColumnsOption { get; } = SharedOptionsFactory.CreateColumnsOption();
+        public virtual Option<string[]> ColumnsOption { get; } = SharedOptionsFactory.CreateColumnsOption();
 
-        public IReadOnlyDictionary<FilterOptionDefinition, CliOption> Filters { get; protected set; }
+        public IReadOnlyDictionary<FilterOptionDefinition, Option> Filters { get; protected set; }
 
-        internal static CliArgument<string> NameArgument { get; } = new("template-name")
+        internal static Argument<string> NameArgument { get; } = new("template-name")
         {
             Description = SymbolStrings.Command_Search_Argument_Name,
             Arity = new ArgumentArity(0, 1)
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/search/LegacySearchCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/search/LegacySearchCommand.cs
index 6658cdb9fd8a..9c7ad1f2d7fc 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/search/LegacySearchCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/search/LegacySearchCommand.cs
@@ -16,14 +16,14 @@ public LegacySearchCommand(NewCommand parentCommand, Func<ParseResult, ITemplate
             Hidden = true;
             Validators.Add(ValidateParentCommandArguments);
 
-            parentCommand.AddNoLegacyUsageValidators(this, except: Filters.Values.Concat(new CliSymbol[] { ColumnsAllOption, ColumnsOption, NewCommand.ShortNameArgument }).ToArray());
+            parentCommand.AddNoLegacyUsageValidators(this, except: Filters.Values.Concat(new Symbol[] { ColumnsAllOption, ColumnsOption, NewCommand.ShortNameArgument }).ToArray());
         }
 
-        public override CliOption<bool> ColumnsAllOption => ParentCommand.ColumnsAllOption;
+        public override Option<bool> ColumnsAllOption => ParentCommand.ColumnsAllOption;
 
-        public override CliOption<string[]> ColumnsOption => ParentCommand.ColumnsOption;
+        public override Option<string[]> ColumnsOption => ParentCommand.ColumnsOption;
 
-        protected override CliOption GetFilterOption(FilterOptionDefinition def)
+        protected override Option GetFilterOption(FilterOptionDefinition def)
         {
             return ParentCommand.LegacyFilters[def];
         }
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/uninstall/BaseUninstallCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/uninstall/BaseUninstallCommand.cs
index a862d13f0139..aaeff1a38c6a 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/uninstall/BaseUninstallCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/uninstall/BaseUninstallCommand.cs
@@ -17,7 +17,7 @@ internal BaseUninstallCommand(
             Arguments.Add(NameArgument);
         }
 
-        internal static CliArgument<string[]> NameArgument { get; } = new("package")
+        internal static Argument<string[]> NameArgument { get; } = new("package")
         {
             Description = SymbolStrings.Command_Uninstall_Argument_Package,
             Arity = new ArgumentArity(0, 99)
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/BaseUpdateCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/BaseUpdateCommand.cs
index 9cdfea6fd3aa..41d6a14d1145 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/BaseUpdateCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/BaseUpdateCommand.cs
@@ -21,9 +21,9 @@ internal BaseUpdateCommand(
             Options.Add(AddSourceOption);
         }
 
-        internal virtual CliOption<bool> InteractiveOption { get; } = SharedOptionsFactory.CreateInteractiveOption();
+        internal virtual Option<bool> InteractiveOption { get; } = SharedOptionsFactory.CreateInteractiveOption();
 
-        internal virtual CliOption<string[]> AddSourceOption { get; } = SharedOptionsFactory.CreateAddSourceOption();
+        internal virtual Option<string[]> AddSourceOption { get; } = SharedOptionsFactory.CreateAddSourceOption();
 
         protected NewCommand ParentCommand { get; }
 
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/LegacyUpdateApplyCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/LegacyUpdateApplyCommand.cs
index cc29a4a64e87..01042ccbb006 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/LegacyUpdateApplyCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/LegacyUpdateApplyCommand.cs
@@ -15,12 +15,12 @@ public LegacyUpdateApplyCommand(
             : base(parentCommand, hostBuilder, "--update-apply", SymbolStrings.Command_Legacy_Update_Check_Description)
         {
             Hidden = true;
-            parentCommand.AddNoLegacyUsageValidators(this, except: new CliOption[] { InteractiveOption, AddSourceOption });
+            parentCommand.AddNoLegacyUsageValidators(this, except: new Option[] { InteractiveOption, AddSourceOption });
         }
 
-        internal override CliOption<bool> InteractiveOption => ParentCommand.InteractiveOption;
+        internal override Option<bool> InteractiveOption => ParentCommand.InteractiveOption;
 
-        internal override CliOption<string[]> AddSourceOption => ParentCommand.AddSourceOption;
+        internal override Option<string[]> AddSourceOption => ParentCommand.AddSourceOption;
 
         protected override Task<NewCommandStatus> ExecuteAsync(UpdateCommandArgs args, IEngineEnvironmentSettings environmentSettings, TemplatePackageManager templatePackageManager, ParseResult parseResult, CancellationToken cancellationToken)
         {
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/LegacyUpdateCheckCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/LegacyUpdateCheckCommand.cs
index f84acbfa4815..da0b0caa460a 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/LegacyUpdateCheckCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/LegacyUpdateCheckCommand.cs
@@ -15,12 +15,12 @@ public LegacyUpdateCheckCommand(
             : base(parentCommand, hostBuilder, "--update-check", SymbolStrings.Command_Update_Description)
         {
             Hidden = true;
-            parentCommand.AddNoLegacyUsageValidators(this, except: new CliOption[] { InteractiveOption, AddSourceOption });
+            parentCommand.AddNoLegacyUsageValidators(this, except: new Option[] { InteractiveOption, AddSourceOption });
         }
 
-        internal override CliOption<bool> InteractiveOption => ParentCommand.InteractiveOption;
+        internal override Option<bool> InteractiveOption => ParentCommand.InteractiveOption;
 
-        internal override CliOption<string[]> AddSourceOption => ParentCommand.AddSourceOption;
+        internal override Option<string[]> AddSourceOption => ParentCommand.AddSourceOption;
 
         protected override Task<NewCommandStatus> ExecuteAsync(UpdateCommandArgs args, IEngineEnvironmentSettings environmentSettings, TemplatePackageManager templatePackageManager, ParseResult parseResult, CancellationToken cancellationToken)
         {
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/UpdateCommand.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/UpdateCommand.cs
index 52e9d14b8c0e..37612b07b29c 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/UpdateCommand.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/update/UpdateCommand.cs
@@ -18,7 +18,7 @@ public UpdateCommand(
             Options.Add(CheckOnlyOption);
         }
 
-        internal static CliOption<bool> CheckOnlyOption { get; } = new("--check-only", "--dry-run")
+        internal static Option<bool> CheckOnlyOption { get; } = new("--check-only", "--dry-run")
         {
             Description = SymbolStrings.Command_Update_Option_CheckOnly,
             Arity = ArgumentArity.Zero
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/NewCommandFactory.cs b/src/Cli/Microsoft.TemplateEngine.Cli/NewCommandFactory.cs
index b994c80a5f7b..eae0deeb2141 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/NewCommandFactory.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/NewCommandFactory.cs
@@ -8,7 +8,7 @@ namespace Microsoft.TemplateEngine.Cli
 {
     public static class NewCommandFactory
     {
-        public static CliCommand Create(string commandName, Func<ParseResult, ICliTemplateEngineHost> hostBuilder)
+        public static Command Create(string commandName, Func<ParseResult, ICliTemplateEngineHost> hostBuilder)
         {
             if (string.IsNullOrWhiteSpace(commandName))
             {
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/SymbolExtensions.cs b/src/Cli/Microsoft.TemplateEngine.Cli/SymbolExtensions.cs
index e65a3f026857..33aee0c36a9e 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/SymbolExtensions.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/SymbolExtensions.cs
@@ -8,13 +8,13 @@ namespace Microsoft.TemplateEngine.Cli
 {
     public static class SymbolExtensions
     {
-        public static void EnsureHelpName(this CliOption cliOption)
+        public static void EnsureHelpName(this Option cliOption)
         {
             // System.CommandLine used to include the option's name without the prefix in the help output:
             // --name, --alias, -a <name> description
             // To keep that behavior, we need to set HelpName in explicit way.
             if (cliOption.HelpName is null
-                && cliOption is not CliOption<bool> // that was never a thing for boolean options
+                && cliOption is not Option<bool> // that was never a thing for boolean options
                 && cliOption.CompletionSources.Count == 0) // and options that have completions
             {
                 cliOption.HelpName = cliOption.Name.RemovePrefix();
diff --git a/src/Cli/dotnet/Commands/Build/BuildCommandParser.cs b/src/Cli/dotnet/Commands/Build/BuildCommandParser.cs
index 8a1aa19faa7c..bb085040fb26 100644
--- a/src/Cli/dotnet/Commands/Build/BuildCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Build/BuildCommandParser.cs
@@ -11,56 +11,56 @@ internal static class BuildCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-build";
 
-    public static readonly CliArgument<IEnumerable<string>> SlnOrProjectArgument = new(CliStrings.SolutionOrProjectArgumentName)
+    public static readonly Argument<IEnumerable<string>> SlnOrProjectArgument = new(CliStrings.SolutionOrProjectArgumentName)
     {
         Description = CliStrings.SolutionOrProjectArgumentDescription,
         Arity = ArgumentArity.ZeroOrMore
     };
 
-    public static readonly CliOption<string> OutputOption = new ForwardedOption<string>("--output", "-o")
+    public static readonly Option<string> OutputOption = new ForwardedOption<string>("--output", "-o")
     {
         Description = CliCommandStrings.BuildOutputOptionDescription,
         HelpName = CliCommandStrings.OutputOptionName
     }.ForwardAsOutputPath("OutputPath");
 
-    public static readonly CliOption<bool> NoIncrementalOption = new("--no-incremental")
+    public static readonly Option<bool> NoIncrementalOption = new("--no-incremental")
     {
         Description = CliCommandStrings.NoIncrementalOptionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<bool> NoDependenciesOption = new ForwardedOption<bool>("--no-dependencies")
+    public static readonly Option<bool> NoDependenciesOption = new ForwardedOption<bool>("--no-dependencies")
     {
         Description = CliCommandStrings.NoDependenciesOptionDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:BuildProjectReferences=false");
 
-    public static readonly CliOption<bool> NoLogoOption = new ForwardedOption<bool>("--nologo")
+    public static readonly Option<bool> NoLogoOption = new ForwardedOption<bool>("--nologo")
     {
         Description = CliCommandStrings.BuildCmdNoLogo,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-nologo");
 
-    public static readonly CliOption<bool> NoRestoreOption = CommonOptions.NoRestoreOption;
+    public static readonly Option<bool> NoRestoreOption = CommonOptions.NoRestoreOption;
 
-    public static readonly CliOption<bool> SelfContainedOption = CommonOptions.SelfContainedOption;
+    public static readonly Option<bool> SelfContainedOption = CommonOptions.SelfContainedOption;
 
-    public static readonly CliOption<bool> NoSelfContainedOption = CommonOptions.NoSelfContainedOption;
+    public static readonly Option<bool> NoSelfContainedOption = CommonOptions.NoSelfContainedOption;
 
-    public static readonly CliOption<string> RuntimeOption = CommonOptions.RuntimeOption;
+    public static readonly Option<string> RuntimeOption = CommonOptions.RuntimeOption;
 
-    public static readonly CliOption<string> FrameworkOption = CommonOptions.FrameworkOption(CliCommandStrings.BuildFrameworkOptionDescription);
+    public static readonly Option<string> FrameworkOption = CommonOptions.FrameworkOption(CliCommandStrings.BuildFrameworkOptionDescription);
 
-    public static readonly CliOption<string> ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.BuildConfigurationOptionDescription);
+    public static readonly Option<string> ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.BuildConfigurationOptionDescription);
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         DocumentedCommand command = new("build", DocsLink, CliCommandStrings.BuildAppFullName);
 
diff --git a/src/Cli/dotnet/Commands/BuildServer/BuildServerCommandParser.cs b/src/Cli/dotnet/Commands/BuildServer/BuildServerCommandParser.cs
index 238730015f08..dfa809fc10e3 100644
--- a/src/Cli/dotnet/Commands/BuildServer/BuildServerCommandParser.cs
+++ b/src/Cli/dotnet/Commands/BuildServer/BuildServerCommandParser.cs
@@ -11,14 +11,14 @@ internal static class BuildServerCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-build-server";
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         var command = new DocumentedCommand("build-server", DocsLink, CliCommandStrings.BuildServerCommandDescription);
 
diff --git a/src/Cli/dotnet/Commands/BuildServer/Shutdown/BuildServerShutdownCommandParser.cs b/src/Cli/dotnet/Commands/BuildServer/Shutdown/BuildServerShutdownCommandParser.cs
index 5c973eca1cf7..35af757df296 100644
--- a/src/Cli/dotnet/Commands/BuildServer/Shutdown/BuildServerShutdownCommandParser.cs
+++ b/src/Cli/dotnet/Commands/BuildServer/Shutdown/BuildServerShutdownCommandParser.cs
@@ -7,34 +7,34 @@ namespace Microsoft.DotNet.Cli.Commands.BuildServer.Shutdown;
 
 internal static class BuildServerShutdownCommandParser
 {
-    public static readonly CliOption<bool> MSBuildOption = new("--msbuild")
+    public static readonly Option<bool> MSBuildOption = new("--msbuild")
     {
         Description = CliCommandStrings.MSBuildOptionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<bool> VbcsOption = new("--vbcscompiler")
+    public static readonly Option<bool> VbcsOption = new("--vbcscompiler")
     {
         Description = CliCommandStrings.VBCSCompilerOptionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<bool> RazorOption = new("--razor")
+    public static readonly Option<bool> RazorOption = new("--razor")
     {
         Description = CliCommandStrings.RazorOptionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("shutdown", CliCommandStrings.BuildServerShutdownCommandDescription);
+        Command command = new("shutdown", CliCommandStrings.BuildServerShutdownCommandDescription);
 
         command.Options.Add(MSBuildOption);
         command.Options.Add(VbcsOption);
diff --git a/src/Cli/dotnet/Commands/Clean/CleanCommandParser.cs b/src/Cli/dotnet/Commands/Clean/CleanCommandParser.cs
index 810ab40c0723..5b0f78cef841 100644
--- a/src/Cli/dotnet/Commands/Clean/CleanCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Clean/CleanCommandParser.cs
@@ -10,36 +10,36 @@ internal static class CleanCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-clean";
 
-    public static readonly CliArgument<IEnumerable<string>> SlnOrProjectArgument = new(CliStrings.SolutionOrProjectArgumentName)
+    public static readonly Argument<IEnumerable<string>> SlnOrProjectArgument = new(CliStrings.SolutionOrProjectArgumentName)
     {
         Description = CliStrings.SolutionOrProjectArgumentDescription,
         Arity = ArgumentArity.ZeroOrMore
     };
 
-    public static readonly CliOption<string> OutputOption = new ForwardedOption<string>("--output", "-o")
+    public static readonly Option<string> OutputOption = new ForwardedOption<string>("--output", "-o")
     {
         Description = CliCommandStrings.CleanCmdOutputDirDescription,
         HelpName = CliCommandStrings.CleanCmdOutputDir
     }.ForwardAsOutputPath("OutputPath");
 
-    public static readonly CliOption<bool> NoLogoOption = new ForwardedOption<bool>("--nologo")
+    public static readonly Option<bool> NoLogoOption = new ForwardedOption<bool>("--nologo")
     {
         Description = CliCommandStrings.CleanCmdNoLogo,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-nologo");
 
-    public static readonly CliOption FrameworkOption = CommonOptions.FrameworkOption(CliCommandStrings.CleanFrameworkOptionDescription);
+    public static readonly Option FrameworkOption = CommonOptions.FrameworkOption(CliCommandStrings.CleanFrameworkOptionDescription);
 
-    public static readonly CliOption ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.CleanConfigurationOptionDescription);
+    public static readonly Option ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.CleanConfigurationOptionDescription);
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         DocumentedCommand command = new("clean", DocsLink, CliCommandStrings.CleanAppFullName);
 
diff --git a/src/Cli/dotnet/Commands/Format/FormatCommandParser.cs b/src/Cli/dotnet/Commands/Format/FormatCommandParser.cs
index 0c89cbafd483..acdae1fa2447 100644
--- a/src/Cli/dotnet/Commands/Format/FormatCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Format/FormatCommandParser.cs
@@ -7,18 +7,18 @@ namespace Microsoft.DotNet.Cli.Commands.Format;
 
 internal static partial class FormatCommandParser
 {
-    public static readonly CliArgument<string[]> Arguments = new("arguments");
+    public static readonly Argument<string[]> Arguments = new("arguments");
 
     public static readonly string DocsLink = "https://aka.ms/dotnet-format";
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         var formatCommand = new DocumentedCommand("format", DocsLink)
         {
diff --git a/src/Cli/dotnet/Commands/Fsi/FsiCommandParser.cs b/src/Cli/dotnet/Commands/Fsi/FsiCommandParser.cs
index e5326fc49d7e..2ba1f8075655 100644
--- a/src/Cli/dotnet/Commands/Fsi/FsiCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Fsi/FsiCommandParser.cs
@@ -9,16 +9,16 @@ internal static class FsiCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-fsi";
 
-    public static readonly CliArgument<string[]> Arguments = new("arguments");
+    public static readonly Argument<string[]> Arguments = new("arguments");
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         DocumentedCommand command = new("fsi", DocsLink) { Arguments };
 
diff --git a/src/Cli/dotnet/Commands/Help/HelpCommandParser.cs b/src/Cli/dotnet/Commands/Help/HelpCommandParser.cs
index b2f9b94bee3a..025b1be4b153 100644
--- a/src/Cli/dotnet/Commands/Help/HelpCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Help/HelpCommandParser.cs
@@ -9,20 +9,20 @@ internal static class HelpCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-help";
 
-    public static readonly CliArgument<string[]> Argument = new(CliCommandStrings.CommandArgumentName)
+    public static readonly Argument<string[]> Argument = new(CliCommandStrings.CommandArgumentName)
     {
         Description = CliCommandStrings.CommandArgumentDescription,
         Arity = ArgumentArity.ZeroOrMore
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         DocumentedCommand command = new("help", DocsLink, CliCommandStrings.HelpAppFullName);
 
diff --git a/src/Cli/dotnet/Commands/Hidden/Add/AddCommandParser.cs b/src/Cli/dotnet/Commands/Hidden/Add/AddCommandParser.cs
index c7c77d619436..36eb69acf7e3 100644
--- a/src/Cli/dotnet/Commands/Hidden/Add/AddCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Hidden/Add/AddCommandParser.cs
@@ -12,19 +12,19 @@ internal static class AddCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-add";
 
-    public static readonly CliArgument<string> ProjectArgument = new CliArgument<string>(CliStrings.ProjectArgumentName)
+    public static readonly Argument<string> ProjectArgument = new Argument<string>(CliStrings.ProjectArgumentName)
     {
         Description = CliStrings.ProjectArgumentDescription
     }.DefaultToCurrentDirectory();
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         var command = new DocumentedCommand("add", DocsLink, CliCommandStrings.NetAddCommand)
         {
diff --git a/src/Cli/dotnet/Commands/Hidden/Add/Package/AddPackageCommandParser.cs b/src/Cli/dotnet/Commands/Hidden/Add/Package/AddPackageCommandParser.cs
index c221ddc475f3..88ea4685b511 100644
--- a/src/Cli/dotnet/Commands/Hidden/Add/Package/AddPackageCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Hidden/Add/Package/AddPackageCommandParser.cs
@@ -10,16 +10,16 @@ namespace Microsoft.DotNet.Cli.Commands.Hidden.Add.Package;
 
 internal static class AddPackageCommandParser
 {
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("package", CliCommandStrings.PackageAddAppFullName);
+        Command command = new("package", CliCommandStrings.PackageAddAppFullName);
 
         command.Arguments.Add(PackageAddCommandParser.CmdPackageArgument);
         command.Options.Add(PackageAddCommandParser.VersionOption);
diff --git a/src/Cli/dotnet/Commands/Hidden/Add/Reference/AddReferenceCommandParser.cs b/src/Cli/dotnet/Commands/Hidden/Add/Reference/AddReferenceCommandParser.cs
index f649e57b231f..8e4d6f0fe5fe 100644
--- a/src/Cli/dotnet/Commands/Hidden/Add/Reference/AddReferenceCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Hidden/Add/Reference/AddReferenceCommandParser.cs
@@ -9,16 +9,16 @@ namespace Microsoft.DotNet.Cli.Commands.Hidden.Add.Reference;
 
 internal static class AddReferenceCommandParser
 {
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("reference", CliCommandStrings.ReferenceAddAppFullName);
+        Command command = new("reference", CliCommandStrings.ReferenceAddAppFullName);
 
         command.Arguments.Add(ReferenceAddCommandParser.ProjectPathArgument);
         command.Options.Add(ReferenceAddCommandParser.FrameworkOption);
diff --git a/src/Cli/dotnet/Commands/Hidden/Complete/CompleteCommandParser.cs b/src/Cli/dotnet/Commands/Hidden/Complete/CompleteCommandParser.cs
index eeb8ecd4f654..b617808a8b6c 100644
--- a/src/Cli/dotnet/Commands/Hidden/Complete/CompleteCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Hidden/Complete/CompleteCommandParser.cs
@@ -7,23 +7,23 @@ namespace Microsoft.DotNet.Cli.Commands.Hidden.Complete;
 
 internal static class CompleteCommandParser
 {
-    public static readonly CliArgument<string> PathArgument = new("path");
+    public static readonly Argument<string> PathArgument = new("path");
 
-    public static readonly CliOption<int?> PositionOption = new("--position")
+    public static readonly Option<int?> PositionOption = new("--position")
     {
         HelpName = "command"
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("complete")
+        Command command = new("complete")
         {
             Hidden = true
         };
diff --git a/src/Cli/dotnet/Commands/Hidden/InternalReportInstallSuccess/InternalReportInstallSuccessCommandParser.cs b/src/Cli/dotnet/Commands/Hidden/InternalReportInstallSuccess/InternalReportInstallSuccessCommandParser.cs
index 8d1f309753ea..d9bac50bb06e 100644
--- a/src/Cli/dotnet/Commands/Hidden/InternalReportInstallSuccess/InternalReportInstallSuccessCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Hidden/InternalReportInstallSuccess/InternalReportInstallSuccessCommandParser.cs
@@ -7,18 +7,18 @@ namespace Microsoft.DotNet.Cli.Commands.Hidden.InternalReportInstallSuccess;
 
 internal static class InternalReportInstallSuccessCommandParser
 {
-    public static readonly CliArgument<string> Argument = new("internal-reportinstallsuccess-arg");
+    public static readonly Argument<string> Argument = new("internal-reportinstallsuccess-arg");
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("internal-reportinstallsuccess")
+        Command command = new("internal-reportinstallsuccess")
         {
             Hidden = true
         };
diff --git a/src/Cli/dotnet/Commands/Hidden/List/ListCommandParser.cs b/src/Cli/dotnet/Commands/Hidden/List/ListCommandParser.cs
index 7e0829ae13b6..f967e1d9fc2e 100644
--- a/src/Cli/dotnet/Commands/Hidden/List/ListCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Hidden/List/ListCommandParser.cs
@@ -12,23 +12,23 @@ internal static class ListCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-list";
 
-    public static readonly CliArgument<string> SlnOrProjectArgument = CreateSlnOrProjectArgument(CliStrings.SolutionOrProjectArgumentName, CliStrings.SolutionOrProjectArgumentDescription);
+    public static readonly Argument<string> SlnOrProjectArgument = CreateSlnOrProjectArgument(CliStrings.SolutionOrProjectArgumentName, CliStrings.SolutionOrProjectArgumentDescription);
 
-    internal static CliArgument<string> CreateSlnOrProjectArgument(string name, string description)
-        => new CliArgument<string>(name)
+    internal static Argument<string> CreateSlnOrProjectArgument(string name, string description)
+        => new Argument<string>(name)
         {
             Description = description,
             Arity = ArgumentArity.ZeroOrOne
         }.DefaultToCurrentDirectory();
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         var command = new DocumentedCommand("list", DocsLink, CliCommandStrings.NetListCommand)
         {
diff --git a/src/Cli/dotnet/Commands/Hidden/List/Package/ListPackageCommandParser.cs b/src/Cli/dotnet/Commands/Hidden/List/Package/ListPackageCommandParser.cs
index c491827a12cd..05a40a6d5e70 100644
--- a/src/Cli/dotnet/Commands/Hidden/List/Package/ListPackageCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Hidden/List/Package/ListPackageCommandParser.cs
@@ -8,16 +8,16 @@ namespace Microsoft.DotNet.Cli.Commands.Hidden.List.Package;
 
 internal static class ListPackageCommandParser
 {
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("package", CliCommandStrings.PackageListAppFullName);
+        Command command = new("package", CliCommandStrings.PackageListAppFullName);
 
         command.Options.Add(PackageListCommandParser.VerbosityOption);
         command.Options.Add(PackageListCommandParser.OutdatedOption);
diff --git a/src/Cli/dotnet/Commands/Hidden/List/Reference/ListReferenceCommandParser.cs b/src/Cli/dotnet/Commands/Hidden/List/Reference/ListReferenceCommandParser.cs
index 470d617d0606..8ba84c36dfc2 100644
--- a/src/Cli/dotnet/Commands/Hidden/List/Reference/ListReferenceCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Hidden/List/Reference/ListReferenceCommandParser.cs
@@ -8,18 +8,18 @@ namespace Microsoft.DotNet.Cli.Commands.Hidden.List.Reference;
 
 internal static class ListReferenceCommandParser
 {
-    public static readonly CliArgument<string> Argument = new("argument") { Arity = ArgumentArity.ZeroOrOne, Hidden = true };
+    public static readonly Argument<string> Argument = new("argument") { Arity = ArgumentArity.ZeroOrOne, Hidden = true };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        var command = new CliCommand("reference", CliCommandStrings.ReferenceListAppFullName);
+        var command = new Command("reference", CliCommandStrings.ReferenceListAppFullName);
 
         command.Arguments.Add(Argument);
 
diff --git a/src/Cli/dotnet/Commands/Hidden/Parse/ParseCommandParser.cs b/src/Cli/dotnet/Commands/Hidden/Parse/ParseCommandParser.cs
index 60ebcd933410..4f03f788914f 100644
--- a/src/Cli/dotnet/Commands/Hidden/Parse/ParseCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Hidden/Parse/ParseCommandParser.cs
@@ -7,16 +7,16 @@ namespace Microsoft.DotNet.Cli.Commands.Hidden.Parse;
 
 internal static class ParseCommandParser
 {
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        var command = new CliCommand("parse")
+        var command = new Command("parse")
         {
             Hidden = true
         };
diff --git a/src/Cli/dotnet/Commands/Hidden/Remove/Package/RemovePackageCommandParser.cs b/src/Cli/dotnet/Commands/Hidden/Remove/Package/RemovePackageCommandParser.cs
index b1c4a724bfd7..51eb32535cc2 100644
--- a/src/Cli/dotnet/Commands/Hidden/Remove/Package/RemovePackageCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Hidden/Remove/Package/RemovePackageCommandParser.cs
@@ -8,16 +8,16 @@ namespace Microsoft.DotNet.Cli.Commands.Hidden.Remove.Package;
 
 internal static class RemovePackageCommandParser
 {
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        var command = new CliCommand("package", CliCommandStrings.PackageRemoveAppFullName);
+        var command = new Command("package", CliCommandStrings.PackageRemoveAppFullName);
 
         command.Arguments.Add(PackageRemoveCommandParser.CmdPackageArgument);
         command.Options.Add(PackageRemoveCommandParser.InteractiveOption);
diff --git a/src/Cli/dotnet/Commands/Hidden/Remove/Reference/RemoveReferenceCommandParser.cs b/src/Cli/dotnet/Commands/Hidden/Remove/Reference/RemoveReferenceCommandParser.cs
index 1dc6310c3717..1a2b6634f013 100644
--- a/src/Cli/dotnet/Commands/Hidden/Remove/Reference/RemoveReferenceCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Hidden/Remove/Reference/RemoveReferenceCommandParser.cs
@@ -8,16 +8,16 @@ namespace Microsoft.DotNet.Cli.Commands.Hidden.Remove.Reference;
 
 internal static class RemoveReferenceCommandParser
 {
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        var command = new CliCommand("reference", CliCommandStrings.ReferenceRemoveAppFullName);
+        var command = new Command("reference", CliCommandStrings.ReferenceRemoveAppFullName);
 
         command.Arguments.Add(ReferenceRemoveCommandParser.ProjectPathArgument);
         command.Options.Add(ReferenceRemoveCommandParser.FrameworkOption);
diff --git a/src/Cli/dotnet/Commands/Hidden/Remove/RemoveCommandParser.cs b/src/Cli/dotnet/Commands/Hidden/Remove/RemoveCommandParser.cs
index 91c1896d347e..9dfbf8b6ac71 100644
--- a/src/Cli/dotnet/Commands/Hidden/Remove/RemoveCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Hidden/Remove/RemoveCommandParser.cs
@@ -12,19 +12,19 @@ internal static class RemoveCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-remove";
 
-    public static readonly CliArgument<string> ProjectArgument = new CliArgument<string>(CliStrings.ProjectArgumentName)
+    public static readonly Argument<string> ProjectArgument = new Argument<string>(CliStrings.ProjectArgumentName)
     {
         Description = CliStrings.ProjectArgumentDescription
     }.DefaultToCurrentDirectory();
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         var command = new DocumentedCommand("remove", DocsLink, CliCommandStrings.NetRemoveCommand)
         {
diff --git a/src/Cli/dotnet/Commands/MSBuild/MSBuildCommandParser.cs b/src/Cli/dotnet/Commands/MSBuild/MSBuildCommandParser.cs
index c7b088d7cf35..ca2ad284a12b 100644
--- a/src/Cli/dotnet/Commands/MSBuild/MSBuildCommandParser.cs
+++ b/src/Cli/dotnet/Commands/MSBuild/MSBuildCommandParser.cs
@@ -9,16 +9,16 @@ internal static class MSBuildCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-msbuild";
 
-    public static readonly CliArgument<string[]> Arguments = new("arguments");
+    public static readonly Argument<string[]> Arguments = new("arguments");
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         var command = new DocumentedCommand("msbuild", DocsLink, CliCommandStrings.BuildAppFullName)
         {
diff --git a/src/Cli/dotnet/Commands/New/NewCommandParser.cs b/src/Cli/dotnet/Commands/New/NewCommandParser.cs
index d7a7d19dda64..b5bc83c44deb 100644
--- a/src/Cli/dotnet/Commands/New/NewCommandParser.cs
+++ b/src/Cli/dotnet/Commands/New/NewCommandParser.cs
@@ -17,6 +17,7 @@
 using Microsoft.TemplateEngine.Cli;
 using Microsoft.TemplateEngine.Cli.Commands;
 using Microsoft.TemplateEngine.Cli.PostActionProcessors;
+using Command = System.CommandLine.Command;
 
 namespace Microsoft.DotNet.Cli.Commands.New;
 
@@ -31,14 +32,14 @@ internal static class NewCommandParser
 
     private const VerbosityOptions DefaultVerbosity = VerbosityOptions.normal;
 
-    private static readonly CliOption<bool> s_disableSdkTemplatesOption = new CliOption<bool>("--debug:disable-sdk-templates")
+    private static readonly Option<bool> s_disableSdkTemplatesOption = new Option<bool>("--debug:disable-sdk-templates")
     {
         DefaultValueFactory = static _ => false,
         Description = CliCommandStrings.DisableSdkTemplates_OptionDescription,
         Recursive = true
     }.Hide();
 
-    private static readonly CliOption<bool> s_disableProjectContextEvaluationOption = new CliOption<bool>(
+    private static readonly Option<bool> s_disableProjectContextEvaluationOption = new Option<bool>(
         "--debug:disable-project-context")
     {
         DefaultValueFactory = static _ => false,
@@ -46,7 +47,7 @@ internal static class NewCommandParser
         Recursive = true
     }.Hide();
 
-    private static readonly CliOption<VerbosityOptions> s_verbosityOption = new("--verbosity", "-v")
+    private static readonly Option<VerbosityOptions> s_verbosityOption = new("--verbosity", "-v")
     {
         DefaultValueFactory = _ => DefaultVerbosity,
         Description = CliCommandStrings.Verbosity_OptionDescription,
@@ -54,16 +55,16 @@ internal static class NewCommandParser
         Recursive = true
     };
 
-    private static readonly CliOption<bool> s_diagnosticOption =
+    private static readonly Option<bool> s_diagnosticOption =
         CommonOptionsFactory
             .CreateDiagnosticsOption(recursive: true)
             .WithDescription(CliCommandStrings.Diagnostics_OptionDescription);
 
-    internal static readonly CliCommand s_command = GetCommand();
+    internal static readonly Command s_command = GetCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
-        CliCommand command = NewCommandFactory.Create(CommandName, (Func<ParseResult, CliTemplateEngineHost>)GetEngineHost);
+        Command command = NewCommandFactory.Create(CommandName, (Func<ParseResult, CliTemplateEngineHost>)GetEngineHost);
         command.Options.Add(s_disableSdkTemplatesOption);
         command.Options.Add(s_disableProjectContextEvaluationOption);
         command.Options.Add(s_verbosityOption);
diff --git a/src/Cli/dotnet/Commands/NuGet/NuGetCommandParser.cs b/src/Cli/dotnet/Commands/NuGet/NuGetCommandParser.cs
index 311a7528e27a..2381fa0c2452 100644
--- a/src/Cli/dotnet/Commands/NuGet/NuGetCommandParser.cs
+++ b/src/Cli/dotnet/Commands/NuGet/NuGetCommandParser.cs
@@ -13,14 +13,14 @@ internal static class NuGetCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-nuget";
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         var command = new DocumentedCommand("nuget", DocsLink)
         {
@@ -28,11 +28,11 @@ private static CliCommand ConstructCommand()
             TreatUnmatchedTokensAsErrors = false
         };
 
-        command.Options.Add(new CliOption<bool>("--version")
+        command.Options.Add(new Option<bool>("--version")
         {
             Arity = ArgumentArity.Zero
         });
-        command.Options.Add(new CliOption<string>("--verbosity", "-v"));
+        command.Options.Add(new Option<string>("--verbosity", "-v"));
 
         command.Subcommands.Add(GetDeleteCommand());
         command.Subcommands.Add(GetLocalsCommand());
@@ -47,21 +47,21 @@ private static CliCommand ConstructCommand()
         return command;
     }
 
-    private static CliCommand GetDeleteCommand()
+    private static Command GetDeleteCommand()
     {
-        CliCommand deleteCommand = new("delete");
-        deleteCommand.Arguments.Add(new CliArgument<IEnumerable<string>>("package-paths") { Arity = ArgumentArity.OneOrMore });
-        deleteCommand.Options.Add(new CliOption<bool>("--force-english-output")
+        Command deleteCommand = new("delete");
+        deleteCommand.Arguments.Add(new Argument<IEnumerable<string>>("package-paths") { Arity = ArgumentArity.OneOrMore });
+        deleteCommand.Options.Add(new Option<bool>("--force-english-output")
         {
             Arity = ArgumentArity.Zero
         });
-        deleteCommand.Options.Add(new CliOption<string>("--source", "-s"));
-        deleteCommand.Options.Add(new CliOption<bool>("--non-interactive")
+        deleteCommand.Options.Add(new Option<string>("--source", "-s"));
+        deleteCommand.Options.Add(new Option<bool>("--non-interactive")
         {
             Arity = ArgumentArity.Zero
         });
-        deleteCommand.Options.Add(new CliOption<string>("--api-key", "-k"));
-        deleteCommand.Options.Add(new CliOption<bool>("--no-service-endpoint")
+        deleteCommand.Options.Add(new Option<string>("--api-key", "-k"));
+        deleteCommand.Options.Add(new Option<bool>("--no-service-endpoint")
         {
             Arity = ArgumentArity.Zero
         });
@@ -72,24 +72,24 @@ private static CliCommand GetDeleteCommand()
         return deleteCommand;
     }
 
-    private static CliCommand GetLocalsCommand()
+    private static Command GetLocalsCommand()
     {
-        CliCommand localsCommand = new("locals");
+        Command localsCommand = new("locals");
 
-        CliArgument<string> foldersArgument = new("folders");
+        Argument<string> foldersArgument = new("folders");
         foldersArgument.AcceptOnlyFromAmong(["all", "http-cache", "global-packages", "plugins-cache", "temp"]);
 
         localsCommand.Arguments.Add(foldersArgument);
 
-        localsCommand.Options.Add(new CliOption<bool>("--force-english-output")
+        localsCommand.Options.Add(new Option<bool>("--force-english-output")
         {
             Arity = ArgumentArity.Zero
         });
-        localsCommand.Options.Add(new CliOption<bool>("--clear", "-c")
+        localsCommand.Options.Add(new Option<bool>("--clear", "-c")
         {
             Arity = ArgumentArity.Zero
         });
-        localsCommand.Options.Add(new CliOption<bool>("--list", "-l")
+        localsCommand.Options.Add(new Option<bool>("--list", "-l")
         {
             Arity = ArgumentArity.Zero
         });
@@ -99,53 +99,53 @@ private static CliCommand GetLocalsCommand()
         return localsCommand;
     }
 
-    private static CliCommand GetPushCommand()
+    private static Command GetPushCommand()
     {
-        CliCommand pushCommand = new("push");
+        Command pushCommand = new("push");
 
-        pushCommand.Arguments.Add(new CliArgument<IEnumerable<string>>("package-paths") { Arity = ArgumentArity.OneOrMore });
+        pushCommand.Arguments.Add(new Argument<IEnumerable<string>>("package-paths") { Arity = ArgumentArity.OneOrMore });
 
-        pushCommand.Options.Add(new CliOption<bool>("--force-english-output")
+        pushCommand.Options.Add(new Option<bool>("--force-english-output")
         {
             Arity = ArgumentArity.Zero
         });
-        pushCommand.Options.Add(new CliOption<string>("--source", "-s"));
-        pushCommand.Options.Add(new CliOption<string>("--symbol-source", "-ss"));
-        pushCommand.Options.Add(new CliOption<string>("--timeout", "-t"));
-        pushCommand.Options.Add(new CliOption<string>("--api-key", "-k"));
-        pushCommand.Options.Add(new CliOption<string>("--symbol-api-key", "-sk"));
-        pushCommand.Options.Add(new CliOption<bool>("--disable-buffering", "-d")
+        pushCommand.Options.Add(new Option<string>("--source", "-s"));
+        pushCommand.Options.Add(new Option<string>("--symbol-source", "-ss"));
+        pushCommand.Options.Add(new Option<string>("--timeout", "-t"));
+        pushCommand.Options.Add(new Option<string>("--api-key", "-k"));
+        pushCommand.Options.Add(new Option<string>("--symbol-api-key", "-sk"));
+        pushCommand.Options.Add(new Option<bool>("--disable-buffering", "-d")
         {
             Arity = ArgumentArity.Zero
         });
-        pushCommand.Options.Add(new CliOption<bool>("--no-symbols", "-n")
+        pushCommand.Options.Add(new Option<bool>("--no-symbols", "-n")
         {
             Arity = ArgumentArity.Zero
         });
-        pushCommand.Options.Add(new CliOption<bool>("--no-service-endpoint")
+        pushCommand.Options.Add(new Option<bool>("--no-service-endpoint")
         {
             Arity = ArgumentArity.Zero
         });
         pushCommand.Options.Add(CommonOptions.InteractiveOption());
-        pushCommand.Options.Add(new CliOption<bool>("--skip-duplicate")
+        pushCommand.Options.Add(new Option<bool>("--skip-duplicate")
         {
             Arity = ArgumentArity.Zero
         });
-        pushCommand.Options.Add(new CliOption<string>("--configfile"));
+        pushCommand.Options.Add(new Option<string>("--configfile"));
 
         pushCommand.SetAction(NuGetCommand.Run);
 
         return pushCommand;
     }
 
-    private static CliCommand GetVerifyCommand()
+    private static Command GetVerifyCommand()
     {
         const string fingerprint = "--certificate-fingerprint";
-        CliCommand verifyCommand = new("verify");
+        Command verifyCommand = new("verify");
 
-        verifyCommand.Arguments.Add(new CliArgument<IEnumerable<string>>("package-paths") { Arity = ArgumentArity.OneOrMore });
+        verifyCommand.Arguments.Add(new Argument<IEnumerable<string>>("package-paths") { Arity = ArgumentArity.OneOrMore });
 
-        verifyCommand.Options.Add(new CliOption<bool>("--all")
+        verifyCommand.Options.Add(new Option<bool>("--all")
         {
             Arity = ArgumentArity.Zero
         });
@@ -159,17 +159,17 @@ private static CliCommand GetVerifyCommand()
         return verifyCommand;
     }
 
-    private static CliCommand GetTrustCommand()
+    private static Command GetTrustCommand()
     {
-        CliCommand trustCommand = new("trust");
+        Command trustCommand = new("trust");
 
-        CliOption<bool> allowUntrustedRoot = new("--allow-untrusted-root")
+        Option<bool> allowUntrustedRoot = new("--allow-untrusted-root")
         {
             Arity = ArgumentArity.Zero
         };
-        CliOption<string> owners = new("--owners");
+        Option<string> owners = new("--owners");
 
-        trustCommand.Subcommands.Add(new CliCommand("list"));
+        trustCommand.Subcommands.Add(new Command("list"));
         trustCommand.Subcommands.Add(AuthorCommand());
         trustCommand.Subcommands.Add(RepositoryCommand());
         trustCommand.Subcommands.Add(SourceCommand());
@@ -177,7 +177,7 @@ private static CliCommand GetTrustCommand()
         trustCommand.Subcommands.Add(RemoveCommand());
         trustCommand.Subcommands.Add(SyncCommand());
 
-        CliOption<string> configFile = new("--configfile");
+        Option<string> configFile = new("--configfile");
 
         // now set global options for all nuget commands: configfile, verbosity
         // as well as the standard NugetCommand.Run handler
@@ -193,70 +193,70 @@ private static CliCommand GetTrustCommand()
             command.SetAction(NuGetCommand.Run);
         }
 
-        CliCommand AuthorCommand() => new("author") {
-            new CliArgument<string>("NAME"),
-            new CliArgument<string>("PACKAGE"),
+        Command AuthorCommand() => new("author") {
+            new Argument<string>("NAME"),
+            new Argument<string>("PACKAGE"),
             allowUntrustedRoot,
         };
 
-        CliCommand RepositoryCommand() => new("repository") {
-            new CliArgument<string>("NAME"),
-            new CliArgument<string>("PACKAGE"),
+        Command RepositoryCommand() => new("repository") {
+            new Argument<string>("NAME"),
+            new Argument<string>("PACKAGE"),
             allowUntrustedRoot,
             owners
         };
 
-        CliCommand SourceCommand() => new("source") {
-            new CliArgument<string>("NAME"),
+        Command SourceCommand() => new("source") {
+            new Argument<string>("NAME"),
             owners,
-            new CliOption<string>("--source-url"),
+            new Option<string>("--source-url"),
         };
 
-        CliCommand CertificateCommand()
+        Command CertificateCommand()
         {
-            CliOption<string> algorithm = new("--algorithm")
+            Option<string> algorithm = new("--algorithm")
             {
                 DefaultValueFactory = (_argResult) => "SHA256"
             };
             algorithm.AcceptOnlyFromAmong("SHA256", "SHA384", "SHA512");
 
-            return new CliCommand("certificate") {
-                new CliArgument<string>("NAME"),
-                new CliArgument<string>("FINGERPRINT"),
+            return new Command("certificate") {
+                new Argument<string>("NAME"),
+                new Argument<string>("FINGERPRINT"),
                 allowUntrustedRoot,
                 algorithm
             };
         }
         ;
 
-        CliCommand RemoveCommand() => new("remove") {
-            new CliArgument<string>("NAME"),
+        Command RemoveCommand() => new("remove") {
+            new Argument<string>("NAME"),
         };
 
-        CliCommand SyncCommand() => new("sync") {
-            new CliArgument<string>("NAME"),
+        Command SyncCommand() => new("sync") {
+            new Argument<string>("NAME"),
         };
 
         return trustCommand;
     }
 
-    private static CliCommand GetSignCommand()
+    private static Command GetSignCommand()
     {
-        CliCommand signCommand = new("sign");
-
-        signCommand.Arguments.Add(new CliArgument<IEnumerable<string>>("package-paths") { Arity = ArgumentArity.OneOrMore });
-
-        signCommand.Options.Add(new CliOption<string>("--output", "-o"));
-        signCommand.Options.Add(new CliOption<string>("--certificate-path"));
-        signCommand.Options.Add(new CliOption<string>("--certificate-store-name"));
-        signCommand.Options.Add(new CliOption<string>("--certificate-store-location"));
-        signCommand.Options.Add(new CliOption<string>("--certificate-subject-name"));
-        signCommand.Options.Add(new CliOption<string>("--certificate-fingerprint"));
-        signCommand.Options.Add(new CliOption<string>("--certificate-password"));
-        signCommand.Options.Add(new CliOption<string>("--hash-algorithm"));
-        signCommand.Options.Add(new CliOption<string>("--timestamper"));
-        signCommand.Options.Add(new CliOption<string>("--timestamp-hash-algorithm"));
-        signCommand.Options.Add(new CliOption<bool>("--overwrite")
+        Command signCommand = new("sign");
+
+        signCommand.Arguments.Add(new Argument<IEnumerable<string>>("package-paths") { Arity = ArgumentArity.OneOrMore });
+
+        signCommand.Options.Add(new Option<string>("--output", "-o"));
+        signCommand.Options.Add(new Option<string>("--certificate-path"));
+        signCommand.Options.Add(new Option<string>("--certificate-store-name"));
+        signCommand.Options.Add(new Option<string>("--certificate-store-location"));
+        signCommand.Options.Add(new Option<string>("--certificate-subject-name"));
+        signCommand.Options.Add(new Option<string>("--certificate-fingerprint"));
+        signCommand.Options.Add(new Option<string>("--certificate-password"));
+        signCommand.Options.Add(new Option<string>("--hash-algorithm"));
+        signCommand.Options.Add(new Option<string>("--timestamper"));
+        signCommand.Options.Add(new Option<string>("--timestamp-hash-algorithm"));
+        signCommand.Options.Add(new Option<bool>("--overwrite")
         {
             Arity = ArgumentArity.Zero
         });
diff --git a/src/Cli/dotnet/Commands/Pack/PackCommandParser.cs b/src/Cli/dotnet/Commands/Pack/PackCommandParser.cs
index 5509fef188ea..f3adb9642154 100644
--- a/src/Cli/dotnet/Commands/Pack/PackCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Pack/PackCommandParser.cs
@@ -11,60 +11,60 @@ internal static class PackCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-pack";
 
-    public static readonly CliArgument<IEnumerable<string>> SlnOrProjectArgument = new(CliStrings.SolutionOrProjectArgumentName)
+    public static readonly Argument<IEnumerable<string>> SlnOrProjectArgument = new(CliStrings.SolutionOrProjectArgumentName)
     {
         Description = CliStrings.SolutionOrProjectArgumentDescription,
         Arity = ArgumentArity.ZeroOrMore
     };
 
-    public static readonly CliOption<string> OutputOption = new ForwardedOption<string>("--output", "-o")
+    public static readonly Option<string> OutputOption = new ForwardedOption<string>("--output", "-o")
     {
         Description = CliCommandStrings.PackCmdOutputDirDescription,
         HelpName = CliCommandStrings.PackCmdOutputDir
     }.ForwardAsSingle(o => $"-property:PackageOutputPath={CommandDirectoryContext.GetFullPath(o)}");
 
-    public static readonly CliOption<bool> NoBuildOption = new ForwardedOption<bool>("--no-build")
+    public static readonly Option<bool> NoBuildOption = new ForwardedOption<bool>("--no-build")
     {
         Description = CliCommandStrings.CmdNoBuildOptionDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:NoBuild=true");
 
-    public static readonly CliOption<bool> IncludeSymbolsOption = new ForwardedOption<bool>("--include-symbols")
+    public static readonly Option<bool> IncludeSymbolsOption = new ForwardedOption<bool>("--include-symbols")
     {
         Description = CliCommandStrings.CmdIncludeSymbolsDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:IncludeSymbols=true");
 
-    public static readonly CliOption<bool> IncludeSourceOption = new ForwardedOption<bool>("--include-source")
+    public static readonly Option<bool> IncludeSourceOption = new ForwardedOption<bool>("--include-source")
     {
         Description = CliCommandStrings.CmdIncludeSourceDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:IncludeSource=true");
 
-    public static readonly CliOption<bool> ServiceableOption = new ForwardedOption<bool>("--serviceable", "-s")
+    public static readonly Option<bool> ServiceableOption = new ForwardedOption<bool>("--serviceable", "-s")
     {
         Description = CliCommandStrings.CmdServiceableDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:Serviceable=true");
 
-    public static readonly CliOption<bool> NoLogoOption = new ForwardedOption<bool>("--nologo")
+    public static readonly Option<bool> NoLogoOption = new ForwardedOption<bool>("--nologo")
     {
         Description = CliCommandStrings.PackCmdNoLogo,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-nologo");
 
-    public static readonly CliOption<bool> NoRestoreOption = CommonOptions.NoRestoreOption;
+    public static readonly Option<bool> NoRestoreOption = CommonOptions.NoRestoreOption;
 
-    public static readonly CliOption<string> ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.PackConfigurationOptionDescription);
+    public static readonly Option<string> ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.PackConfigurationOptionDescription);
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         var command = new DocumentedCommand("pack", DocsLink, CliCommandStrings.PackAppFullName);
 
diff --git a/src/Cli/dotnet/Commands/Package/Add/PackageAddCommandParser.cs b/src/Cli/dotnet/Commands/Package/Add/PackageAddCommandParser.cs
index ea394d0634c0..d656b801bb32 100644
--- a/src/Cli/dotnet/Commands/Package/Add/PackageAddCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Package/Add/PackageAddCommandParser.cs
@@ -44,7 +44,7 @@ public static PackageIdentity ParsePackageIdentity(ArgumentResult packageArgResu
         };
     }
 
-    public static readonly CliArgument<PackageIdentity> CmdPackageArgument = new DynamicArgument<PackageIdentity>(CliCommandStrings.CmdPackage)
+    public static readonly Argument<PackageIdentity> CmdPackageArgument = new DynamicArgument<PackageIdentity>(CliCommandStrings.CmdPackage)
     {
         Description = CliCommandStrings.CmdPackageDescription,
         Arity = ArgumentArity.ExactlyOne,
@@ -57,7 +57,7 @@ public static PackageIdentity ParsePackageIdentity(ArgumentResult packageArgResu
         return QueryNuGet(context.WordToComplete, allowPrerelease, CancellationToken.None).Result.Select(packageId => new CompletionItem(packageId));
     });
 
-    public static readonly CliOption<string> VersionOption = new DynamicForwardedOption<string>("--version", "-v")
+    public static readonly Option<string> VersionOption = new DynamicForwardedOption<string>("--version", "-v")
     {
         Description = CliCommandStrings.CmdVersionDescription,
         HelpName = CliCommandStrings.CmdVersion
@@ -79,48 +79,48 @@ public static PackageIdentity ParsePackageIdentity(ArgumentResult packageArgResu
             }
         });
 
-    public static readonly CliOption<string> FrameworkOption = new ForwardedOption<string>("--framework", "-f")
+    public static readonly Option<string> FrameworkOption = new ForwardedOption<string>("--framework", "-f")
     {
         Description = CliCommandStrings.PackageAddCmdFrameworkDescription,
         HelpName = CliCommandStrings.PackageAddCmdFramework
     }.ForwardAsSingle(o => $"--framework {o}");
 
-    public static readonly CliOption<bool> NoRestoreOption = new("--no-restore", "-n")
+    public static readonly Option<bool> NoRestoreOption = new("--no-restore", "-n")
     {
         Description = CliCommandStrings.PackageAddCmdNoRestoreDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<string> SourceOption = new ForwardedOption<string>("--source", "-s")
+    public static readonly Option<string> SourceOption = new ForwardedOption<string>("--source", "-s")
     {
         Description = CliCommandStrings.PackageAddCmdSourceDescription,
         HelpName = CliCommandStrings.PackageAddCmdSource
     }.ForwardAsSingle(o => $"--source {o}");
 
-    public static readonly CliOption<string> PackageDirOption = new ForwardedOption<string>("--package-directory")
+    public static readonly Option<string> PackageDirOption = new ForwardedOption<string>("--package-directory")
     {
         Description = CliCommandStrings.CmdPackageDirectoryDescription,
         HelpName = CliCommandStrings.CmdPackageDirectory
     }.ForwardAsSingle(o => $"--package-directory {o}");
 
-    public static readonly CliOption<bool> InteractiveOption = CommonOptions.InteractiveOption().ForwardIfEnabled("--interactive");
+    public static readonly Option<bool> InteractiveOption = CommonOptions.InteractiveOption().ForwardIfEnabled("--interactive");
 
-    public static readonly CliOption<bool> PrereleaseOption = new ForwardedOption<bool>("--prerelease")
+    public static readonly Option<bool> PrereleaseOption = new ForwardedOption<bool>("--prerelease")
     {
         Description = CliStrings.CommandPrereleaseOptionDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("--prerelease");
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("add", CliCommandStrings.PackageAddAppFullName);
+        Command command = new("add", CliCommandStrings.PackageAddAppFullName);
 
         VersionOption.Validators.Add(DisallowVersionIfPackageIdentityHasVersionValidator);
         command.Arguments.Add(CmdPackageArgument);
diff --git a/src/Cli/dotnet/Commands/Package/List/PackageListCommand.cs b/src/Cli/dotnet/Commands/Package/List/PackageListCommand.cs
index 04bbeffc7493..bdba947c7b8b 100644
--- a/src/Cli/dotnet/Commands/Package/List/PackageListCommand.cs
+++ b/src/Cli/dotnet/Commands/Package/List/PackageListCommand.cs
@@ -33,8 +33,8 @@ public override int Execute()
 
         if (!noRestore)
         {
-            ReportOutputFormat formatOption = _parseResult.GetValue((CliOption<ReportOutputFormat>)PackageListCommandParser.FormatOption);
-            bool interactive = _parseResult.GetValue((CliOption<bool>)PackageListCommandParser.InteractiveOption);
+            ReportOutputFormat formatOption = _parseResult.GetValue((Option<ReportOutputFormat>)PackageListCommandParser.FormatOption);
+            bool interactive = _parseResult.GetValue((Option<bool>)PackageListCommandParser.InteractiveOption);
             restoreExitCode = RunRestore(projectFile, formatOption, interactive);
         }
 
diff --git a/src/Cli/dotnet/Commands/Package/List/PackageListCommandParser.cs b/src/Cli/dotnet/Commands/Package/List/PackageListCommandParser.cs
index 88904d6de15a..d2b32375d538 100644
--- a/src/Cli/dotnet/Commands/Package/List/PackageListCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Package/List/PackageListCommandParser.cs
@@ -8,102 +8,102 @@ namespace Microsoft.DotNet.Cli.Commands.Package.List;
 
 internal static class PackageListCommandParser
 {
-    public static readonly CliOption OutdatedOption = new ForwardedOption<bool>("--outdated")
+    public static readonly Option OutdatedOption = new ForwardedOption<bool>("--outdated")
     {
         Description = CliCommandStrings.CmdOutdatedDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("--outdated");
 
-    public static readonly CliOption DeprecatedOption = new ForwardedOption<bool>("--deprecated")
+    public static readonly Option DeprecatedOption = new ForwardedOption<bool>("--deprecated")
     {
         Description = CliCommandStrings.CmdDeprecatedDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("--deprecated");
 
-    public static readonly CliOption VulnerableOption = new ForwardedOption<bool>("--vulnerable")
+    public static readonly Option VulnerableOption = new ForwardedOption<bool>("--vulnerable")
     {
         Description = CliCommandStrings.CmdVulnerableDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("--vulnerable");
 
-    public static readonly CliOption FrameworkOption = new ForwardedOption<IEnumerable<string>>("--framework", "-f")
+    public static readonly Option FrameworkOption = new ForwardedOption<IEnumerable<string>>("--framework", "-f")
     {
         Description = CliCommandStrings.PackageListCmdFrameworkDescription,
         HelpName = CliCommandStrings.PackageListCmdFramework
     }.ForwardAsManyArgumentsEachPrefixedByOption("--framework")
     .AllowSingleArgPerToken();
 
-    public static readonly CliOption TransitiveOption = new ForwardedOption<bool>("--include-transitive")
+    public static readonly Option TransitiveOption = new ForwardedOption<bool>("--include-transitive")
     {
         Description = CliCommandStrings.CmdTransitiveDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("--include-transitive");
 
-    public static readonly CliOption PrereleaseOption = new ForwardedOption<bool>("--include-prerelease")
+    public static readonly Option PrereleaseOption = new ForwardedOption<bool>("--include-prerelease")
     {
         Description = CliCommandStrings.CmdPrereleaseDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("--include-prerelease");
 
-    public static readonly CliOption HighestPatchOption = new ForwardedOption<bool>("--highest-patch")
+    public static readonly Option HighestPatchOption = new ForwardedOption<bool>("--highest-patch")
     {
         Description = CliCommandStrings.CmdHighestPatchDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("--highest-patch");
 
-    public static readonly CliOption HighestMinorOption = new ForwardedOption<bool>("--highest-minor")
+    public static readonly Option HighestMinorOption = new ForwardedOption<bool>("--highest-minor")
     {
         Description = CliCommandStrings.CmdHighestMinorDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("--highest-minor");
 
-    public static readonly CliOption ConfigOption = new ForwardedOption<string>("--config", "--configfile")
+    public static readonly Option ConfigOption = new ForwardedOption<string>("--config", "--configfile")
     {
         Description = CliCommandStrings.CmdConfigDescription,
         HelpName = CliCommandStrings.CmdConfig
     }.ForwardAsMany(o => ["--config", o]);
 
-    public static readonly CliOption SourceOption = new ForwardedOption<IEnumerable<string>>("--source", "-s")
+    public static readonly Option SourceOption = new ForwardedOption<IEnumerable<string>>("--source", "-s")
     {
         Description = CliCommandStrings.PackageListCmdSourceDescription,
         HelpName = CliCommandStrings.PackageListCmdSource
     }.ForwardAsManyArgumentsEachPrefixedByOption("--source")
     .AllowSingleArgPerToken();
 
-    public static readonly CliOption InteractiveOption = CommonOptions.InteractiveOption().ForwardIfEnabled("--interactive");
+    public static readonly Option InteractiveOption = CommonOptions.InteractiveOption().ForwardIfEnabled("--interactive");
 
-    public static readonly CliOption NoRestore = new CliOption<bool>("--no-restore")
+    public static readonly Option NoRestore = new Option<bool>("--no-restore")
     {
         Description = CliCommandStrings.CmdNoRestoreDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption VerbosityOption = new ForwardedOption<VerbosityOptions>("--verbosity", "-v")
+    public static readonly Option VerbosityOption = new ForwardedOption<VerbosityOptions>("--verbosity", "-v")
     {
         Description = CliStrings.VerbosityOptionDescription,
         HelpName = CliStrings.LevelArgumentName
     }.ForwardAsSingle(o => $"--verbosity:{o}");
 
-    public static readonly CliOption FormatOption = new ForwardedOption<ReportOutputFormat>("--format")
+    public static readonly Option FormatOption = new ForwardedOption<ReportOutputFormat>("--format")
     {
         Description = CliCommandStrings.CmdFormatDescription
     }.ForwardAsSingle(o => $"--format:{o}");
 
-    public static readonly CliOption OutputVersionOption = new ForwardedOption<int>("--output-version")
+    public static readonly Option OutputVersionOption = new ForwardedOption<int>("--output-version")
     {
         Description = CliCommandStrings.CmdOutputVersionDescription
     }.ForwardAsSingle(o => $"--output-version:{o}");
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("list", CliCommandStrings.PackageListAppFullName);
+        Command command = new("list", CliCommandStrings.PackageListAppFullName);
 
         command.Options.Add(VerbosityOption);
         command.Options.Add(OutdatedOption);
diff --git a/src/Cli/dotnet/Commands/Package/PackageCommandParser.cs b/src/Cli/dotnet/Commands/Package/PackageCommandParser.cs
index aec95368b3d3..83aabbae5674 100644
--- a/src/Cli/dotnet/Commands/Package/PackageCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Package/PackageCommandParser.cs
@@ -14,16 +14,16 @@ internal class PackageCommandParser
 {
     private const string DocsLink = "https://aka.ms/dotnet-package";
 
-    public static readonly CliOption<string> ProjectOption = new CliOption<string>("--project")
+    public static readonly Option<string> ProjectOption = new Option<string>("--project")
     {
         Recursive = true,
         DefaultValueFactory = _ => Environment.CurrentDirectory,
         Description = CliStrings.ProjectArgumentDescription
     };
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
-        CliCommand command = new DocumentedCommand("package", DocsLink);
+        Command command = new DocumentedCommand("package", DocsLink);
         command.SetAction((parseResult) => parseResult.HandleMissingCommand());
         command.Subcommands.Add(PackageSearchCommandParser.GetCommand());
         command.Subcommands.Add(PackageAddCommandParser.GetCommand());
diff --git a/src/Cli/dotnet/Commands/Package/Remove/PackageRemoveCommandParser.cs b/src/Cli/dotnet/Commands/Package/Remove/PackageRemoveCommandParser.cs
index c4977b554f58..38e6cbc6e9b3 100644
--- a/src/Cli/dotnet/Commands/Package/Remove/PackageRemoveCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Package/Remove/PackageRemoveCommandParser.cs
@@ -8,24 +8,24 @@ namespace Microsoft.DotNet.Cli.Commands.Package.Remove;
 
 internal static class PackageRemoveCommandParser
 {
-    public static readonly CliArgument<IEnumerable<string>> CmdPackageArgument = new(CliCommandStrings.CmdPackage)
+    public static readonly Argument<IEnumerable<string>> CmdPackageArgument = new(CliCommandStrings.CmdPackage)
     {
         Description = CliCommandStrings.PackageRemoveAppHelpText,
         Arity = ArgumentArity.OneOrMore,
     };
 
-    public static readonly CliOption<bool> InteractiveOption = CommonOptions.InteractiveOption().ForwardIfEnabled("--interactive");
+    public static readonly Option<bool> InteractiveOption = CommonOptions.InteractiveOption().ForwardIfEnabled("--interactive");
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        var command = new CliCommand("remove", CliCommandStrings.PackageRemoveAppFullName);
+        var command = new Command("remove", CliCommandStrings.PackageRemoveAppFullName);
 
         command.Arguments.Add(CmdPackageArgument);
         command.Options.Add(InteractiveOption);
diff --git a/src/Cli/dotnet/Commands/Package/Search/PackageSearchCommandParser.cs b/src/Cli/dotnet/Commands/Package/Search/PackageSearchCommandParser.cs
index 8d6127e1e2a2..86462db44821 100644
--- a/src/Cli/dotnet/Commands/Package/Search/PackageSearchCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Package/Search/PackageSearchCommandParser.cs
@@ -8,74 +8,74 @@ namespace Microsoft.DotNet.Cli.Commands.Package.Search;
 
 internal static class PackageSearchCommandParser
 {
-    public static readonly CliArgument<string> SearchTermArgument = new CliArgument<string>("SearchTerm")
+    public static readonly Argument<string> SearchTermArgument = new Argument<string>("SearchTerm")
     {
         HelpName = CliCommandStrings.PackageSearchSearchTermArgumentName,
         Description = CliCommandStrings.PackageSearchSearchTermDescription,
         Arity = ArgumentArity.ZeroOrOne
     };
 
-    public static readonly CliOption Sources = new ForwardedOption<IEnumerable<string>>("--source")
+    public static readonly Option Sources = new ForwardedOption<IEnumerable<string>>("--source")
     {
         Description = CliCommandStrings.SourceDescription,
         HelpName = CliCommandStrings.SourceArgumentName
     }.ForwardAsManyArgumentsEachPrefixedByOption("--source")
     .AllowSingleArgPerToken();
 
-    public static readonly CliOption<string> Take = new ForwardedOption<string>("--take")
+    public static readonly Option<string> Take = new ForwardedOption<string>("--take")
     {
         Description = CliCommandStrings.PackageSearchTakeDescription,
         HelpName = CliCommandStrings.PackageSearchTakeArgumentName
     }.ForwardAsSingle(o => $"--take:{o}");
 
-    public static readonly CliOption<string> Skip = new ForwardedOption<string>("--skip")
+    public static readonly Option<string> Skip = new ForwardedOption<string>("--skip")
     {
         Description = CliCommandStrings.PackageSearchSkipDescription,
         HelpName = CliCommandStrings.PackageSearchSkipArgumentName
     }.ForwardAsSingle(o => $"--skip:{o}");
 
-    public static readonly CliOption<bool> ExactMatch = new ForwardedOption<bool>("--exact-match")
+    public static readonly Option<bool> ExactMatch = new ForwardedOption<bool>("--exact-match")
     {
         Description = CliCommandStrings.ExactMatchDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("--exact-match");
 
-    public static readonly CliOption<bool> Interactive = CommonOptions.InteractiveOption().ForwardIfEnabled("--interactive");
+    public static readonly Option<bool> Interactive = CommonOptions.InteractiveOption().ForwardIfEnabled("--interactive");
 
-    public static readonly CliOption<bool> Prerelease = new ForwardedOption<bool>("--prerelease")
+    public static readonly Option<bool> Prerelease = new ForwardedOption<bool>("--prerelease")
     {
         Description = CliCommandStrings.PackageSearchPrereleaseDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("--prerelease");
 
-    public static readonly CliOption<string> ConfigFile = new ForwardedOption<string>("--configfile")
+    public static readonly Option<string> ConfigFile = new ForwardedOption<string>("--configfile")
     {
         Description = CliCommandStrings.ConfigFileDescription,
         HelpName = CliCommandStrings.ConfigFileArgumentName
     }.ForwardAsSingle(o => $"--configfile:{o}");
 
-    public static readonly CliOption<string> Format = new ForwardedOption<string>("--format")
+    public static readonly Option<string> Format = new ForwardedOption<string>("--format")
     {
         Description = CliCommandStrings.FormatDescription,
         HelpName = CliCommandStrings.FormatArgumentName
     }.ForwardAsSingle(o => $"--format:{o}");
 
-    public static readonly CliOption<string> Verbosity = new ForwardedOption<string>("--verbosity")
+    public static readonly Option<string> Verbosity = new ForwardedOption<string>("--verbosity")
     {
         Description = CliCommandStrings.VerbosityDescription,
         HelpName = CliCommandStrings.VerbosityArgumentName
     }.ForwardAsSingle(o => $"--verbosity:{o}");
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand searchCommand = new("search", CliCommandStrings.PackageSearchCommandDescription);
+        Command searchCommand = new("search", CliCommandStrings.PackageSearchCommandDescription);
 
         searchCommand.Arguments.Add(SearchTermArgument);
         searchCommand.Options.Add(Sources);
diff --git a/src/Cli/dotnet/Commands/Project/Convert/ProjectConvertCommandParser.cs b/src/Cli/dotnet/Commands/Project/Convert/ProjectConvertCommandParser.cs
index 77836c7874a9..0b18323dec5c 100644
--- a/src/Cli/dotnet/Commands/Project/Convert/ProjectConvertCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Project/Convert/ProjectConvertCommandParser.cs
@@ -10,21 +10,21 @@ namespace Microsoft.DotNet.Cli.Commands.Project.Convert;
 
 internal sealed class ProjectConvertCommandParser
 {
-    public static readonly CliArgument<string> FileArgument = new("file")
+    public static readonly Argument<string> FileArgument = new("file")
     {
         Description = CliCommandStrings.CmdFileDescription,
         Arity = ArgumentArity.ExactlyOne,
     };
 
-    public static readonly CliOption<bool> ForceOption = new("--force")
+    public static readonly Option<bool> ForceOption = new("--force")
     {
         Description = CliCommandStrings.CmdOptionForceDescription,
         Arity = ArgumentArity.Zero,
     };
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
-        CliCommand command = new("convert", CliCommandStrings.ProjectConvertAppFullName)
+        Command command = new("convert", CliCommandStrings.ProjectConvertAppFullName)
         {
             FileArgument,
             SharedOptions.OutputOption,
diff --git a/src/Cli/dotnet/Commands/Project/ProjectCommandParser.cs b/src/Cli/dotnet/Commands/Project/ProjectCommandParser.cs
index 2a6136aa4bab..6bd7accb9609 100644
--- a/src/Cli/dotnet/Commands/Project/ProjectCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Project/ProjectCommandParser.cs
@@ -11,9 +11,9 @@ namespace Microsoft.DotNet.Cli.Commands.Project;
 
 internal sealed class ProjectCommandParser
 {
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
-        CliCommand command = new("project");
+        Command command = new("project");
         command.SetAction((parseResult) => parseResult.HandleMissingCommand());
         command.Subcommands.Add(ProjectConvertCommandParser.GetCommand());
 
diff --git a/src/Cli/dotnet/Commands/Publish/PublishCommandParser.cs b/src/Cli/dotnet/Commands/Publish/PublishCommandParser.cs
index 1fe0de0d0c98..bbcff722c22e 100644
--- a/src/Cli/dotnet/Commands/Publish/PublishCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Publish/PublishCommandParser.cs
@@ -11,57 +11,57 @@ internal static class PublishCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-publish";
 
-    public static readonly CliArgument<IEnumerable<string>> SlnOrProjectArgument = new(CliStrings.SolutionOrProjectArgumentName)
+    public static readonly Argument<IEnumerable<string>> SlnOrProjectArgument = new(CliStrings.SolutionOrProjectArgumentName)
     {
         Description = CliStrings.SolutionOrProjectArgumentDescription,
         Arity = ArgumentArity.ZeroOrMore
     };
 
-    public static readonly CliOption<string> OutputOption = new ForwardedOption<string>("--output", "-o")
+    public static readonly Option<string> OutputOption = new ForwardedOption<string>("--output", "-o")
     {
         Description = CliCommandStrings.PublishOutputOptionDescription,
         HelpName = CliCommandStrings.PublishOutputOption
     }.ForwardAsOutputPath("PublishDir");
 
-    public static readonly CliOption<IEnumerable<string>> ManifestOption = new ForwardedOption<IEnumerable<string>>("--manifest")
+    public static readonly Option<IEnumerable<string>> ManifestOption = new ForwardedOption<IEnumerable<string>>("--manifest")
     {
         Description = CliCommandStrings.ManifestOptionDescription,
         HelpName = CliCommandStrings.ManifestOption
     }.ForwardAsSingle(o => $"-property:TargetManifestFiles={string.Join("%3B", o.Select(CommandDirectoryContext.GetFullPath))}")
     .AllowSingleArgPerToken();
 
-    public static readonly CliOption<bool> NoBuildOption = new ForwardedOption<bool>("--no-build")
+    public static readonly Option<bool> NoBuildOption = new ForwardedOption<bool>("--no-build")
     {
         Description = CliCommandStrings.NoBuildOptionDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:NoBuild=true");
 
-    public static readonly CliOption<bool> NoLogoOption = new ForwardedOption<bool>("--nologo")
+    public static readonly Option<bool> NoLogoOption = new ForwardedOption<bool>("--nologo")
     {
         Description = CliCommandStrings.PublishCmdNoLogo,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-nologo");
 
-    public static readonly CliOption<bool> NoRestoreOption = CommonOptions.NoRestoreOption;
+    public static readonly Option<bool> NoRestoreOption = CommonOptions.NoRestoreOption;
 
-    public static readonly CliOption<bool> SelfContainedOption = CommonOptions.SelfContainedOption;
+    public static readonly Option<bool> SelfContainedOption = CommonOptions.SelfContainedOption;
 
-    public static readonly CliOption<bool> NoSelfContainedOption = CommonOptions.NoSelfContainedOption;
+    public static readonly Option<bool> NoSelfContainedOption = CommonOptions.NoSelfContainedOption;
 
-    public static readonly CliOption<string> RuntimeOption = CommonOptions.RuntimeOption;
+    public static readonly Option<string> RuntimeOption = CommonOptions.RuntimeOption;
 
-    public static readonly CliOption<string> FrameworkOption = CommonOptions.FrameworkOption(CliCommandStrings.PublishFrameworkOptionDescription);
+    public static readonly Option<string> FrameworkOption = CommonOptions.FrameworkOption(CliCommandStrings.PublishFrameworkOptionDescription);
 
-    public static readonly CliOption<string> ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.PublishConfigurationOptionDescription);
+    public static readonly Option<string> ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.PublishConfigurationOptionDescription);
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         var command = new DocumentedCommand("publish", DocsLink, CliCommandStrings.PublishAppDescription);
 
diff --git a/src/Cli/dotnet/Commands/Reference/Add/ReferenceAddCommandParser.cs b/src/Cli/dotnet/Commands/Reference/Add/ReferenceAddCommandParser.cs
index d9c62fead021..7598f6108eca 100644
--- a/src/Cli/dotnet/Commands/Reference/Add/ReferenceAddCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Reference/Add/ReferenceAddCommandParser.cs
@@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Commands.Reference.Add;
 
 internal static class ReferenceAddCommandParser
 {
-    public static readonly CliArgument<IEnumerable<string>> ProjectPathArgument = new(CliCommandStrings.ReferenceAddProjectPathArgumentName)
+    public static readonly Argument<IEnumerable<string>> ProjectPathArgument = new(CliCommandStrings.ReferenceAddProjectPathArgumentName)
     {
         Description = CliCommandStrings.ReferenceAddProjectPathArgumentDescription,
         Arity = ArgumentArity.OneOrMore,
@@ -19,25 +19,25 @@ internal static class ReferenceAddCommandParser
         }
     };
 
-    public static readonly CliOption<string> FrameworkOption = new DynamicOption<string>("--framework", "-f")
+    public static readonly Option<string> FrameworkOption = new DynamicOption<string>("--framework", "-f")
     {
         Description = CliCommandStrings.ReferenceAddCmdFrameworkDescription,
         HelpName = CliStrings.CommonCmdFramework
 
     }.AddCompletions(CliCompletion.TargetFrameworksFromProjectFile);
 
-    public static readonly CliOption<bool> InteractiveOption = CommonOptions.InteractiveOption();
+    public static readonly Option<bool> InteractiveOption = CommonOptions.InteractiveOption();
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("add", CliCommandStrings.ReferenceAddAppFullName);
+        Command command = new("add", CliCommandStrings.ReferenceAddAppFullName);
 
         command.Arguments.Add(ProjectPathArgument);
         command.Options.Add(FrameworkOption);
diff --git a/src/Cli/dotnet/Commands/Reference/List/ReferenceListCommandParser.cs b/src/Cli/dotnet/Commands/Reference/List/ReferenceListCommandParser.cs
index 7927d920972c..f7a7988ec595 100644
--- a/src/Cli/dotnet/Commands/Reference/List/ReferenceListCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Reference/List/ReferenceListCommandParser.cs
@@ -7,16 +7,16 @@ namespace Microsoft.DotNet.Cli.Commands.Reference.List;
 
 internal static class ReferenceListCommandParser
 {
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        var command = new CliCommand("list", CliCommandStrings.ReferenceListAppFullName);
+        var command = new Command("list", CliCommandStrings.ReferenceListAppFullName);
 
         command.SetAction((parseResult) => new ReferenceListCommand(parseResult).Execute());
 
diff --git a/src/Cli/dotnet/Commands/Reference/ReferenceCommandParser.cs b/src/Cli/dotnet/Commands/Reference/ReferenceCommandParser.cs
index 3c5a85ab9e7f..a3ee78e41105 100644
--- a/src/Cli/dotnet/Commands/Reference/ReferenceCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Reference/ReferenceCommandParser.cs
@@ -13,20 +13,20 @@ internal static class ReferenceCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-reference";
 
-    public static readonly CliOption<string> ProjectOption = new CliOption<string>("--project")
+    public static readonly Option<string> ProjectOption = new Option<string>("--project")
     {
         Description = CliStrings.ProjectArgumentDescription,
         Recursive = true
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         var command = new DocumentedCommand("reference", DocsLink, CliCommandStrings.NetRemoveCommand);
 
diff --git a/src/Cli/dotnet/Commands/Reference/Remove/ReferenceRemoveCommandParser.cs b/src/Cli/dotnet/Commands/Reference/Remove/ReferenceRemoveCommandParser.cs
index a07bf86cff7e..469e75d61044 100644
--- a/src/Cli/dotnet/Commands/Reference/Remove/ReferenceRemoveCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Reference/Remove/ReferenceRemoveCommandParser.cs
@@ -7,28 +7,28 @@ namespace Microsoft.DotNet.Cli.Commands.Reference.Remove;
 
 internal static class ReferenceRemoveCommandParser
 {
-    public static readonly CliArgument<IEnumerable<string>> ProjectPathArgument = new DynamicArgument<IEnumerable<string>>(CliCommandStrings.ReferenceRemoveProjectPathArgumentName)
+    public static readonly Argument<IEnumerable<string>> ProjectPathArgument = new DynamicArgument<IEnumerable<string>>(CliCommandStrings.ReferenceRemoveProjectPathArgumentName)
     {
         Description = CliCommandStrings.ReferenceRemoveProjectPathArgumentDescription,
         Arity = ArgumentArity.OneOrMore,
     }.AddCompletions(CliCompletion.ProjectReferencesFromProjectFile);
 
-    public static readonly CliOption<string> FrameworkOption = new("--framework", "-f")
+    public static readonly Option<string> FrameworkOption = new("--framework", "-f")
     {
         Description = CliCommandStrings.ReferenceRemoveCmdFrameworkDescription,
         HelpName = CliStrings.CommonCmdFramework
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        var command = new CliCommand("remove", CliCommandStrings.ReferenceRemoveAppFullName);
+        var command = new Command("remove", CliCommandStrings.ReferenceRemoveAppFullName);
 
         command.Arguments.Add(ProjectPathArgument);
         command.Options.Add(FrameworkOption);
diff --git a/src/Cli/dotnet/Commands/Restore/RestoreCommandParser.cs b/src/Cli/dotnet/Commands/Restore/RestoreCommandParser.cs
index 68ea6366fab4..a90734e0a064 100644
--- a/src/Cli/dotnet/Commands/Restore/RestoreCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Restore/RestoreCommandParser.cs
@@ -10,20 +10,20 @@ internal static class RestoreCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-restore";
 
-    public static readonly CliArgument<IEnumerable<string>> SlnOrProjectArgument = new(CliStrings.SolutionOrProjectArgumentName)
+    public static readonly Argument<IEnumerable<string>> SlnOrProjectArgument = new(CliStrings.SolutionOrProjectArgumentName)
     {
         Description = CliStrings.SolutionOrProjectArgumentDescription,
         Arity = ArgumentArity.ZeroOrMore
     };
 
-    public static readonly CliOption<IEnumerable<string>> SourceOption = new ForwardedOption<IEnumerable<string>>("--source", "-s")
+    public static readonly Option<IEnumerable<string>> SourceOption = new ForwardedOption<IEnumerable<string>>("--source", "-s")
     {
         Description = CliCommandStrings.CmdSourceOptionDescription,
         HelpName = CliCommandStrings.CmdSourceOption
     }.ForwardAsSingle(o => $"-property:RestoreSources={string.Join("%3B", o)}")
     .AllowSingleArgPerToken();
 
-    private static IEnumerable<CliOption> FullRestoreOptions() =>
+    private static IEnumerable<Option> FullRestoreOptions() =>
         ImplicitRestoreOptions(true, true, true, true).Concat(
             [
                 CommonOptions.VerbosityOption,
@@ -51,14 +51,14 @@ private static IEnumerable<CliOption> FullRestoreOptions() =>
                 }.ForwardAs("-property:RestoreForceEvaluate=true"),
             ]);
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         var command = new DocumentedCommand("restore", DocsLink, CliCommandStrings.RestoreAppFullName);
 
@@ -76,7 +76,7 @@ private static CliCommand ConstructCommand()
         return command;
     }
 
-    public static void AddImplicitRestoreOptions(CliCommand command, bool showHelp = false, bool useShortOptions = false, bool includeRuntimeOption = true, bool includeNoDependenciesOption = true)
+    public static void AddImplicitRestoreOptions(Command command, bool showHelp = false, bool useShortOptions = false, bool includeRuntimeOption = true, bool includeNoDependenciesOption = true)
     {
         foreach (var option in ImplicitRestoreOptions(showHelp, useShortOptions, includeRuntimeOption, includeNoDependenciesOption))
         {
@@ -102,7 +102,7 @@ public static string RestoreRuntimeArgFunc(IEnumerable<string> rids)
         return $"-property:RuntimeIdentifiers={string.Join("%3B", convertedRids)}";
     }
 
-    private static IEnumerable<CliOption> ImplicitRestoreOptions(bool showHelp, bool useShortOptions, bool includeRuntimeOption, bool includeNoDependenciesOption)
+    private static IEnumerable<Option> ImplicitRestoreOptions(bool showHelp, bool useShortOptions, bool includeRuntimeOption, bool includeNoDependenciesOption)
     {
         if (showHelp && useShortOptions)
         {
@@ -110,7 +110,7 @@ private static IEnumerable<CliOption> ImplicitRestoreOptions(bool showHelp, bool
         }
         else
         {
-            CliOption<IEnumerable<string>> sourceOption = new ForwardedOption<IEnumerable<string>>("--source")
+            Option<IEnumerable<string>> sourceOption = new ForwardedOption<IEnumerable<string>>("--source")
             {
                 Description = showHelp ? CliCommandStrings.CmdSourceOptionDescription : string.Empty,
                 HelpName = CliCommandStrings.CmdSourceOption,
@@ -186,7 +186,7 @@ private static IEnumerable<CliOption> ImplicitRestoreOptions(bool showHelp, bool
 
         if (includeRuntimeOption)
         {
-            CliOption<IEnumerable<string>> runtimeOption = new DynamicForwardedOption<IEnumerable<string>>("--runtime")
+            Option<IEnumerable<string>> runtimeOption = new DynamicForwardedOption<IEnumerable<string>>("--runtime")
             {
                 Description = CliCommandStrings.CmdRuntimeOptionDescription,
                 HelpName = CliCommandStrings.CmdRuntimeOption,
diff --git a/src/Cli/dotnet/Commands/Run/CommonRunHelpers.cs b/src/Cli/dotnet/Commands/Run/CommonRunHelpers.cs
index fda0fec9a43f..07cfd0fe9de1 100644
--- a/src/Cli/dotnet/Commands/Run/CommonRunHelpers.cs
+++ b/src/Cli/dotnet/Commands/Run/CommonRunHelpers.cs
@@ -15,8 +15,8 @@ public static void AddUserPassedProperties(Dictionary<string, string> globalProp
     {
         Debug.Assert(globalProperties.Comparer == StringComparer.OrdinalIgnoreCase);
 
-        var fakeCommand = new System.CommandLine.CliCommand("dotnet") { CommonOptions.PropertiesOption };
-        var propertyParsingConfiguration = new System.CommandLine.CliConfiguration(fakeCommand);
+        var fakeCommand = new System.CommandLine.Command("dotnet") { CommonOptions.PropertiesOption };
+        var propertyParsingConfiguration = new System.CommandLine.CommandLineConfiguration(fakeCommand);
         var propertyParseResult = propertyParsingConfiguration.Parse(args);
         var propertyValues = propertyParseResult.GetValue(CommonOptions.PropertiesOption);
 
diff --git a/src/Cli/dotnet/Commands/Run/RunCommandParser.cs b/src/Cli/dotnet/Commands/Run/RunCommandParser.cs
index 7281e0534dcd..86c163f34113 100644
--- a/src/Cli/dotnet/Commands/Run/RunCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Run/RunCommandParser.cs
@@ -10,69 +10,69 @@ internal static class RunCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-run";
 
-    public static readonly CliOption<string> ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.RunConfigurationOptionDescription);
+    public static readonly Option<string> ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.RunConfigurationOptionDescription);
 
-    public static readonly CliOption<string> FrameworkOption = CommonOptions.FrameworkOption(CliCommandStrings.RunFrameworkOptionDescription);
+    public static readonly Option<string> FrameworkOption = CommonOptions.FrameworkOption(CliCommandStrings.RunFrameworkOptionDescription);
 
-    public static readonly CliOption<string> RuntimeOption = CommonOptions.RuntimeOption;
+    public static readonly Option<string> RuntimeOption = CommonOptions.RuntimeOption;
 
-    public static readonly CliOption<string> ProjectOption = new("--project")
+    public static readonly Option<string> ProjectOption = new("--project")
     {
         Description = CliCommandStrings.CommandOptionProjectDescription
     };
 
-    public static readonly CliOption<string[]> PropertyOption = CommonOptions.PropertiesOption;
+    public static readonly Option<string[]> PropertyOption = CommonOptions.PropertiesOption;
 
-    public static readonly CliOption<string> LaunchProfileOption = new("--launch-profile", "-lp")
+    public static readonly Option<string> LaunchProfileOption = new("--launch-profile", "-lp")
     {
         Description = CliCommandStrings.CommandOptionLaunchProfileDescription
     };
 
-    public static readonly CliOption<bool> NoLaunchProfileOption = new("--no-launch-profile")
+    public static readonly Option<bool> NoLaunchProfileOption = new("--no-launch-profile")
     {
         Description = CliCommandStrings.CommandOptionNoLaunchProfileDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<bool> NoLaunchProfileArgumentsOption = new("--no-launch-profile-arguments")
+    public static readonly Option<bool> NoLaunchProfileArgumentsOption = new("--no-launch-profile-arguments")
     {
         Description = CliCommandStrings.CommandOptionNoLaunchProfileArgumentsDescription
     };
 
-    public static readonly CliOption<bool> NoBuildOption = new("--no-build")
+    public static readonly Option<bool> NoBuildOption = new("--no-build")
     {
         Description = CliCommandStrings.CommandOptionNoBuildDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<bool> NoRestoreOption = CommonOptions.NoRestoreOption;
+    public static readonly Option<bool> NoRestoreOption = CommonOptions.NoRestoreOption;
 
-    public static readonly CliOption<bool> NoCacheOption = new("--no-cache")
+    public static readonly Option<bool> InteractiveOption = CommonOptions.InteractiveMsBuildForwardOption;
+
+    public static readonly Option<bool> NoCacheOption = new("--no-cache")
     {
         Description = CliCommandStrings.CommandOptionNoCacheDescription,
         Arity = ArgumentArity.Zero,
     };
 
-    public static readonly CliOption<bool> InteractiveOption = CommonOptions.InteractiveMsBuildForwardOption;
-
-    public static readonly CliOption SelfContainedOption = CommonOptions.SelfContainedOption;
+    public static readonly Option SelfContainedOption = CommonOptions.SelfContainedOption;
 
-    public static readonly CliOption NoSelfContainedOption = CommonOptions.NoSelfContainedOption;
+    public static readonly Option NoSelfContainedOption = CommonOptions.NoSelfContainedOption;
 
-    public static readonly CliArgument<string[]> ApplicationArguments = new("applicationArguments")
+    public static readonly Argument<string[]> ApplicationArguments = new("applicationArguments")
     {
         DefaultValueFactory = _ => [],
         Description = "Arguments passed to the application that is being run."
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         DocumentedCommand command = new("run", DocsLink, CliCommandStrings.RunAppFullName);
 
diff --git a/src/Cli/dotnet/Commands/Sdk/Check/SdkCheckCommandParser.cs b/src/Cli/dotnet/Commands/Sdk/Check/SdkCheckCommandParser.cs
index caa7daacad95..16643db61ffa 100644
--- a/src/Cli/dotnet/Commands/Sdk/Check/SdkCheckCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Sdk/Check/SdkCheckCommandParser.cs
@@ -7,16 +7,16 @@ namespace Microsoft.DotNet.Cli.Commands.Sdk.Check;
 
 internal static class SdkCheckCommandParser
 {
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("check", CliCommandStrings.SdkCheckAppFullName);
+        Command command = new("check", CliCommandStrings.SdkCheckAppFullName);
 
         command.SetAction(SdkCheckCommand.Run);
 
diff --git a/src/Cli/dotnet/Commands/Sdk/SdkCommandParser.cs b/src/Cli/dotnet/Commands/Sdk/SdkCommandParser.cs
index 58485b98222e..471aba351828 100644
--- a/src/Cli/dotnet/Commands/Sdk/SdkCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Sdk/SdkCommandParser.cs
@@ -11,14 +11,14 @@ internal static class SdkCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-sdk";
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         DocumentedCommand command = new("sdk", DocsLink, CliCommandStrings.SdkAppFullName);
         command.Subcommands.Add(SdkCheckCommandParser.GetCommand());
diff --git a/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommandParser.cs b/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommandParser.cs
index 66051c401878..e8eeb5670d56 100644
--- a/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommandParser.cs
@@ -7,33 +7,33 @@ namespace Microsoft.DotNet.Cli.Commands.Solution.Add;
 
 public static class SolutionAddCommandParser
 {
-    public static readonly CliArgument<IEnumerable<string>> ProjectPathArgument = new(CliCommandStrings.AddProjectPathArgumentName)
+    public static readonly Argument<IEnumerable<string>> ProjectPathArgument = new(CliCommandStrings.AddProjectPathArgumentName)
     {
         HelpName = CliCommandStrings.AddProjectPathArgumentName,
         Description = CliCommandStrings.AddProjectPathArgumentDescription,
         Arity = ArgumentArity.ZeroOrMore,
     };
 
-    public static readonly CliOption<bool> InRootOption = new("--in-root")
+    public static readonly Option<bool> InRootOption = new("--in-root")
     {
         Description = CliCommandStrings.InRoot
     };
 
-    public static readonly CliOption<string> SolutionFolderOption = new("--solution-folder", "-s")
+    public static readonly Option<string> SolutionFolderOption = new("--solution-folder", "-s")
     {
         Description = CliCommandStrings.AddProjectSolutionFolderArgumentDescription
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("add", CliCommandStrings.AddAppFullName);
+        Command command = new("add", CliCommandStrings.AddAppFullName);
 
         command.Arguments.Add(ProjectPathArgument);
         command.Options.Add(InRootOption);
diff --git a/src/Cli/dotnet/Commands/Solution/List/SolutionListCommandParser.cs b/src/Cli/dotnet/Commands/Solution/List/SolutionListCommandParser.cs
index 8b37e24bb941..1ffe85eb4754 100644
--- a/src/Cli/dotnet/Commands/Solution/List/SolutionListCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Solution/List/SolutionListCommandParser.cs
@@ -7,22 +7,22 @@ namespace Microsoft.DotNet.Cli.Commands.Solution.List;
 
 public static class SolutionListCommandParser
 {
-    public static readonly CliOption<bool> SolutionFolderOption = new("--solution-folders")
+    public static readonly Option<bool> SolutionFolderOption = new("--solution-folders")
     {
         Description = CliCommandStrings.ListSolutionFoldersArgumentDescription,
         Arity = ArgumentArity.Zero
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("list", CliCommandStrings.ListAppFullName);
+        Command command = new("list", CliCommandStrings.ListAppFullName);
 
         command.Options.Add(SolutionFolderOption);
         command.SetAction((parseResult) => new SolutionListCommand(parseResult).Execute());
diff --git a/src/Cli/dotnet/Commands/Solution/Migrate/SolutionMigrateCommandParser.cs b/src/Cli/dotnet/Commands/Solution/Migrate/SolutionMigrateCommandParser.cs
index 6e2344679b80..21ff80b7d973 100644
--- a/src/Cli/dotnet/Commands/Solution/Migrate/SolutionMigrateCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Solution/Migrate/SolutionMigrateCommandParser.cs
@@ -7,16 +7,16 @@ namespace Microsoft.DotNet.Cli.Commands.Solution.Migrate;
 
 public static class SolutionMigrateCommandParser
 {
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("migrate", CliCommandStrings.MigrateAppFullName);
+        Command command = new("migrate", CliCommandStrings.MigrateAppFullName);
 
         command.Arguments.Add(SolutionCommandParser.SlnArgument);
 
diff --git a/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommandParser.cs b/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommandParser.cs
index 94e89b7f0e47..354a625ee254 100644
--- a/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommandParser.cs
@@ -7,23 +7,23 @@ namespace Microsoft.DotNet.Cli.Commands.Solution.Remove;
 
 public static class SolutionRemoveCommandParser
 {
-    public static readonly CliArgument<IEnumerable<string>> ProjectPathArgument = new(CliCommandStrings.RemoveProjectPathArgumentName)
+    public static readonly Argument<IEnumerable<string>> ProjectPathArgument = new(CliCommandStrings.RemoveProjectPathArgumentName)
     {
         HelpName = CliCommandStrings.RemoveProjectPathArgumentName,
         Description = CliCommandStrings.RemoveProjectPathArgumentDescription,
         Arity = ArgumentArity.ZeroOrMore
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("remove", CliCommandStrings.RemoveAppFullName);
+        Command command = new("remove", CliCommandStrings.RemoveAppFullName);
 
         command.Arguments.Add(ProjectPathArgument);
 
diff --git a/src/Cli/dotnet/Commands/Solution/SolutionCommandParser.cs b/src/Cli/dotnet/Commands/Solution/SolutionCommandParser.cs
index b8f07652663b..22bde530cf92 100644
--- a/src/Cli/dotnet/Commands/Solution/SolutionCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Solution/SolutionCommandParser.cs
@@ -16,21 +16,21 @@ internal static class SolutionCommandParser
 
     public static readonly string CommandName = "solution";
     public static readonly string CommandAlias = "sln";
-    public static readonly CliArgument<string> SlnArgument = new CliArgument<string>(CliCommandStrings.SolutionArgumentName)
+    public static readonly Argument<string> SlnArgument = new Argument<string>(CliCommandStrings.SolutionArgumentName)
     {
         HelpName = CliCommandStrings.SolutionArgumentName,
         Description = CliCommandStrings.SolutionArgumentDescription,
         Arity = ArgumentArity.ZeroOrOne
     }.DefaultToCurrentDirectory();
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         DocumentedCommand command = new(CommandName, DocsLink, CliCommandStrings.SolutionAppFullName);
 
diff --git a/src/Cli/dotnet/Commands/Store/StoreCommandParser.cs b/src/Cli/dotnet/Commands/Store/StoreCommandParser.cs
index 3dfd33d6bb82..c0af3933c9ab 100644
--- a/src/Cli/dotnet/Commands/Store/StoreCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Store/StoreCommandParser.cs
@@ -10,12 +10,12 @@ internal static class StoreCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-store";
 
-    public static readonly CliArgument<IEnumerable<string>> Argument = new("argument")
+    public static readonly Argument<IEnumerable<string>> Argument = new("argument")
     {
         Arity = ArgumentArity.ZeroOrMore,
     };
 
-    public static readonly CliOption<IEnumerable<string>> ManifestOption = new ForwardedOption<IEnumerable<string>>("--manifest", "-m")
+    public static readonly Option<IEnumerable<string>> ManifestOption = new ForwardedOption<IEnumerable<string>>("--manifest", "-m")
     {
         Description = CliCommandStrings.ProjectManifestDescription,
         HelpName = CliCommandStrings.ProjectManifest
@@ -35,44 +35,44 @@ internal static class StoreCommandParser
         }
     }).AllowSingleArgPerToken();
 
-    public static readonly CliOption<string> FrameworkVersionOption = new ForwardedOption<string>("--framework-version")
+    public static readonly Option<string> FrameworkVersionOption = new ForwardedOption<string>("--framework-version")
     {
         Description = CliCommandStrings.FrameworkVersionOptionDescription,
         HelpName = CliCommandStrings.FrameworkVersionOption
     }.ForwardAsSingle(o => $"-property:RuntimeFrameworkVersion={o}");
 
-    public static readonly CliOption<string> OutputOption = new ForwardedOption<string>("--output", "-o")
+    public static readonly Option<string> OutputOption = new ForwardedOption<string>("--output", "-o")
     {
         Description = CliCommandStrings.StoreOutputOptionDescription,
         HelpName = CliCommandStrings.StoreOutputOption
     }.ForwardAsOutputPath("ComposeDir");
 
-    public static readonly CliOption<string> WorkingDirOption = new ForwardedOption<string>("--working-dir", "-w")
+    public static readonly Option<string> WorkingDirOption = new ForwardedOption<string>("--working-dir", "-w")
     {
         Description = CliCommandStrings.IntermediateWorkingDirOptionDescription,
         HelpName = CliCommandStrings.IntermediateWorkingDirOption
     }.ForwardAsSingle(o => $"-property:ComposeWorkingDir={CommandDirectoryContext.GetFullPath(o)}");
 
-    public static readonly CliOption<bool> SkipOptimizationOption = new ForwardedOption<bool>("--skip-optimization")
+    public static readonly Option<bool> SkipOptimizationOption = new ForwardedOption<bool>("--skip-optimization")
     {
         Description = CliCommandStrings.SkipOptimizationOptionDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:SkipOptimization=true");
 
-    public static readonly CliOption<bool> SkipSymbolsOption = new ForwardedOption<bool>("--skip-symbols")
+    public static readonly Option<bool> SkipSymbolsOption = new ForwardedOption<bool>("--skip-symbols")
     {
         Description = CliCommandStrings.SkipSymbolsOptionDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:CreateProfilingSymbols=false");
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         DocumentedCommand command = new("store", DocsLink, CliCommandStrings.StoreAppDescription);
 
diff --git a/src/Cli/dotnet/Commands/Test/TestCommandParser.cs b/src/Cli/dotnet/Commands/Test/TestCommandParser.cs
index 40015788abaf..a0be03075203 100644
--- a/src/Cli/dotnet/Commands/Test/TestCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Test/TestCommandParser.cs
@@ -11,32 +11,32 @@ internal static class TestCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-test";
 
-    public static readonly CliOption<string> SettingsOption = new ForwardedOption<string>("--settings", "-s")
+    public static readonly Option<string> SettingsOption = new ForwardedOption<string>("--settings", "-s")
     {
         Description = CliCommandStrings.CmdSettingsDescription,
         HelpName = CliCommandStrings.CmdSettingsFile
     }.ForwardAsSingle(o => $"-property:VSTestSetting={SurroundWithDoubleQuotes(CommandDirectoryContext.GetFullPath(o))}");
 
-    public static readonly CliOption<bool> ListTestsOption = new ForwardedOption<bool>("--list-tests", "-t")
+    public static readonly Option<bool> ListTestsOption = new ForwardedOption<bool>("--list-tests", "-t")
     {
         Description = CliCommandStrings.CmdListTestsDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:VSTestListTests=true");
 
-    public static readonly CliOption<string> FilterOption = new ForwardedOption<string>("--filter")
+    public static readonly Option<string> FilterOption = new ForwardedOption<string>("--filter")
     {
         Description = CliCommandStrings.CmdTestCaseFilterDescription,
         HelpName = CliCommandStrings.CmdTestCaseFilterExpression
     }.ForwardAsSingle(o => $"-property:VSTestTestCaseFilter={SurroundWithDoubleQuotes(o)}");
 
-    public static readonly CliOption<IEnumerable<string>> AdapterOption = new ForwardedOption<IEnumerable<string>>("--test-adapter-path")
+    public static readonly Option<IEnumerable<string>> AdapterOption = new ForwardedOption<IEnumerable<string>>("--test-adapter-path")
     {
         Description = CliCommandStrings.CmdTestAdapterPathDescription,
         HelpName = CliCommandStrings.CmdTestAdapterPath
     }.ForwardAsSingle(o => $"-property:VSTestTestAdapterPath={SurroundWithDoubleQuotes(string.Join(";", o.Select(CommandDirectoryContext.GetFullPath)))}")
     .AllowSingleArgPerToken();
 
-    public static readonly CliOption<IEnumerable<string>> LoggerOption = new ForwardedOption<IEnumerable<string>>("--logger", "-l")
+    public static readonly Option<IEnumerable<string>> LoggerOption = new ForwardedOption<IEnumerable<string>>("--logger", "-l")
     {
         Description = CliCommandStrings.CmdLoggerDescription,
         HelpName = CliCommandStrings.CmdLoggerOption
@@ -48,56 +48,56 @@ internal static class TestCommandParser
     })
     .AllowSingleArgPerToken();
 
-    public static readonly CliOption<string> OutputOption = new ForwardedOption<string>("--output", "-o")
+    public static readonly Option<string> OutputOption = new ForwardedOption<string>("--output", "-o")
     {
         Description = CliCommandStrings.CmdOutputDescription,
         HelpName = CliCommandStrings.TestCmdOutputDir
     }
     .ForwardAsOutputPath("OutputPath", true);
 
-    public static readonly CliOption<string> DiagOption = new ForwardedOption<string>("--diag", "-d")
+    public static readonly Option<string> DiagOption = new ForwardedOption<string>("--diag", "-d")
     {
         Description = CliCommandStrings.CmdPathTologFileDescription,
         HelpName = CliCommandStrings.CmdPathToLogFile
     }
     .ForwardAsSingle(o => $"-property:VSTestDiag={SurroundWithDoubleQuotes(CommandDirectoryContext.GetFullPath(o))}");
 
-    public static readonly CliOption<bool> NoBuildOption = new ForwardedOption<bool>("--no-build")
+    public static readonly Option<bool> NoBuildOption = new ForwardedOption<bool>("--no-build")
     {
         Description = CliCommandStrings.CmdNoBuildDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:VSTestNoBuild=true");
 
-    public static readonly CliOption<string> ResultsOption = new ForwardedOption<string>("--results-directory")
+    public static readonly Option<string> ResultsOption = new ForwardedOption<string>("--results-directory")
     {
         Description = CliCommandStrings.CmdResultsDirectoryDescription,
         HelpName = CliCommandStrings.CmdPathToResultsDirectory
     }.ForwardAsSingle(o => $"-property:VSTestResultsDirectory={SurroundWithDoubleQuotes(CommandDirectoryContext.GetFullPath(o))}");
 
-    public static readonly CliOption<IEnumerable<string>> CollectOption = new ForwardedOption<IEnumerable<string>>("--collect")
+    public static readonly Option<IEnumerable<string>> CollectOption = new ForwardedOption<IEnumerable<string>>("--collect")
     {
         Description = CliCommandStrings.cmdCollectDescription,
         HelpName = CliCommandStrings.cmdCollectFriendlyName
     }.ForwardAsSingle(o => $"-property:VSTestCollect=\"{string.Join(";", GetSemiColonEscapedArgs(o))}\"")
     .AllowSingleArgPerToken();
 
-    public static readonly CliOption<bool> BlameOption = new ForwardedOption<bool>("--blame")
+    public static readonly Option<bool> BlameOption = new ForwardedOption<bool>("--blame")
     {
         Description = CliCommandStrings.CmdBlameDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:VSTestBlame=true");
 
-    public static readonly CliOption<bool> BlameCrashOption = new ForwardedOption<bool>("--blame-crash")
+    public static readonly Option<bool> BlameCrashOption = new ForwardedOption<bool>("--blame-crash")
     {
         Description = CliCommandStrings.CmdBlameCrashDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:VSTestBlameCrash=true");
 
-    public static readonly CliOption<string> BlameCrashDumpOption = CreateBlameCrashDumpOption();
+    public static readonly Option<string> BlameCrashDumpOption = CreateBlameCrashDumpOption();
 
-    private static CliOption<string> CreateBlameCrashDumpOption()
+    private static Option<string> CreateBlameCrashDumpOption()
     {
-        CliOption<string> result = new ForwardedOption<string>("--blame-crash-dump-type")
+        Option<string> result = new ForwardedOption<string>("--blame-crash-dump-type")
         {
             Description = CliCommandStrings.CmdBlameCrashDumpTypeDescription,
             HelpName = CliCommandStrings.CrashDumpTypeArgumentName,
@@ -107,23 +107,23 @@ private static CliOption<string> CreateBlameCrashDumpOption()
         return result;
     }
 
-    public static readonly CliOption<bool> BlameCrashAlwaysOption = new ForwardedOption<bool>("--blame-crash-collect-always")
+    public static readonly Option<bool> BlameCrashAlwaysOption = new ForwardedOption<bool>("--blame-crash-collect-always")
     {
         Description = CliCommandStrings.CmdBlameCrashCollectAlwaysDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAsMany(o => ["-property:VSTestBlameCrash=true", "-property:VSTestBlameCrashCollectAlways=true"]);
 
-    public static readonly CliOption<bool> BlameHangOption = new ForwardedOption<bool>("--blame-hang")
+    public static readonly Option<bool> BlameHangOption = new ForwardedOption<bool>("--blame-hang")
     {
         Description = CliCommandStrings.CmdBlameHangDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:VSTestBlameHang=true");
 
-    public static readonly CliOption<string> BlameHangDumpOption = CreateBlameHangDumpOption();
+    public static readonly Option<string> BlameHangDumpOption = CreateBlameHangDumpOption();
 
-    private static CliOption<string> CreateBlameHangDumpOption()
+    private static Option<string> CreateBlameHangDumpOption()
     {
-        CliOption<string> result = new ForwardedOption<string>("--blame-hang-dump-type")
+        Option<string> result = new ForwardedOption<string>("--blame-hang-dump-type")
         {
             Description = CliCommandStrings.CmdBlameHangDumpTypeDescription,
             HelpName = CliCommandStrings.HangDumpTypeArgumentName
@@ -133,27 +133,27 @@ private static CliOption<string> CreateBlameHangDumpOption()
         return result;
     }
 
-    public static readonly CliOption<string> BlameHangTimeoutOption = new ForwardedOption<string>("--blame-hang-timeout")
+    public static readonly Option<string> BlameHangTimeoutOption = new ForwardedOption<string>("--blame-hang-timeout")
     {
         Description = CliCommandStrings.CmdBlameHangTimeoutDescription,
         HelpName = CliCommandStrings.HangTimeoutArgumentName
     }.ForwardAsMany(o => ["-property:VSTestBlameHang=true", $"-property:VSTestBlameHangTimeout={o}"]);
 
-    public static readonly CliOption<bool> NoLogoOption = new ForwardedOption<bool>("--nologo")
+    public static readonly Option<bool> NoLogoOption = new ForwardedOption<bool>("--nologo")
     {
         Description = CliCommandStrings.TestCmdNoLogo,
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:VSTestNoLogo=true");
 
-    public static readonly CliOption<bool> NoRestoreOption = CommonOptions.NoRestoreOption;
+    public static readonly Option<bool> NoRestoreOption = CommonOptions.NoRestoreOption;
 
-    public static readonly CliOption<string> FrameworkOption = CommonOptions.FrameworkOption(CliCommandStrings.TestFrameworkOptionDescription);
+    public static readonly Option<string> FrameworkOption = CommonOptions.FrameworkOption(CliCommandStrings.TestFrameworkOptionDescription);
 
-    public static readonly CliOption ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.TestConfigurationOptionDescription);
+    public static readonly Option ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.TestConfigurationOptionDescription);
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
@@ -205,7 +205,7 @@ public static string GetTestRunnerName()
         return null;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         string testRunnerName = GetTestRunnerName();
 
@@ -221,7 +221,7 @@ private static CliCommand ConstructCommand()
         throw new InvalidOperationException(string.Format(CliCommandStrings.CmdUnsupportedTestRunnerDescription, testRunnerName));
     }
 
-    private static CliCommand GetTestingPlatformCliCommand()
+    private static Command GetTestingPlatformCliCommand()
     {
         var command = new TestingPlatformCommand("test", CliCommandStrings.DotnetTestCommand);
         command.SetAction(parseResult => command.Run(parseResult));
@@ -249,7 +249,7 @@ private static CliCommand GetTestingPlatformCliCommand()
         return command;
     }
 
-    private static CliCommand GetVSTestCliCommand()
+    private static Command GetVSTestCliCommand()
     {
         DocumentedCommand command = new("test", DocsLink, CliCommandStrings.TestAppFullName)
         {
diff --git a/src/Cli/dotnet/Commands/Test/TestingPlatformCommand.Help.cs b/src/Cli/dotnet/Commands/Test/TestingPlatformCommand.Help.cs
index 899657c38f5c..6ce51d3f404e 100644
--- a/src/Cli/dotnet/Commands/Test/TestingPlatformCommand.Help.cs
+++ b/src/Cli/dotnet/Commands/Test/TestingPlatformCommand.Help.cs
@@ -53,14 +53,14 @@ private static void WriteUsageSection(HelpContext context)
         context.Output.WriteLine(Indent + string.Join(" ", GetCustomUsageParts(context.Command)));
     }
 
-    private static IEnumerable<string> GetCustomUsageParts(CliCommand command, bool showOptions = true, bool showPlatformOptions = true, bool showExtensionOptions = true)
+    private static IEnumerable<string> GetCustomUsageParts(Command command, bool showOptions = true, bool showPlatformOptions = true, bool showExtensionOptions = true)
     {
-        var parentCommands = new List<CliCommand>();
+        var parentCommands = new List<Command>();
         var nextCommand = command;
         while (nextCommand is not null)
         {
             parentCommands.Add(nextCommand);
-            nextCommand = nextCommand.Parents.FirstOrDefault(c => c is CliCommand) as CliCommand;
+            nextCommand = nextCommand.Parents.FirstOrDefault(c => c is Command) as Command;
         }
         parentCommands.Reverse();
 
diff --git a/src/Cli/dotnet/Commands/Test/TestingPlatformCommand.cs b/src/Cli/dotnet/Commands/Test/TestingPlatformCommand.cs
index d593e867a365..90115ce84752 100644
--- a/src/Cli/dotnet/Commands/Test/TestingPlatformCommand.cs
+++ b/src/Cli/dotnet/Commands/Test/TestingPlatformCommand.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.DotNet.Cli.Commands.Test;
 
-internal partial class TestingPlatformCommand : CliCommand, ICustomHelp
+internal partial class TestingPlatformCommand : Command, ICustomHelp
 {
     private MSBuildHandler _msBuildHandler;
     private TerminalTestReporter _output;
diff --git a/src/Cli/dotnet/Commands/Test/TestingPlatformOptions.cs b/src/Cli/dotnet/Commands/Test/TestingPlatformOptions.cs
index 6136c79a16dd..6b67c0be4bf3 100644
--- a/src/Cli/dotnet/Commands/Test/TestingPlatformOptions.cs
+++ b/src/Cli/dotnet/Commands/Test/TestingPlatformOptions.cs
@@ -8,90 +8,90 @@ namespace Microsoft.DotNet.Cli.Commands.Test;
 
 internal static class TestingPlatformOptions
 {
-    public static readonly CliOption<string> ProjectOption = new("--project")
+    public static readonly Option<string> ProjectOption = new("--project")
     {
         Description = CliCommandStrings.CmdProjectDescription,
         HelpName = CliCommandStrings.CmdProjectPathName,
         Arity = ArgumentArity.ExactlyOne
     };
 
-    public static readonly CliOption<string> SolutionOption = new("--solution")
+    public static readonly Option<string> SolutionOption = new("--solution")
     {
         Description = CliCommandStrings.CmdSolutionDescription,
         HelpName = CliCommandStrings.CmdSolutionPathName,
         Arity = ArgumentArity.ExactlyOne
     };
 
-    public static readonly CliOption<string> DirectoryOption = new("--directory")
+    public static readonly Option<string> DirectoryOption = new("--directory")
     {
         Description = CliCommandStrings.CmdDirectoryDescription,
         HelpName = CliCommandStrings.CmdDirectoryPathName,
         Arity = ArgumentArity.ExactlyOne
     };
 
-    public static readonly CliOption<string> TestModulesFilterOption = new("--test-modules")
+    public static readonly Option<string> TestModulesFilterOption = new("--test-modules")
     {
         Description = CliCommandStrings.CmdTestModulesDescription,
         HelpName = CliCommandStrings.CmdExpressionName
     };
 
-    public static readonly CliOption<string> TestModulesRootDirectoryOption = new("--root-directory")
+    public static readonly Option<string> TestModulesRootDirectoryOption = new("--root-directory")
     {
         Description = CliCommandStrings.CmdTestModulesRootDirectoryDescription,
         HelpName = CliCommandStrings.CmdRootPathName,
     };
 
-    public static readonly CliOption<string> MaxParallelTestModulesOption = new("--max-parallel-test-modules")
+    public static readonly Option<string> MaxParallelTestModulesOption = new("--max-parallel-test-modules")
     {
         Description = CliCommandStrings.CmdMaxParallelTestModulesDescription,
         HelpName = CliCommandStrings.CmdNumberName
     };
 
-    public static readonly CliOption<string> ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.TestConfigurationOptionDescription);
+    public static readonly Option<string> ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.TestConfigurationOptionDescription);
 
-    public static readonly CliOption<string> FrameworkOption = CommonOptions.FrameworkOption(CliCommandStrings.TestFrameworkOptionDescription);
+    public static readonly Option<string> FrameworkOption = CommonOptions.FrameworkOption(CliCommandStrings.TestFrameworkOptionDescription);
 
-    public static readonly CliOption<bool> NoBuildOption = new("--no-build")
+    public static readonly Option<bool> NoBuildOption = new("--no-build")
     {
         Description = CliCommandStrings.CmdNoBuildDescription
     };
 
-    public static readonly CliOption<bool> NoAnsiOption = new("--no-ansi")
+    public static readonly Option<bool> NoAnsiOption = new("--no-ansi")
     {
         Description = CliCommandStrings.CmdNoAnsiDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<bool> NoLaunchProfileOption = new("--no-launch-profile")
+    public static readonly Option<bool> NoLaunchProfileOption = new("--no-launch-profile")
     {
         Description = CliCommandStrings.CommandOptionNoLaunchProfileDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<bool> NoLaunchProfileArgumentsOption = new("--no-launch-profile-arguments")
+    public static readonly Option<bool> NoLaunchProfileArgumentsOption = new("--no-launch-profile-arguments")
     {
         Description = CliCommandStrings.CommandOptionNoLaunchProfileArgumentsDescription
     };
 
-    public static readonly CliOption<bool> NoProgressOption = new("--no-progress")
+    public static readonly Option<bool> NoProgressOption = new("--no-progress")
     {
         Description = CliCommandStrings.CmdNoProgressDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<OutputOptions> OutputOption = new("--output")
+    public static readonly Option<OutputOptions> OutputOption = new("--output")
     {
         Description = CliCommandStrings.CmdTestOutputDescription,
         Arity = ArgumentArity.ExactlyOne
     };
 
-    public static readonly CliOption<string> ListTestsOption = new("--list-tests")
+    public static readonly Option<string> ListTestsOption = new("--list-tests")
     {
         Description = CliCommandStrings.CmdListTestsDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<string> HelpOption = new("--help", ["-h", "-?"])
+    public static readonly Option<string> HelpOption = new("--help", ["-h", "-?"])
     {
         Arity = ArgumentArity.Zero
     };
diff --git a/src/Cli/dotnet/Commands/Tool/Common/ToolAppliedOption.cs b/src/Cli/dotnet/Commands/Tool/Common/ToolAppliedOption.cs
index b5992dcfbda0..7d9ae52f9b50 100644
--- a/src/Cli/dotnet/Commands/Tool/Common/ToolAppliedOption.cs
+++ b/src/Cli/dotnet/Commands/Tool/Common/ToolAppliedOption.cs
@@ -9,32 +9,32 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Common;
 
 internal class ToolAppliedOption
 {
-    public static CliOption<bool> GlobalOption = new("--global", "-g")
+    public static Option<bool> GlobalOption = new("--global", "-g")
     {
         Arity = ArgumentArity.Zero
     };
 
-    public static CliOption<bool> LocalOption = new("--local")
+    public static Option<bool> LocalOption = new("--local")
     {
         Arity = ArgumentArity.Zero
     };
 
-    public static CliOption<bool> UpdateAllOption = new("--all")
+    public static Option<bool> UpdateAllOption = new("--all")
     {
         Description = CliCommandStrings.UpdateAllOptionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<string> VersionOption
+    public static readonly Option<string> VersionOption
         = ToolInstallCommandParser.VersionOption
           ?? new("--version"); // Workaround for Mono runtime (https://github.com/dotnet/sdk/issues/41672)
 
-    public static CliOption<string> ToolPathOption = new("--tool-path")
+    public static Option<string> ToolPathOption = new("--tool-path")
     {
         HelpName = CliCommandStrings.ToolInstallToolPathOptionName
     };
 
-    public static CliOption<string> ToolManifestOption = new("--tool-manifest")
+    public static Option<string> ToolManifestOption = new("--tool-manifest")
     {
         HelpName = CliCommandStrings.ToolInstallManifestPathOptionName,
         Arity = ArgumentArity.ZeroOrOne
diff --git a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallCommandParser.cs b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallCommandParser.cs
index 063e7cdce9f0..8ce76001466e 100644
--- a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallCommandParser.cs
@@ -12,84 +12,84 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Install;
 
 internal static class ToolInstallCommandParser
 {
-    public static readonly CliArgument<PackageIdentity?> PackageIdentityArgument = CommonArguments.PackageIdentityArgument();
+    public static readonly Argument<PackageIdentity?> PackageIdentityArgument = CommonArguments.PackageIdentityArgument();
 
-    public static readonly CliOption<string> VersionOption = new("--version")
+    public static readonly Option<string> VersionOption = new("--version")
     {
         Description = CliCommandStrings.ToolInstallVersionOptionDescription,
         HelpName = CliCommandStrings.ToolInstallVersionOptionName
     };
 
-    public static readonly CliOption<string> ConfigOption = new("--configfile")
+    public static readonly Option<string> ConfigOption = new("--configfile")
     {
         Description = CliCommandStrings.ToolInstallConfigFileOptionDescription,
         HelpName = CliCommandStrings.ToolInstallConfigFileOptionName
     };
 
-    public static readonly CliOption<string[]> SourceOption = new CliOption<string[]>("--source")
+    public static readonly Option<string[]> SourceOption = new Option<string[]>("--source")
     {
         Description = CliCommandStrings.ToolInstallSourceOptionDescription,
         HelpName = CliCommandStrings.ToolInstallSourceOptionName
     }.AllowSingleArgPerToken();
 
-    public static readonly CliOption<string[]> AddSourceOption = new CliOption<string[]>("--add-source")
+    public static readonly Option<string[]> AddSourceOption = new Option<string[]>("--add-source")
     {
         Description = CliCommandStrings.ToolInstallAddSourceOptionDescription,
         HelpName = CliCommandStrings.ToolInstallAddSourceOptionName
     }.AllowSingleArgPerToken();
 
-    public static readonly CliOption<string> FrameworkOption = new("--framework")
+    public static readonly Option<string> FrameworkOption = new("--framework")
     {
         Description = CliCommandStrings.ToolInstallFrameworkOptionDescription,
         HelpName = CliCommandStrings.ToolInstallFrameworkOptionName
     };
 
-    public static readonly CliOption<bool> PrereleaseOption = ToolSearchCommandParser.PrereleaseOption;
+    public static readonly Option<bool> PrereleaseOption = ToolSearchCommandParser.PrereleaseOption;
 
-    public static readonly CliOption<bool> CreateManifestIfNeededOption = new("--create-manifest-if-needed")
+    public static readonly Option<bool> CreateManifestIfNeededOption = new("--create-manifest-if-needed")
     {
         Description = CliCommandStrings.CreateManifestIfNeededOptionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<bool> AllowPackageDowngradeOption = new("--allow-downgrade")
+    public static readonly Option<bool> AllowPackageDowngradeOption = new("--allow-downgrade")
     {
         Description = CliCommandStrings.AllowPackageDowngradeOptionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<VerbosityOptions> VerbosityOption = CommonOptions.VerbosityOption;
+    public static readonly Option<VerbosityOptions> VerbosityOption = CommonOptions.VerbosityOption;
 
     // Don't use the common options version as we don't want this to be a forwarded option
-    public static readonly CliOption<string> ArchitectureOption = new("--arch", "-a")
+    public static readonly Option<string> ArchitectureOption = new("--arch", "-a")
     {
         Description = CliStrings.ArchitectureOptionDescription
     };
 
-    public static readonly CliOption<bool> RollForwardOption = new("--allow-roll-forward")
+    public static readonly Option<bool> RollForwardOption = new("--allow-roll-forward")
     {
         Description = CliCommandStrings.RollForwardOptionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<bool> GlobalOption = ToolAppliedOption.GlobalOption;
+    public static readonly Option<bool> GlobalOption = ToolAppliedOption.GlobalOption;
 
-    public static readonly CliOption<bool> LocalOption = ToolAppliedOption.LocalOption;
+    public static readonly Option<bool> LocalOption = ToolAppliedOption.LocalOption;
 
-    public static readonly CliOption<string> ToolPathOption = ToolAppliedOption.ToolPathOption;
+    public static readonly Option<string> ToolPathOption = ToolAppliedOption.ToolPathOption;
 
-    public static readonly CliOption<string> ToolManifestOption = ToolAppliedOption.ToolManifestOption;
+    public static readonly Option<string> ToolManifestOption = ToolAppliedOption.ToolManifestOption;
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("install", CliCommandStrings.ToolInstallCommandDescription);
+        Command command = new("install", CliCommandStrings.ToolInstallCommandDescription);
         command.Arguments.Add(PackageIdentityArgument);
 
         AddCommandOptions(command);
@@ -104,7 +104,7 @@ private static CliCommand ConstructCommand()
         return command;
     }
 
-    public static CliCommand AddCommandOptions(CliCommand command)
+    public static Command AddCommandOptions(Command command)
     {
         command.Options.Add(GlobalOption.WithHelpDescription(command, CliCommandStrings.ToolInstallGlobalOptionDescription));
         command.Options.Add(LocalOption.WithHelpDescription(command, CliCommandStrings.ToolInstallLocalOptionDescription));
diff --git a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs
index ca14cb6606e5..63253ef1ddb0 100644
--- a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs
+++ b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs
@@ -108,7 +108,7 @@ public ToolInstallGlobalOrToolPathCommand(
         _reporter = reporter ?? Reporter.Output;
     }
 
-    public static T GetValueOrDefault<T>(CliOption<T> option, T defaultOption, ParseResult parseResult)
+    public static T GetValueOrDefault<T>(Option<T> option, T defaultOption, ParseResult parseResult)
     {
         if (parseResult.GetResult(option) is { } result &&
             result.GetValueOrDefault<T>() is { } t)
diff --git a/src/Cli/dotnet/Commands/Tool/List/ToolListCommandParser.cs b/src/Cli/dotnet/Commands/Tool/List/ToolListCommandParser.cs
index 98704b0d88d1..b29fbd7b362e 100644
--- a/src/Cli/dotnet/Commands/Tool/List/ToolListCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Tool/List/ToolListCommandParser.cs
@@ -9,35 +9,35 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.List;
 
 internal static class ToolListCommandParser
 {
-    public static readonly CliArgument<string> PackageIdArgument = new("packageId")
+    public static readonly Argument<string> PackageIdArgument = new("packageId")
     {
         HelpName = CliCommandStrings.ToolListPackageIdArgumentName,
         Description = CliCommandStrings.ToolListPackageIdArgumentDescription,
         Arity = ArgumentArity.ZeroOrOne,
     };
 
-    public static readonly CliOption<bool> GlobalOption = ToolAppliedOption.GlobalOption;
+    public static readonly Option<bool> GlobalOption = ToolAppliedOption.GlobalOption;
 
-    public static readonly CliOption<bool> LocalOption = ToolAppliedOption.LocalOption;
+    public static readonly Option<bool> LocalOption = ToolAppliedOption.LocalOption;
 
-    public static readonly CliOption<string> ToolPathOption = ToolAppliedOption.ToolPathOption;
+    public static readonly Option<string> ToolPathOption = ToolAppliedOption.ToolPathOption;
 
-    public static readonly CliOption<ToolListOutputFormat> ToolListFormatOption = new("--format")
+    public static readonly Option<ToolListOutputFormat> ToolListFormatOption = new("--format")
     {
         Arity = ArgumentArity.ZeroOrOne,
         DefaultValueFactory = _ => ToolListOutputFormat.table,
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("list", CliCommandStrings.ToolListCommandDescription);
+        Command command = new("list", CliCommandStrings.ToolListCommandDescription);
 
         command.Arguments.Add(PackageIdArgument);
         command.Options.Add(GlobalOption.WithHelpDescription(command, CliCommandStrings.ToolListGlobalOptionDescription));
diff --git a/src/Cli/dotnet/Commands/Tool/Restore/ToolRestoreCommandParser.cs b/src/Cli/dotnet/Commands/Tool/Restore/ToolRestoreCommandParser.cs
index b95aa104a176..3cb922fe65c4 100644
--- a/src/Cli/dotnet/Commands/Tool/Restore/ToolRestoreCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Tool/Restore/ToolRestoreCommandParser.cs
@@ -10,24 +10,24 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Restore;
 
 internal static class ToolRestoreCommandParser
 {
-    public static readonly CliOption<string> ConfigOption = ToolInstallCommandParser.ConfigOption;
+    public static readonly Option<string> ConfigOption = ToolInstallCommandParser.ConfigOption;
 
-    public static readonly CliOption<string[]> AddSourceOption = ToolInstallCommandParser.AddSourceOption;
+    public static readonly Option<string[]> AddSourceOption = ToolInstallCommandParser.AddSourceOption;
 
-    public static readonly CliOption<string> ToolManifestOption = ToolAppliedOption.ToolManifestOption;
+    public static readonly Option<string> ToolManifestOption = ToolAppliedOption.ToolManifestOption;
 
-    public static readonly CliOption<VerbosityOptions> VerbosityOption = ToolInstallCommandParser.VerbosityOption;
+    public static readonly Option<VerbosityOptions> VerbosityOption = ToolInstallCommandParser.VerbosityOption;
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("restore", CliCommandStrings.ToolRestoreCommandDescription);
+        Command command = new("restore", CliCommandStrings.ToolRestoreCommandDescription);
 
         command.Options.Add(ConfigOption);
         command.Options.Add(AddSourceOption);
diff --git a/src/Cli/dotnet/Commands/Tool/Run/ToolRunCommandParser.cs b/src/Cli/dotnet/Commands/Tool/Run/ToolRunCommandParser.cs
index 5db183e5bdbe..6c0b30bd05da 100644
--- a/src/Cli/dotnet/Commands/Tool/Run/ToolRunCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Tool/Run/ToolRunCommandParser.cs
@@ -7,33 +7,33 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Run;
 
 internal static class ToolRunCommandParser
 {
-    public static readonly CliArgument<string> CommandNameArgument = new("commandName")
+    public static readonly Argument<string> CommandNameArgument = new("commandName")
     {
         HelpName = CliCommandStrings.CommandNameArgumentName,
         Description = CliCommandStrings.CommandNameArgumentDescription
     };
 
-    public static readonly CliArgument<IEnumerable<string>> CommandArgument = new("toolArguments")
+    public static readonly Argument<IEnumerable<string>> CommandArgument = new("toolArguments")
     {
         Description = "arguments forwarded to the tool"
     };
 
-    public static readonly CliOption<bool> RollForwardOption = new("--allow-roll-forward")
+    public static readonly Option<bool> RollForwardOption = new("--allow-roll-forward")
     {
         Description = CliCommandStrings.RollForwardOptionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("run", CliCommandStrings.ToolRunCommandDescription);
+        Command command = new("run", CliCommandStrings.ToolRunCommandDescription);
 
         command.Arguments.Add(CommandNameArgument);
         command.Arguments.Add(CommandArgument);
diff --git a/src/Cli/dotnet/Commands/Tool/Search/ToolSearchCommandParser.cs b/src/Cli/dotnet/Commands/Tool/Search/ToolSearchCommandParser.cs
index 97d19cae18df..1b75a462ad36 100644
--- a/src/Cli/dotnet/Commands/Tool/Search/ToolSearchCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Tool/Search/ToolSearchCommandParser.cs
@@ -7,46 +7,46 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Search;
 
 internal static class ToolSearchCommandParser
 {
-    public static readonly CliArgument<string> SearchTermArgument = new("searchTerm")
+    public static readonly Argument<string> SearchTermArgument = new("searchTerm")
     {
         HelpName = CliCommandStrings.ToolSearchSearchTermArgumentName,
         Description = CliCommandStrings.ToolSearchSearchTermDescription
     };
 
-    public static readonly CliOption<bool> DetailOption = new("--detail")
+    public static readonly Option<bool> DetailOption = new("--detail")
     {
         Description = CliCommandStrings.DetailDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<string> SkipOption = new("--skip")
+    public static readonly Option<string> SkipOption = new("--skip")
     {
         Description = CliCommandStrings.ToolSearchSkipDescription,
         HelpName = CliCommandStrings.ToolSearchSkipArgumentName
     };
 
-    public static readonly CliOption<string> TakeOption = new("--take")
+    public static readonly Option<string> TakeOption = new("--take")
     {
         Description = CliCommandStrings.ToolSearchTakeDescription,
         HelpName = CliCommandStrings.ToolSearchTakeArgumentName
     };
 
-    public static readonly CliOption<bool> PrereleaseOption = new("--prerelease")
+    public static readonly Option<bool> PrereleaseOption = new("--prerelease")
     {
         Description = CliCommandStrings.ToolSearchPrereleaseDescription,
         Arity = ArgumentArity.Zero
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("search", CliCommandStrings.ToolSearchCommandDescription);
+        Command command = new("search", CliCommandStrings.ToolSearchCommandDescription);
 
         command.Arguments.Add(SearchTermArgument);
 
diff --git a/src/Cli/dotnet/Commands/Tool/ToolCommandParser.cs b/src/Cli/dotnet/Commands/Tool/ToolCommandParser.cs
index 0d2f87a20f53..169f6bd825e7 100644
--- a/src/Cli/dotnet/Commands/Tool/ToolCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Tool/ToolCommandParser.cs
@@ -17,14 +17,14 @@ internal static class ToolCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-tool";
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         DocumentedCommand command = new("tool", DocsLink, CliCommandStrings.ToolCommandDescription);
 
diff --git a/src/Cli/dotnet/Commands/Tool/ToolCommandRestorePassThroughOptions.cs b/src/Cli/dotnet/Commands/Tool/ToolCommandRestorePassThroughOptions.cs
index ff73d890caad..2cbe232a6bce 100644
--- a/src/Cli/dotnet/Commands/Tool/ToolCommandRestorePassThroughOptions.cs
+++ b/src/Cli/dotnet/Commands/Tool/ToolCommandRestorePassThroughOptions.cs
@@ -8,30 +8,30 @@ namespace Microsoft.DotNet.Cli.Commands.Tool;
 
 internal static class ToolCommandRestorePassThroughOptions
 {
-    public static CliOption<bool> DisableParallelOption = new ForwardedOption<bool>("--disable-parallel")
+    public static Option<bool> DisableParallelOption = new ForwardedOption<bool>("--disable-parallel")
     {
         Description = CliCommandStrings.CmdDisableParallelOptionDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("--disable-parallel");
 
-    public static CliOption<bool> NoCacheOption = new ForwardedOption<bool>("--no-cache")
+    public static Option<bool> NoCacheOption = new ForwardedOption<bool>("--no-cache")
     {
         Description = CliCommandStrings.CmdNoCacheOptionDescription,
         Hidden = true,
         Arity = ArgumentArity.Zero
     }.ForwardAs("--no-cache");
 
-    public static CliOption<bool> NoHttpCacheOption = new ForwardedOption<bool>("--no-http-cache")
+    public static Option<bool> NoHttpCacheOption = new ForwardedOption<bool>("--no-http-cache")
     {
         Description = CliCommandStrings.CmdNoCacheOptionDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("--no-http-cache");
 
-    public static CliOption<bool> IgnoreFailedSourcesOption = new ForwardedOption<bool>("--ignore-failed-sources")
+    public static Option<bool> IgnoreFailedSourcesOption = new ForwardedOption<bool>("--ignore-failed-sources")
     {
         Description = CliCommandStrings.CmdIgnoreFailedSourcesOptionDescription,
         Arity = ArgumentArity.Zero
     }.ForwardAs("--ignore-failed-sources");
 
-    public static CliOption<bool> InteractiveRestoreOption = CommonOptions.InteractiveOption();
+    public static Option<bool> InteractiveRestoreOption = CommonOptions.InteractiveOption();
 }
diff --git a/src/Cli/dotnet/Commands/Tool/Uninstall/ToolUninstallCommandParser.cs b/src/Cli/dotnet/Commands/Tool/Uninstall/ToolUninstallCommandParser.cs
index 27cb02365fae..c436e7dbe20c 100644
--- a/src/Cli/dotnet/Commands/Tool/Uninstall/ToolUninstallCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Tool/Uninstall/ToolUninstallCommandParser.cs
@@ -11,31 +11,31 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Uninstall;
 
 internal static class ToolUninstallCommandParser
 {
-    public static readonly CliArgument<string> PackageIdArgument = new("packageId")
+    public static readonly Argument<string> PackageIdArgument = new("packageId")
     {
         HelpName = "PACKAGE_ID",
         Description = CliStrings.PackageReference,
         Arity = ArgumentArity.ExactlyOne
     };
 
-    public static readonly CliOption<bool> GlobalOption = ToolAppliedOption.GlobalOption;
+    public static readonly Option<bool> GlobalOption = ToolAppliedOption.GlobalOption;
 
-    public static readonly CliOption<bool> LocalOption = ToolAppliedOption.LocalOption;
+    public static readonly Option<bool> LocalOption = ToolAppliedOption.LocalOption;
 
-    public static readonly CliOption<string> ToolPathOption = ToolAppliedOption.ToolPathOption;
+    public static readonly Option<string> ToolPathOption = ToolAppliedOption.ToolPathOption;
 
-    public static readonly CliOption<string> ToolManifestOption = ToolAppliedOption.ToolManifestOption;
+    public static readonly Option<string> ToolManifestOption = ToolAppliedOption.ToolManifestOption;
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("uninstall", CliCommandStrings.ToolUninstallCommandDescription);
+        Command command = new("uninstall", CliCommandStrings.ToolUninstallCommandDescription);
 
         command.Arguments.Add(PackageIdArgument);
         command.Options.Add(GlobalOption.WithHelpDescription(command, CliCommandStrings.ToolUninstallGlobalOptionDescription));
diff --git a/src/Cli/dotnet/Commands/Tool/Update/ToolUpdateCommandParser.cs b/src/Cli/dotnet/Commands/Tool/Update/ToolUpdateCommandParser.cs
index 5d37d130b1b3..3d8ebee80bbc 100644
--- a/src/Cli/dotnet/Commands/Tool/Update/ToolUpdateCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Tool/Update/ToolUpdateCommandParser.cs
@@ -10,22 +10,22 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Update;
 
 internal static class ToolUpdateCommandParser
 {
-    public static readonly CliArgument<PackageIdentity?> PackageIdentityArgument = CommonArguments.PackageIdentityArgument(requireArgument: false);
+    public static readonly Argument<PackageIdentity?> PackageIdentityArgument = CommonArguments.PackageIdentityArgument(requireArgument: false);
 
-    public static readonly CliOption<bool> UpdateAllOption = ToolAppliedOption.UpdateAllOption;
+    public static readonly Option<bool> UpdateAllOption = ToolAppliedOption.UpdateAllOption;
 
-    public static readonly CliOption<bool> AllowPackageDowngradeOption = ToolInstallCommandParser.AllowPackageDowngradeOption;
+    public static readonly Option<bool> AllowPackageDowngradeOption = ToolInstallCommandParser.AllowPackageDowngradeOption;
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("update", CliCommandStrings.ToolUpdateCommandDescription);
+        Command command = new("update", CliCommandStrings.ToolUpdateCommandDescription);
 
         command.Arguments.Add(PackageIdentityArgument);
 
diff --git a/src/Cli/dotnet/Commands/VSTest/VSTestCommandParser.cs b/src/Cli/dotnet/Commands/VSTest/VSTestCommandParser.cs
index 2663f3e359c1..5db39ad365fd 100644
--- a/src/Cli/dotnet/Commands/VSTest/VSTestCommandParser.cs
+++ b/src/Cli/dotnet/Commands/VSTest/VSTestCommandParser.cs
@@ -9,14 +9,14 @@ internal static class VSTestCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-vstest";
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         DocumentedCommand command = new("vstest", DocsLink)
         {
diff --git a/src/Cli/dotnet/Commands/Workload/Clean/WorkloadCleanCommandParser.cs b/src/Cli/dotnet/Commands/Workload/Clean/WorkloadCleanCommandParser.cs
index a42305b96c0b..6e5ce53f1a4b 100644
--- a/src/Cli/dotnet/Commands/Workload/Clean/WorkloadCleanCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Workload/Clean/WorkloadCleanCommandParser.cs
@@ -7,18 +7,18 @@ namespace Microsoft.DotNet.Cli.Commands.Workload.Clean;
 
 internal static class WorkloadCleanCommandParser
 {
-    public static readonly CliOption<bool> CleanAllOption = new("--all") { Description = CliCommandStrings.CleanAllOptionDescription };
+    public static readonly Option<bool> CleanAllOption = new("--all") { Description = CliCommandStrings.CleanAllOptionDescription };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("clean", CliCommandStrings.WorkloadCleanCommandDescription);
+        Command command = new("clean", CliCommandStrings.WorkloadCleanCommandDescription);
 
         command.Options.Add(CleanAllOption);
 
diff --git a/src/Cli/dotnet/Commands/Workload/Config/WorkloadConfigCommandParser.cs b/src/Cli/dotnet/Commands/Workload/Config/WorkloadConfigCommandParser.cs
index e519926fa893..afdc292faa5e 100644
--- a/src/Cli/dotnet/Commands/Workload/Config/WorkloadConfigCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Workload/Config/WorkloadConfigCommandParser.cs
@@ -12,24 +12,24 @@ internal static class WorkloadConfigCommandParser
     public static readonly string UpdateMode_WorkloadSet = "workload-set";
     public static readonly string UpdateMode_Manifests = "manifests";
 
-    public static readonly CliOption<string> UpdateMode = new("--update-mode")
+    public static readonly Option<string> UpdateMode = new("--update-mode")
     {
         Description = CliCommandStrings.UpdateModeDescription,
         Arity = ArgumentArity.ZeroOrOne
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         UpdateMode.AcceptOnlyFromAmong(UpdateMode_WorkloadSet, UpdateMode_Manifests);
 
-        CliCommand command = new("config", CliCommandStrings.WorkloadConfigCommandDescription);
+        Command command = new("config", CliCommandStrings.WorkloadConfigCommandDescription);
         command.Options.Add(UpdateMode);
 
         command.SetAction(parseResult =>
diff --git a/src/Cli/dotnet/Commands/Workload/Elevate/WorkloadElevateCommandParser.cs b/src/Cli/dotnet/Commands/Workload/Elevate/WorkloadElevateCommandParser.cs
index e97cbbfe8f56..49c324839beb 100644
--- a/src/Cli/dotnet/Commands/Workload/Elevate/WorkloadElevateCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Workload/Elevate/WorkloadElevateCommandParser.cs
@@ -7,16 +7,16 @@ namespace Microsoft.DotNet.Cli.Commands.Workload.Elevate;
 
 internal static class WorkloadElevateCommandParser
 {
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("elevate", CliCommandStrings.WorkloadElevateCommandDescription)
+        Command command = new("elevate", CliCommandStrings.WorkloadElevateCommandDescription)
         {
             Hidden = true
         };
diff --git a/src/Cli/dotnet/Commands/Workload/History/WorkloadHistoryCommandParser.cs b/src/Cli/dotnet/Commands/Workload/History/WorkloadHistoryCommandParser.cs
index 45a535ff3920..c292eea7da00 100644
--- a/src/Cli/dotnet/Commands/Workload/History/WorkloadHistoryCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Workload/History/WorkloadHistoryCommandParser.cs
@@ -7,16 +7,16 @@ namespace Microsoft.DotNet.Cli.Commands.Workload.History;
 
 internal static class WorkloadHistoryCommandParser
 {
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        var command = new CliCommand("history", CliCommandStrings.WorkloadHistoryCommandDescription);
+        var command = new Command("history", CliCommandStrings.WorkloadHistoryCommandDescription);
 
         command.SetAction(parseResult => new WorkloadHistoryCommand(parseResult).Execute());
 
diff --git a/src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallCommandParser.cs b/src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallCommandParser.cs
index 0218e098f077..521a3dc2e9b0 100644
--- a/src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallCommandParser.cs
@@ -7,41 +7,41 @@ namespace Microsoft.DotNet.Cli.Commands.Workload.Install;
 
 internal static class WorkloadInstallCommandParser
 {
-    public static readonly CliArgument<IEnumerable<string>> WorkloadIdArgument = new("workloadId")
+    public static readonly Argument<IEnumerable<string>> WorkloadIdArgument = new("workloadId")
     {
         HelpName = CliCommandStrings.WorkloadIdArgumentName,
         Arity = ArgumentArity.OneOrMore,
         Description = CliCommandStrings.WorkloadIdArgumentDescription
     };
 
-    public static readonly CliOption<bool> SkipSignCheckOption = new("--skip-sign-check")
+    public static readonly Option<bool> SkipSignCheckOption = new("--skip-sign-check")
     {
         Description = CliCommandStrings.SkipSignCheckOptionDescription,
         Hidden = true,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<bool> SkipManifestUpdateOption = new("--skip-manifest-update")
+    public static readonly Option<bool> SkipManifestUpdateOption = new("--skip-manifest-update")
     {
         Description = CliCommandStrings.SkipManifestUpdateOptionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<string> TempDirOption = new("--temp-dir")
+    public static readonly Option<string> TempDirOption = new("--temp-dir")
     {
         Description = CliCommandStrings.TempDirOptionDescription
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("install", CliCommandStrings.WorkloadInstallCommandDescription);
+        Command command = new("install", CliCommandStrings.WorkloadInstallCommandDescription);
 
         command.Arguments.Add(WorkloadIdArgument);
         AddWorkloadInstallCommandOptions(command);
@@ -51,7 +51,7 @@ private static CliCommand ConstructCommand()
         return command;
     }
 
-    internal static void AddWorkloadInstallCommandOptions(CliCommand command)
+    internal static void AddWorkloadInstallCommandOptions(Command command)
     {
         InstallingWorkloadCommandParser.AddWorkloadInstallCommandOptions(command);
 
diff --git a/src/Cli/dotnet/Commands/Workload/InstallingWorkloadCommand.cs b/src/Cli/dotnet/Commands/Workload/InstallingWorkloadCommand.cs
index aeaa7eefbb2c..b2df19d062b4 100644
--- a/src/Cli/dotnet/Commands/Workload/InstallingWorkloadCommand.cs
+++ b/src/Cli/dotnet/Commands/Workload/InstallingWorkloadCommand.cs
@@ -14,6 +14,7 @@
 using Microsoft.Extensions.EnvironmentAbstractions;
 using Microsoft.NET.Sdk.WorkloadManifestReader;
 using NuGet.Versioning;
+using Command = System.CommandLine.Command;
 
 namespace Microsoft.DotNet.Cli.Commands.Workload;
 
@@ -465,64 +466,64 @@ protected IEnumerable<WorkloadId> WriteSDKInstallRecordsForVSWorkloads(IEnumerab
 
 internal static class InstallingWorkloadCommandParser
 {
-    public static readonly CliOption<IEnumerable<string>> WorkloadSetVersionOption = new("--version")
+    public static readonly Option<IEnumerable<string>> WorkloadSetVersionOption = new("--version")
     {
         Description = CliCommandStrings.WorkloadSetVersionOptionDescription,
         AllowMultipleArgumentsPerToken = true
     };
 
-    public static readonly CliOption<bool> PrintDownloadLinkOnlyOption = new("--print-download-link-only")
+    public static readonly Option<bool> PrintDownloadLinkOnlyOption = new("--print-download-link-only")
     {
         Description = CliCommandStrings.PrintDownloadLinkOnlyDescription,
         Hidden = true
     };
 
-    public static readonly CliOption<string> FromCacheOption = new("--from-cache")
+    public static readonly Option<string> FromCacheOption = new("--from-cache")
     {
         Description = CliCommandStrings.FromCacheOptionDescription,
         HelpName = CliCommandStrings.FromCacheOptionArgumentName,
         Hidden = true
     };
 
-    public static readonly CliOption<bool> IncludePreviewOption =
+    public static readonly Option<bool> IncludePreviewOption =
     new("--include-previews")
     {
         Description = CliCommandStrings.IncludePreviewOptionDescription
     };
 
-    public static readonly CliOption<string> DownloadToCacheOption = new("--download-to-cache")
+    public static readonly Option<string> DownloadToCacheOption = new("--download-to-cache")
     {
         Description = CliCommandStrings.DownloadToCacheOptionDescription,
         HelpName = CliCommandStrings.DownloadToCacheOptionArgumentName,
         Hidden = true
     };
 
-    public static readonly CliOption<string> VersionOption = new("--sdk-version")
+    public static readonly Option<string> VersionOption = new("--sdk-version")
     {
         Description = CliCommandStrings.WorkloadInstallVersionOptionDescription,
         HelpName = CliCommandStrings.WorkloadInstallVersionOptionName,
         Hidden = true
     };
 
-    public static readonly CliOption<string> FromRollbackFileOption = new("--from-rollback-file")
+    public static readonly Option<string> FromRollbackFileOption = new("--from-rollback-file")
     {
         Description = CliCommandStrings.FromRollbackDefinitionOptionDescription,
         Hidden = true
     };
 
-    public static readonly CliOption<string> ConfigOption = new("--configfile")
+    public static readonly Option<string> ConfigOption = new("--configfile")
     {
         Description = CliCommandStrings.WorkloadInstallConfigFileOptionDescription,
         HelpName = CliCommandStrings.WorkloadInstallConfigFileOptionName
     };
 
-    public static readonly CliOption<string[]> SourceOption = new CliOption<string[]>("--source", "-s")
+    public static readonly Option<string[]> SourceOption = new Option<string[]>("--source", "-s")
     {
         Description = CliCommandStrings.WorkloadInstallSourceOptionDescription,
         HelpName = CliCommandStrings.WorkloadInstallSourceOptionName
     }.AllowSingleArgPerToken();
 
-    internal static void AddWorkloadInstallCommandOptions(CliCommand command)
+    internal static void AddWorkloadInstallCommandOptions(Command command)
     {
         command.Options.Add(VersionOption);
         command.Options.Add(ConfigOption);
diff --git a/src/Cli/dotnet/Commands/Workload/List/WorkloadListCommandParser.cs b/src/Cli/dotnet/Commands/Workload/List/WorkloadListCommandParser.cs
index 1fbdb1afba3a..a8a9aab81f39 100644
--- a/src/Cli/dotnet/Commands/Workload/List/WorkloadListCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Workload/List/WorkloadListCommandParser.cs
@@ -9,30 +9,30 @@ namespace Microsoft.DotNet.Cli.Commands.Workload.List;
 internal static class WorkloadListCommandParser
 {
     // arguments are a list of workload to be detected
-    public static readonly CliOption<bool> MachineReadableOption = new("--machine-readable") { Hidden = true };
+    public static readonly Option<bool> MachineReadableOption = new("--machine-readable") { Hidden = true };
 
-    public static readonly CliOption<string> VersionOption = InstallingWorkloadCommandParser.VersionOption;
+    public static readonly Option<string> VersionOption = InstallingWorkloadCommandParser.VersionOption;
 
-    public static readonly CliOption<string> TempDirOption = new CliOption<string>("--temp-dir")
+    public static readonly Option<string> TempDirOption = new Option<string>("--temp-dir")
     {
         Description = CliCommandStrings.TempDirOptionDescription
     }.Hide();
 
-    public static readonly CliOption<bool> IncludePreviewsOption = new CliOption<bool>("--include-previews")
+    public static readonly Option<bool> IncludePreviewsOption = new Option<bool>("--include-previews")
     {
         Description = CliCommandStrings.IncludePreviewOptionDescription
     }.Hide();
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("list", CliCommandStrings.WorkloadListCommandDescription);
+        Command command = new("list", CliCommandStrings.WorkloadListCommandDescription);
         command.Options.Add(MachineReadableOption);
         command.Options.Add(CommonOptions.HiddenVerbosityOption);
         command.Options.Add(VersionOption);
diff --git a/src/Cli/dotnet/Commands/Workload/Repair/WorkloadRepairCommandParser.cs b/src/Cli/dotnet/Commands/Workload/Repair/WorkloadRepairCommandParser.cs
index cfc3593bffca..ea247cd2ad4a 100644
--- a/src/Cli/dotnet/Commands/Workload/Repair/WorkloadRepairCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Workload/Repair/WorkloadRepairCommandParser.cs
@@ -8,22 +8,22 @@ namespace Microsoft.DotNet.Cli.Commands.Workload.Repair;
 
 internal static class WorkloadRepairCommandParser
 {
-    public static readonly CliOption<string> ConfigOption = InstallingWorkloadCommandParser.ConfigOption;
+    public static readonly Option<string> ConfigOption = InstallingWorkloadCommandParser.ConfigOption;
 
-    public static readonly CliOption<string[]> SourceOption = InstallingWorkloadCommandParser.SourceOption;
+    public static readonly Option<string[]> SourceOption = InstallingWorkloadCommandParser.SourceOption;
 
-    public static readonly CliOption<string> VersionOption = InstallingWorkloadCommandParser.VersionOption;
+    public static readonly Option<string> VersionOption = InstallingWorkloadCommandParser.VersionOption;
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("repair", CliCommandStrings.WorkloadRepairCommandDescription);
+        Command command = new("repair", CliCommandStrings.WorkloadRepairCommandDescription);
 
         command.Options.Add(VersionOption);
         command.Options.Add(ConfigOption);
diff --git a/src/Cli/dotnet/Commands/Workload/Restore/WorkloadRestoreCommandParser.cs b/src/Cli/dotnet/Commands/Workload/Restore/WorkloadRestoreCommandParser.cs
index 7ffdbc804d1c..779ab876d072 100644
--- a/src/Cli/dotnet/Commands/Workload/Restore/WorkloadRestoreCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Workload/Restore/WorkloadRestoreCommandParser.cs
@@ -9,16 +9,16 @@ namespace Microsoft.DotNet.Cli.Commands.Workload.Restore;
 
 internal static class WorkloadRestoreCommandParser
 {
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("restore", CliCommandStrings.WorkloadRestoreCommandDescription);
+        Command command = new("restore", CliCommandStrings.WorkloadRestoreCommandDescription);
 
         command.Arguments.Add(RestoreCommandParser.SlnOrProjectArgument);
         WorkloadInstallCommandParser.AddWorkloadInstallCommandOptions(command);
diff --git a/src/Cli/dotnet/Commands/Workload/Search/WorkloadSearchCommandParser.cs b/src/Cli/dotnet/Commands/Workload/Search/WorkloadSearchCommandParser.cs
index 034289d7ec4b..2abf6e76b869 100644
--- a/src/Cli/dotnet/Commands/Workload/Search/WorkloadSearchCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Workload/Search/WorkloadSearchCommandParser.cs
@@ -7,25 +7,25 @@ namespace Microsoft.DotNet.Cli.Commands.Workload.Search;
 
 internal static class WorkloadSearchCommandParser
 {
-    public static readonly CliArgument<string> WorkloadIdStubArgument =
+    public static readonly Argument<string> WorkloadIdStubArgument =
         new(CliCommandStrings.WorkloadIdStubArgumentName)
         {
             Arity = ArgumentArity.ZeroOrOne,
             Description = CliCommandStrings.WorkloadIdStubArgumentDescription
         };
 
-    public static readonly CliOption<string> VersionOption = InstallingWorkloadCommandParser.VersionOption;
+    public static readonly Option<string> VersionOption = InstallingWorkloadCommandParser.VersionOption;
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        var command = new CliCommand("search", CliCommandStrings.WorkloadSearchCommandDescription);
+        var command = new Command("search", CliCommandStrings.WorkloadSearchCommandDescription);
         command.Subcommands.Add(WorkloadSearchVersionsCommandParser.GetCommand());
         command.Arguments.Add(WorkloadIdStubArgument);
         command.Options.Add(CommonOptions.HiddenVerbosityOption);
diff --git a/src/Cli/dotnet/Commands/Workload/Search/WorkloadSearchVersionsCommandParser.cs b/src/Cli/dotnet/Commands/Workload/Search/WorkloadSearchVersionsCommandParser.cs
index e2dad4ca0523..1680d021b154 100644
--- a/src/Cli/dotnet/Commands/Workload/Search/WorkloadSearchVersionsCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Workload/Search/WorkloadSearchVersionsCommandParser.cs
@@ -7,32 +7,32 @@ namespace Microsoft.DotNet.Cli.Commands.Workload.Search;
 
 internal static class WorkloadSearchVersionsCommandParser
 {
-    public static readonly CliArgument<IEnumerable<string>> WorkloadVersionArgument =
+    public static readonly Argument<IEnumerable<string>> WorkloadVersionArgument =
         new(CliCommandStrings.WorkloadVersionArgument)
         {
             Arity = ArgumentArity.ZeroOrMore,
             Description = CliCommandStrings.WorkloadVersionArgumentDescription
         };
 
-    public static readonly CliOption<int> TakeOption = new("--take") { DefaultValueFactory = (_) => 5 };
+    public static readonly Option<int> TakeOption = new("--take") { DefaultValueFactory = (_) => 5 };
 
-    public static readonly CliOption<string> FormatOption = new("--format")
+    public static readonly Option<string> FormatOption = new("--format")
     {
         Description = CliCommandStrings.FormatOptionDescription
     };
 
-    public static readonly CliOption<bool> IncludePreviewsOption = new("--include-previews");
+    public static readonly Option<bool> IncludePreviewsOption = new("--include-previews");
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        var command = new CliCommand("version", CliCommandStrings.PrintSetVersionsDescription);
+        var command = new Command("version", CliCommandStrings.PrintSetVersionsDescription);
         command.Arguments.Add(WorkloadVersionArgument);
         command.Options.Add(FormatOption);
         command.Options.Add(TakeOption);
diff --git a/src/Cli/dotnet/Commands/Workload/Uninstall/WorkloadUninstallCommandParser.cs b/src/Cli/dotnet/Commands/Workload/Uninstall/WorkloadUninstallCommandParser.cs
index 62237e2e17f2..66a3e1b7ee88 100644
--- a/src/Cli/dotnet/Commands/Workload/Uninstall/WorkloadUninstallCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Workload/Uninstall/WorkloadUninstallCommandParser.cs
@@ -8,20 +8,20 @@ namespace Microsoft.DotNet.Cli.Commands.Workload.Uninstall;
 
 internal static class WorkloadUninstallCommandParser
 {
-    public static readonly CliArgument<IEnumerable<string>> WorkloadIdArgument = WorkloadInstallCommandParser.WorkloadIdArgument;
+    public static readonly Argument<IEnumerable<string>> WorkloadIdArgument = WorkloadInstallCommandParser.WorkloadIdArgument;
 
-    public static readonly CliOption<string> VersionOption = InstallingWorkloadCommandParser.VersionOption;
+    public static readonly Option<string> VersionOption = InstallingWorkloadCommandParser.VersionOption;
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("uninstall", CliCommandStrings.WorkloadUninstallCommandDescription);
+        Command command = new("uninstall", CliCommandStrings.WorkloadUninstallCommandDescription);
         command.Arguments.Add(WorkloadIdArgument);
         command.Options.Add(WorkloadInstallCommandParser.SkipSignCheckOption);
         command.Options.Add(CommonOptions.VerbosityOption);
diff --git a/src/Cli/dotnet/Commands/Workload/Update/WorkloadUpdateCommandParser.cs b/src/Cli/dotnet/Commands/Workload/Update/WorkloadUpdateCommandParser.cs
index 31aab48600a7..bdde431e8ae1 100644
--- a/src/Cli/dotnet/Commands/Workload/Update/WorkloadUpdateCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Workload/Update/WorkloadUpdateCommandParser.cs
@@ -8,45 +8,45 @@ namespace Microsoft.DotNet.Cli.Commands.Workload.Update;
 
 internal static class WorkloadUpdateCommandParser
 {
-    public static readonly CliOption<string> TempDirOption = WorkloadInstallCommandParser.TempDirOption;
+    public static readonly Option<string> TempDirOption = WorkloadInstallCommandParser.TempDirOption;
 
-    public static readonly CliOption<bool> FromPreviousSdkOption = new("--from-previous-sdk")
+    public static readonly Option<bool> FromPreviousSdkOption = new("--from-previous-sdk")
     {
         Description = CliCommandStrings.FromPreviousSdkOptionDescription
     };
 
-    public static readonly CliOption<bool> AdManifestOnlyOption = new("--advertising-manifests-only")
+    public static readonly Option<bool> AdManifestOnlyOption = new("--advertising-manifests-only")
     {
         Description = CliCommandStrings.AdManifestOnlyOptionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<bool> PrintRollbackOption = new("--print-rollback")
+    public static readonly Option<bool> PrintRollbackOption = new("--print-rollback")
     {
         Hidden = true,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<int> FromHistoryOption = new("--from-history")
+    public static readonly Option<int> FromHistoryOption = new("--from-history")
     {
         Description = CliCommandStrings.FromHistoryOptionDescription
     };
 
-    public static readonly CliOption<string> HistoryManifestOnlyOption = new("--manifests-only")
+    public static readonly Option<string> HistoryManifestOnlyOption = new("--manifests-only")
     {
         Description = CliCommandStrings.HistoryManifestOnlyOptionDescription
     };
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         return Command;
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
-        CliCommand command = new("update", CliCommandStrings.WorkloadUpdateCommandDescription);
+        Command command = new("update", CliCommandStrings.WorkloadUpdateCommandDescription);
 
         InstallingWorkloadCommandParser.AddWorkloadInstallCommandOptions(command);
 
diff --git a/src/Cli/dotnet/Commands/Workload/WorkloadCommandBase.cs b/src/Cli/dotnet/Commands/Workload/WorkloadCommandBase.cs
index ad439ff734ef..247463b2b7d3 100644
--- a/src/Cli/dotnet/Commands/Workload/WorkloadCommandBase.cs
+++ b/src/Cli/dotnet/Commands/Workload/WorkloadCommandBase.cs
@@ -85,7 +85,7 @@ protected bool VerifySignatures
     /// <param name="nugetPackageDownloader">The package downloader to use for acquiring NuGet packages.</param>
     public WorkloadCommandBase(
         ParseResult parseResult,
-        CliOption<VerbosityOptions> verbosityOptions = null,
+        Option<VerbosityOptions> verbosityOptions = null,
         IReporter? reporter = null,
         string tempDirPath = null,
         INuGetPackageDownloader nugetPackageDownloader = null) : base(parseResult)
diff --git a/src/Cli/dotnet/Commands/Workload/WorkloadCommandNuGetRestoreActionConfigOptions.cs b/src/Cli/dotnet/Commands/Workload/WorkloadCommandNuGetRestoreActionConfigOptions.cs
index 280de078cf8c..35252a6f61db 100644
--- a/src/Cli/dotnet/Commands/Workload/WorkloadCommandNuGetRestoreActionConfigOptions.cs
+++ b/src/Cli/dotnet/Commands/Workload/WorkloadCommandNuGetRestoreActionConfigOptions.cs
@@ -9,58 +9,58 @@ namespace Microsoft.DotNet.Cli.Commands.Workload;
 
 internal static class WorkloadCommandNuGetRestoreActionConfigOptions
 {
-    public static CliOption<bool> DisableParallelOption = new ForwardedOption<bool>("--disable-parallel")
+    public static Option<bool> DisableParallelOption = new ForwardedOption<bool>("--disable-parallel")
     {
         Description = CliCommandStrings.CmdDisableParallelOptionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static CliOption<bool> NoCacheOption = new ForwardedOption<bool>("--no-cache")
+    public static Option<bool> NoCacheOption = new ForwardedOption<bool>("--no-cache")
     {
         Description = CliCommandStrings.CmdNoCacheOptionDescription,
         Hidden = true,
         Arity = ArgumentArity.Zero
     };
 
-    public static CliOption<bool> NoHttpCacheOption = new ForwardedOption<bool>("--no-http-cache")
+    public static Option<bool> NoHttpCacheOption = new ForwardedOption<bool>("--no-http-cache")
     {
         Description = CliCommandStrings.CmdNoCacheOptionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static CliOption<bool> IgnoreFailedSourcesOption = new ForwardedOption<bool>("--ignore-failed-sources")
+    public static Option<bool> IgnoreFailedSourcesOption = new ForwardedOption<bool>("--ignore-failed-sources")
     {
         Description = CliCommandStrings.CmdIgnoreFailedSourcesOptionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static CliOption<bool> InteractiveRestoreOption = CommonOptions.InteractiveOption();
+    public static Option<bool> InteractiveRestoreOption = CommonOptions.InteractiveOption();
 
-    public static CliOption<bool> HiddenDisableParallelOption = new ForwardedOption<bool>("--disable-parallel")
+    public static Option<bool> HiddenDisableParallelOption = new ForwardedOption<bool>("--disable-parallel")
     {
         Description = CliCommandStrings.CmdDisableParallelOptionDescription,
         Arity = ArgumentArity.Zero
     }.Hide();
 
-    public static CliOption<bool> HiddenNoCacheOption = new ForwardedOption<bool>("--no-cache")
+    public static Option<bool> HiddenNoCacheOption = new ForwardedOption<bool>("--no-cache")
     {
         Description = CliCommandStrings.CmdNoCacheOptionDescription,
         Arity = ArgumentArity.Zero
     }.Hide();
 
-    public static CliOption<bool> HiddenNoHttpCacheOption = new ForwardedOption<bool>("--no-http-cache")
+    public static Option<bool> HiddenNoHttpCacheOption = new ForwardedOption<bool>("--no-http-cache")
     {
         Description = CliCommandStrings.CmdNoCacheOptionDescription,
         Arity = ArgumentArity.Zero
     }.Hide();
 
-    public static CliOption<bool> HiddenIgnoreFailedSourcesOption = new ForwardedOption<bool>("--ignore-failed-sources")
+    public static Option<bool> HiddenIgnoreFailedSourcesOption = new ForwardedOption<bool>("--ignore-failed-sources")
     {
         Description = CliCommandStrings.CmdIgnoreFailedSourcesOptionDescription,
         Arity = ArgumentArity.Zero
     }.Hide();
 
-    public static CliOption<bool> HiddenInteractiveRestoreOption = new ForwardedOption<bool>("--interactive")
+    public static Option<bool> HiddenInteractiveRestoreOption = new ForwardedOption<bool>("--interactive")
     {
         Description = CliStrings.CommandInteractiveOptionDescription,
     }.Hide();
@@ -73,7 +73,7 @@ public static RestoreActionConfig ToRestoreActionConfig(this ParseResult parseRe
             Interactive: parseResult.GetValue(InteractiveRestoreOption));
     }
 
-    public static void AddWorkloadCommandNuGetRestoreActionConfigOptions(this CliCommand command, bool Hide = false)
+    public static void AddWorkloadCommandNuGetRestoreActionConfigOptions(this Command command, bool Hide = false)
     {
         command.Options.Add(Hide ? HiddenDisableParallelOption : DisableParallelOption);
         command.Options.Add(Hide ? HiddenIgnoreFailedSourcesOption : IgnoreFailedSourcesOption);
diff --git a/src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs b/src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs
index 12551f4bb052..be32580582ac 100644
--- a/src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs
@@ -18,6 +18,7 @@
 using Microsoft.NET.Sdk.WorkloadManifestReader;
 using Microsoft.TemplateEngine.Cli.Commands;
 using IReporter = Microsoft.DotNet.Cli.Utils.IReporter;
+using Command = System.CommandLine.Command;
 
 namespace Microsoft.DotNet.Cli.Commands.Workload;
 
@@ -25,21 +26,21 @@ internal static class WorkloadCommandParser
 {
     public static readonly string DocsLink = "https://aka.ms/dotnet-workload";
 
-    private static readonly CliCommand Command = ConstructCommand();
+    private static readonly Command Command = ConstructCommand();
 
-    public static readonly CliOption<bool> InfoOption = new("--info")
+    public static readonly Option<bool> InfoOption = new("--info")
     {
         Description = CliCommandStrings.WorkloadInfoDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static readonly CliOption<bool> VersionOption = new("--version")
+    public static readonly Option<bool> VersionOption = new("--version")
     {
         Description = CliCommandStrings.WorkloadVersionDescription,
         Arity = ArgumentArity.Zero
     };
 
-    public static CliCommand GetCommand()
+    public static Command GetCommand()
     {
         Command.Options.Add(InfoOption);
         Command.Options.Add(VersionOption);
@@ -150,7 +151,7 @@ private static int ProcessArgs(ParseResult parseResult)
         return parseResult.HandleMissingCommand();
     }
 
-    private static CliCommand ConstructCommand()
+    private static Command ConstructCommand()
     {
         DocumentedCommand command = new("workload", DocsLink, CliCommandStrings.WorkloadCommandDescription);
 
diff --git a/src/Cli/dotnet/CommonArguments.cs b/src/Cli/dotnet/CommonArguments.cs
index edc9d1ac1107..c4c2713f3d1d 100644
--- a/src/Cli/dotnet/CommonArguments.cs
+++ b/src/Cli/dotnet/CommonArguments.cs
@@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Cli
     internal class CommonArguments
     {
         #region PackageIdentityArgument
-        public static CliArgument<PackageIdentity?> PackageIdentityArgument(bool requireArgument = true) =>
+        public static Argument<PackageIdentity?> PackageIdentityArgument(bool requireArgument = true) =>
             new("packageId")
             {
                 HelpName = "PACKAGE_ID",
diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs
index fe1d4c775e71..e362c30f9d20 100644
--- a/src/Cli/dotnet/CommonOptions.cs
+++ b/src/Cli/dotnet/CommonOptions.cs
@@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli;
 
 internal static class CommonOptions
 {
-    public static CliOption<string[]> PropertiesOption =
+    public static Option<string[]> PropertiesOption =
         // these are all of the forms that the property switch can be understood by in MSBuild
         new ForwardedOption<string[]>("--property", "-property", "/property", "/p", "-p", "--p")
         {
@@ -20,14 +20,14 @@ internal static class CommonOptions
         }.ForwardAsProperty()
         .AllowSingleArgPerToken();
 
-    public static CliOption<VerbosityOptions> VerbosityOption =
+    public static Option<VerbosityOptions> VerbosityOption =
         new ForwardedOption<VerbosityOptions>("--verbosity", "-v")
         {
             Description = CliStrings.VerbosityOptionDescription,
             HelpName = CliStrings.LevelArgumentName
         }.ForwardAsSingle(o => $"-verbosity:{o}");
 
-    public static CliOption<VerbosityOptions> HiddenVerbosityOption =
+    public static Option<VerbosityOptions> HiddenVerbosityOption =
         new ForwardedOption<VerbosityOptions>("--verbosity", "-v")
         {
             Description = CliStrings.VerbosityOptionDescription,
@@ -35,7 +35,7 @@ internal static class CommonOptions
             Hidden = true
         }.ForwardAsSingle(o => $"-verbosity:{o}");
 
-    public static CliOption<string> FrameworkOption(string description) =>
+    public static Option<string> FrameworkOption(string description) =>
         new DynamicForwardedOption<string>("--framework", "-f")
         {
             Description = description,
@@ -44,7 +44,7 @@ public static CliOption<string> FrameworkOption(string description) =>
         .AddCompletions(CliCompletion.TargetFrameworksFromProjectFile)
         .ForwardAsSingle(o => $"-property:TargetFramework={o}");
 
-    public static CliOption<string> ArtifactsPathOption =
+    public static Option<string> ArtifactsPathOption =
         new ForwardedOption<string>(
             //  --artifacts-path is pretty verbose, should we use --artifacts instead (or possibly support both)?
             "--artifacts-path")
@@ -63,28 +63,28 @@ public static IEnumerable<string> RuntimeArgFunc(string rid)
         return [$"-property:RuntimeIdentifier={rid}", "-property:_CommandLineDefinedRuntimeIdentifier=true"];
     }
 
-    public static CliOption<string> RuntimeOption =
+    public static Option<string> RuntimeOption =
         new DynamicForwardedOption<string>("--runtime", "-r")
         {
             HelpName = RuntimeArgName
         }.ForwardAsMany(RuntimeArgFunc)
         .AddCompletions(CliCompletion.RunTimesFromProjectFile);
 
-    public static CliOption<string> LongFormRuntimeOption =
+    public static Option<string> LongFormRuntimeOption =
         new DynamicForwardedOption<string>("--runtime")
         {
             HelpName = RuntimeArgName
         }.ForwardAsMany(RuntimeArgFunc)
         .AddCompletions(CliCompletion.RunTimesFromProjectFile);
 
-    public static CliOption<bool> CurrentRuntimeOption(string description) =>
+    public static Option<bool> CurrentRuntimeOption(string description) =>
         new ForwardedOption<bool>("--use-current-runtime", "--ucr")
         {
             Description = description,
             Arity = ArgumentArity.Zero
         }.ForwardAs("-property:UseCurrentRuntimeIdentifier=True");
 
-    public static CliOption<string> ConfigurationOption(string description) =>
+    public static Option<string> ConfigurationOption(string description) =>
         new DynamicForwardedOption<string>("--configuration", "-c")
         {
             Description = description,
@@ -92,7 +92,7 @@ public static CliOption<string> ConfigurationOption(string description) =>
         }.ForwardAsSingle(o => $"-property:Configuration={o}")
         .AddCompletions(CliCompletion.ConfigurationsFromProjectFileOrDefaults);
 
-    public static CliOption<string> VersionSuffixOption =
+    public static Option<string> VersionSuffixOption =
         new ForwardedOption<string>("--version-suffix")
         {
             Description = CliStrings.CmdVersionSuffixDescription,
@@ -101,7 +101,7 @@ public static CliOption<string> ConfigurationOption(string description) =>
 
     public static Lazy<string> NormalizedCurrentDirectory = new(() => PathUtility.EnsureTrailingSlash(Directory.GetCurrentDirectory()));
 
-    public static CliArgument<string> DefaultToCurrentDirectory(this CliArgument<string> arg)
+    public static Argument<string> DefaultToCurrentDirectory(this Argument<string> arg)
     {
         // we set this lazily so that we don't pay the overhead of determining the
         // CWD multiple times, one for each Argument that uses this.
@@ -109,7 +109,7 @@ public static CliArgument<string> DefaultToCurrentDirectory(this CliArgument<str
         return arg;
     }
 
-    public static CliOption<bool> NoRestoreOption = new ForwardedOption<bool>("--no-restore")
+    public static Option<bool> NoRestoreOption = new ForwardedOption<bool>("--no-restore")
     {
         Description = CliStrings.NoRestoreDescription,
         Arity = ArgumentArity.Zero
@@ -136,9 +136,9 @@ public static ForwardedOption<bool> InteractiveOption(bool acceptArgument = fals
              DefaultValueFactory = (ar) => !IsCIEnvironmentOrRedirected()
          };
 
-    public static CliOption<bool> InteractiveMsBuildForwardOption = InteractiveOption(acceptArgument: true).ForwardAsSingle(b => $"-property:NuGetInteractive={(b ? "true" : "false")}");
+    public static Option<bool> InteractiveMsBuildForwardOption = InteractiveOption(acceptArgument: true).ForwardAsSingle(b => $"-property:NuGetInteractive={(b ? "true" : "false")}");
 
-    public static CliOption<bool> DisableBuildServersOption =
+    public static Option<bool> DisableBuildServersOption =
         new ForwardedOption<bool>("--disable-build-servers")
         {
             Description = CliStrings.DisableBuildServersOptionDescription,
@@ -146,14 +146,14 @@ public static ForwardedOption<bool> InteractiveOption(bool acceptArgument = fals
         }
         .ForwardAsMany(_ => ["--property:UseRazorBuildServer=false", "--property:UseSharedCompilation=false", "/nodeReuse:false"]);
 
-    public static CliOption<string> ArchitectureOption =
+    public static Option<string> ArchitectureOption =
         new ForwardedOption<string>("--arch", "-a")
         {
             Description = CliStrings.ArchitectureOptionDescription,
             HelpName = CliStrings.ArchArgumentName
         }.SetForwardingFunction(ResolveArchOptionToRuntimeIdentifier);
 
-    public static CliOption<string> LongFormArchitectureOption =
+    public static Option<string> LongFormArchitectureOption =
         new ForwardedOption<string>("--arch")
         {
             Description = CliStrings.ArchitectureOptionDescription,
@@ -165,26 +165,26 @@ internal static string ArchOptionValue(ParseResult parseResult) =>
             parseResult.GetValue(LongFormArchitectureOption) :
             parseResult.GetValue(ArchitectureOption);
 
-    public static CliOption<string> OperatingSystemOption =
+    public static Option<string> OperatingSystemOption =
         new ForwardedOption<string>("--os")
         {
             Description = CliStrings.OperatingSystemOptionDescription,
             HelpName = CliStrings.OSArgumentName
         }.SetForwardingFunction(ResolveOsOptionToRuntimeIdentifier);
 
-    public static CliOption<bool> DebugOption = new("--debug")
+    public static Option<bool> DebugOption = new("--debug")
     {
         Arity = ArgumentArity.Zero,
     };
 
-    public static CliOption<bool> SelfContainedOption =
+    public static Option<bool> SelfContainedOption =
         new ForwardedOption<bool>("--self-contained", "--sc")
         {
             Description = CliStrings.SelfContainedOptionDescription
         }
         .SetForwardingFunction(ForwardSelfContainedOptions);
 
-    public static CliOption<bool> NoSelfContainedOption =
+    public static Option<bool> NoSelfContainedOption =
         new ForwardedOption<bool>("--no-self-contained")
         {
             Description = CliStrings.FrameworkDependentOptionDescription,
@@ -192,7 +192,7 @@ internal static string ArchOptionValue(ParseResult parseResult) =>
         }
         .SetForwardingFunction((_, p) => ForwardSelfContainedOptions(false, p));
 
-    public static readonly CliOption<IReadOnlyDictionary<string, string>> EnvOption = new("--environment", "-e")
+    public static readonly Option<IReadOnlyDictionary<string, string>> EnvOption = new("--environment", "-e")
     {
         Description = CliStrings.CmdEnvironmentVariableDescription,
         HelpName = CliStrings.CmdEnvironmentVariableExpression,
@@ -206,7 +206,7 @@ private static IReadOnlyDictionary<string, string> ParseEnvironmentVariables(Arg
         var result = new Dictionary<string, string>(
             RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal);
 
-        List<CliToken>? invalid = null;
+        List<Token>? invalid = null;
 
         foreach (var token in argumentResult.Tokens)
         {
@@ -238,11 +238,11 @@ private static IReadOnlyDictionary<string, string> ParseEnvironmentVariables(Arg
         return result;
     }
 
-    public static readonly CliOption<string> TestPlatformOption = new("--Platform");
+    public static readonly Option<string> TestPlatformOption = new("--Platform");
 
-    public static readonly CliOption<string> TestFrameworkOption = new("--Framework");
+    public static readonly Option<string> TestFrameworkOption = new("--Framework");
 
-    public static readonly CliOption<string[]> TestLoggerOption = new("--logger");
+    public static readonly Option<string[]> TestLoggerOption = new("--logger");
 
     public static void ValidateSelfContainedOptions(bool hasSelfContainedOption, bool hasNoSelfContainedOption)
     {
@@ -321,13 +321,13 @@ private static IEnumerable<string> ForwardSelfContainedOptions(bool isSelfContai
         return selfContainedProperties;
     }
 
-    internal static CliOption<T> AddCompletions<T>(this CliOption<T> option, Func<CompletionContext, IEnumerable<CompletionItem>> completionSource)
+    internal static Option<T> AddCompletions<T>(this Option<T> option, Func<CompletionContext, IEnumerable<CompletionItem>> completionSource)
     {
         option.CompletionSources.Add(completionSource);
         return option;
     }
 
-    internal static CliArgument<T> AddCompletions<T>(this CliArgument<T> argument, Func<CompletionContext, IEnumerable<CompletionItem>> completionSource)
+    internal static Argument<T> AddCompletions<T>(this Argument<T> argument, Func<CompletionContext, IEnumerable<CompletionItem>> completionSource)
     {
         argument.CompletionSources.Add(completionSource);
         return argument;
@@ -360,10 +360,10 @@ public enum VerbosityOptions
     diag
 }
 
-public class DynamicOption<T>(string name, params string[] aliases) : CliOption<T>(name, aliases), IDynamicOption
+public class DynamicOption<T>(string name, params string[] aliases) : Option<T>(name, aliases), IDynamicOption
 {
 }
 
-public class DynamicArgument<T>(string name) : CliArgument<T>(name), IDynamicArgument
+public class DynamicArgument<T>(string name) : Argument<T>(name), IDynamicArgument
 {
 }
diff --git a/src/Cli/dotnet/CommonOptionsFactory.cs b/src/Cli/dotnet/CommonOptionsFactory.cs
index f0230c733eb1..bdb1aad36648 100644
--- a/src/Cli/dotnet/CommonOptionsFactory.cs
+++ b/src/Cli/dotnet/CommonOptionsFactory.cs
@@ -13,7 +13,7 @@ internal static class CommonOptionsFactory
     /// <summary>
     /// Creates common diagnostics option (-d|--diagnostics).
     /// </summary>
-    public static CliOption<bool> CreateDiagnosticsOption(bool recursive) => new("--diagnostics", "-d")
+    public static Option<bool> CreateDiagnosticsOption(bool recursive) => new("--diagnostics", "-d")
     {
         Description = CliStrings.SDKDiagnosticsCommandDefinition,
         Recursive = recursive,
diff --git a/src/Cli/dotnet/DocumentedCommand.cs b/src/Cli/dotnet/DocumentedCommand.cs
index ecf6cd69fc4d..3223b13a1e51 100644
--- a/src/Cli/dotnet/DocumentedCommand.cs
+++ b/src/Cli/dotnet/DocumentedCommand.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.DotNet.Cli;
 
-public class DocumentedCommand(string name, string docsLink, string description = null) : CliCommand(name, description), ICommandDocument
+public class DocumentedCommand(string name, string docsLink, string description = null) : Command(name, description), ICommandDocument
 {
     public string DocsLink { get; } = docsLink;
 }
diff --git a/src/Cli/dotnet/DotNetCommandFactory.cs b/src/Cli/dotnet/DotNetCommandFactory.cs
index 035be080e75f..b740a3d8ba42 100644
--- a/src/Cli/dotnet/DotNetCommandFactory.cs
+++ b/src/Cli/dotnet/DotNetCommandFactory.cs
@@ -34,7 +34,7 @@ public ICommand Create(
     private static bool TryGetBuiltInCommand(string commandName, out Func<string[], int> commandFunc)
     {
         var command = Parser.GetBuiltInCommand(commandName);
-        if (command?.Action is AsynchronousCliAction action)
+        if (command?.Action is AsynchronousCommandLineAction action)
         {
             commandFunc = (args) => action.InvokeAsync(Parser.Instance.Parse(args)).Result;
             return true;
diff --git a/src/Cli/dotnet/Extensions/OptionForwardingExtensions.cs b/src/Cli/dotnet/Extensions/OptionForwardingExtensions.cs
index 04e9106814a6..9e0af2e4ae62 100644
--- a/src/Cli/dotnet/Extensions/OptionForwardingExtensions.cs
+++ b/src/Cli/dotnet/Extensions/OptionForwardingExtensions.cs
@@ -56,17 +56,17 @@ public static ForwardedOption<string[]> ForwardAsProperty(this ForwardedOption<s
                 .Select(keyValue => $"{option.Name}:{keyValue.key}={keyValue.value}")
             );
 
-    public static CliOption<T> ForwardAsMany<T>(this ForwardedOption<T> option, Func<T?, IEnumerable<string>> format) => option.SetForwardingFunction(format);
+    public static Option<T> ForwardAsMany<T>(this ForwardedOption<T> option, Func<T?, IEnumerable<string>> format) => option.SetForwardingFunction(format);
 
-    public static CliOption<IEnumerable<string>> ForwardAsManyArgumentsEachPrefixedByOption(this ForwardedOption<IEnumerable<string>> option, string alias) => option.ForwardAsMany(o => ForwardedArguments(alias, o));
+    public static Option<IEnumerable<string>> ForwardAsManyArgumentsEachPrefixedByOption(this ForwardedOption<IEnumerable<string>> option, string alias) => option.ForwardAsMany(o => ForwardedArguments(alias, o));
 
-    public static IEnumerable<string> OptionValuesToBeForwarded(this ParseResult parseResult, CliCommand command) =>
+    public static IEnumerable<string> OptionValuesToBeForwarded(this ParseResult parseResult, Command command) =>
         command.Options
             .OfType<IForwardedOption>()
             .Select(o => o.GetForwardingFunction())
             .SelectMany(f => f is not null ? f(parseResult) : []);
 
-    public static IEnumerable<string> ForwardedOptionValues<T>(this ParseResult parseResult, CliCommand command, string alias)
+    public static IEnumerable<string> ForwardedOptionValues<T>(this ParseResult parseResult, Command command, string alias)
     {
         var func = command.Options?
             .Where(o => o.Name.Equals(alias) || o.Aliases.Contains(alias))?
@@ -76,21 +76,21 @@ public static IEnumerable<string> ForwardedOptionValues<T>(this ParseResult pars
         return func?.Invoke(parseResult) ?? [];
     }
 
-    public static CliOption<T> AllowSingleArgPerToken<T>(this CliOption<T> option)
+    public static Option<T> AllowSingleArgPerToken<T>(this Option<T> option)
     {
         option.AllowMultipleArgumentsPerToken = false;
         return option;
     }
 
-    public static CliOption<T> Hide<T>(this CliOption<T> option)
+    public static Option<T> Hide<T>(this Option<T> option)
     {
         option.Hidden = true;
         return option;
     }
 
-    internal static Dictionary<CliOption, Dictionary<CliCommand, string>> HelpDescriptionCustomizations = [];
+    internal static Dictionary<Option, Dictionary<Command, string>> HelpDescriptionCustomizations = [];
 
-    public static CliOption<T> WithHelpDescription<T>(this CliOption<T> option, CliCommand command, string helpText)
+    public static Option<T> WithHelpDescription<T>(this Option<T> option, Command command, string helpText)
     {
         if (HelpDescriptionCustomizations.ContainsKey(option))
         {
@@ -98,7 +98,7 @@ public static CliOption<T> WithHelpDescription<T>(this CliOption<T> option, CliC
         }
         else
         {
-            HelpDescriptionCustomizations.Add(option, new Dictionary<CliCommand, string>() { { command, helpText } });
+            HelpDescriptionCustomizations.Add(option, new Dictionary<Command, string>() { { command, helpText } });
         }
 
         return option;
@@ -119,7 +119,7 @@ public interface IForwardedOption
     Func<ParseResult, IEnumerable<string>> GetForwardingFunction();
 }
 
-public class ForwardedOption<T> : CliOption<T>, IForwardedOption
+public class ForwardedOption<T> : Option<T>, IForwardedOption
 {
     private Func<ParseResult, IEnumerable<string>> ForwardingFunction;
 
diff --git a/src/Cli/dotnet/Extensions/ParseResultExtensions.cs b/src/Cli/dotnet/Extensions/ParseResultExtensions.cs
index 5ff2e8aed3c5..fc9ebb221c9e 100644
--- a/src/Cli/dotnet/Extensions/ParseResultExtensions.cs
+++ b/src/Cli/dotnet/Extensions/ParseResultExtensions.cs
@@ -30,7 +30,7 @@ public static void ShowHelp(this ParseResult parseResult)
     {
         // take from the start of the list until we hit an option/--/unparsed token
         // since commands can have arguments, we must take those as well in order to get accurate help
-        var tokenList = parseResult.Tokens.TakeWhile(token => token.Type == CliTokenType.Argument || token.Type == CliTokenType.Command || token.Type == CliTokenType.Directive).Select(t => t.Value).ToList();
+        var tokenList = parseResult.Tokens.TakeWhile(token => token.Type == TokenType.Argument || token.Type == TokenType.Command || token.Type == TokenType.Directive).Select(t => t.Value).ToList();
         tokenList.Add("-h");
         Instance.Parse(tokenList).Invoke();
     }
@@ -97,13 +97,13 @@ public static bool IsDotnetBuiltInCommand(this ParseResult parseResult)
 
     public static bool IsTopLevelDotnetCommand(this ParseResult parseResult)
     {
-        return parseResult.CommandResult.Command.Equals(RootCommand) && string.IsNullOrEmpty(parseResult.RootSubCommandResult());
+        return parseResult.CommandResult.Command.Equals(Microsoft.DotNet.Cli.Parser.RootCommand) && string.IsNullOrEmpty(parseResult.RootSubCommandResult());
     }
 
     public static bool CanBeInvoked(this ParseResult parseResult)
     {
         return GetBuiltInCommand(parseResult.RootSubCommandResult()) != null ||
-            parseResult.Tokens.Any(token => token.Type == CliTokenType.Directive) ||
+            parseResult.Tokens.Any(token => token.Type == TokenType.Directive) ||
             (parseResult.IsTopLevelDotnetCommand() && string.IsNullOrEmpty(parseResult.GetValue(DotnetSubCommand)));
     }
 
@@ -225,14 +225,14 @@ private static IEnumerable<string> GetRunPropertyOptions(ParseResult parseResult
         var propertyValues = propertyOptions.SelectMany(o => o.Tokens.Select(t => t.Value)).ToArray();
         return propertyValues;
 
-        static CliToken GetOptionTokenOrDefault(SymbolResult symbolResult)
+        static Token GetOptionTokenOrDefault(SymbolResult symbolResult)
         {
             if (symbolResult is not OptionResult optionResult)
             {
                 return null;
             }
 
-            return optionResult.IdentifierToken ?? new CliToken($"--{optionResult.Option.Name}", CliTokenType.Option, optionResult.Option);
+            return optionResult.IdentifierToken ?? new Token($"--{optionResult.Option.Name}", TokenType.Option, optionResult.Option);
         }
     }
 
@@ -251,7 +251,7 @@ public static void HandleDebugSwitch(this ParseResult parseResult)
     /// If you are inside a command handler or 'normal' System.CommandLine code then you don't need this - the parse error handling
     /// will have covered these cases.
     /// </summary>
-    public static T SafelyGetValueForOption<T>(this ParseResult parseResult, CliOption<T> optionToGet)
+    public static T SafelyGetValueForOption<T>(this ParseResult parseResult, Option<T> optionToGet)
     {
         if (parseResult.GetResult(optionToGet) is OptionResult optionResult &&
             !parseResult.Errors.Any(e => e.SymbolResult == optionResult))
@@ -268,5 +268,5 @@ public static T SafelyGetValueForOption<T>(this ParseResult parseResult, CliOpti
     /// Checks if the option is present and not implicit (i.e. not set by default).
     /// This is useful for checking if the user has explicitly set an option, as opposed to it being set by default.
     /// </summary>
-    public static bool HasOption(this ParseResult parseResult, CliOption option) => parseResult.GetResult(option) is OptionResult or && !or.Implicit;
+    public static bool HasOption(this ParseResult parseResult, Option option) => parseResult.GetResult(option) is OptionResult or && !or.Implicit;
 }
diff --git a/src/Cli/dotnet/Extensions/ParserExtensions.cs b/src/Cli/dotnet/Extensions/ParserExtensions.cs
index b7a19eacc95b..83ff922ece2c 100644
--- a/src/Cli/dotnet/Extensions/ParserExtensions.cs
+++ b/src/Cli/dotnet/Extensions/ParserExtensions.cs
@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Cli.Extensions;
 public static class ParserExtensions
 {
     public static ParseResult ParseFrom(
-        this CliConfiguration parser,
+        this CommandLineConfiguration parser,
         string context,
         string[] args = null) =>
         parser.Parse([.. context.Split(' '), .. args]);
diff --git a/src/Cli/dotnet/NugetSearch/NugetSearchApiParameter.cs b/src/Cli/dotnet/NugetSearch/NugetSearchApiParameter.cs
index 9c6cac30c6cc..827d298792d4 100644
--- a/src/Cli/dotnet/NugetSearch/NugetSearchApiParameter.cs
+++ b/src/Cli/dotnet/NugetSearch/NugetSearchApiParameter.cs
@@ -40,7 +40,7 @@ public NugetSearchApiParameter(ParseResult parseResult)
         Prerelease = prerelease;
     }
 
-    private static int? GetParsedResultAsInt(ParseResult parseResult, CliOption<string> alias)
+    private static int? GetParsedResultAsInt(ParseResult parseResult, Option<string> alias)
     {
         var valueFromParser = parseResult.GetValue(alias);
         if (string.IsNullOrWhiteSpace(valueFromParser))
diff --git a/src/Cli/dotnet/Parser.cs b/src/Cli/dotnet/Parser.cs
index 6408620f7ad8..d59cdea4703a 100644
--- a/src/Cli/dotnet/Parser.cs
+++ b/src/Cli/dotnet/Parser.cs
@@ -42,20 +42,21 @@
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.TemplateEngine.Cli;
+using Command = System.CommandLine.Command;
 
 namespace Microsoft.DotNet.Cli;
 
 public static class Parser
 {
-    public static readonly CliRootCommand RootCommand = new()
+    public static readonly RootCommand RootCommand = new()
     {
         Directives = { new DiagramDirective(), new SuggestDirective(), new EnvironmentVariablesDirective() }
     };
 
-    public static readonly CliCommand InstallSuccessCommand = InternalReportInstallSuccessCommandParser.GetCommand();
+    public static readonly Command InstallSuccessCommand = InternalReportInstallSuccessCommandParser.GetCommand();
 
     // Subcommands
-    public static readonly CliCommand[] Subcommands =
+    public static readonly Command[] Subcommands =
     [
         AddCommandParser.GetCommand(),
         BuildCommandParser.GetCommand(),
@@ -89,36 +90,36 @@ public static class Parser
         new System.CommandLine.StaticCompletions.CompletionsCommand()
     ];
 
-    public static readonly CliOption<bool> DiagOption = CommonOptionsFactory.CreateDiagnosticsOption(recursive: false);
+    public static readonly Option<bool> DiagOption = CommonOptionsFactory.CreateDiagnosticsOption(recursive: false);
 
-    public static readonly CliOption<bool> VersionOption = new("--version")
+    public static readonly Option<bool> VersionOption = new("--version")
     {
         Arity = ArgumentArity.Zero,
     };
 
-    public static readonly CliOption<bool> InfoOption = new("--info")
+    public static readonly Option<bool> InfoOption = new("--info")
     {
         Arity = ArgumentArity.Zero,
     };
 
-    public static readonly CliOption<bool> ListSdksOption = new("--list-sdks")
+    public static readonly Option<bool> ListSdksOption = new("--list-sdks")
     {
         Arity = ArgumentArity.Zero,
     };
 
-    public static readonly CliOption<bool> ListRuntimesOption = new("--list-runtimes")
+    public static readonly Option<bool> ListRuntimesOption = new("--list-runtimes")
     {
         Arity = ArgumentArity.Zero,
     };
 
     // Argument
-    public static readonly CliArgument<string> DotnetSubCommand = new("subcommand") { Arity = ArgumentArity.ZeroOrOne, Hidden = true };
+    public static readonly Argument<string> DotnetSubCommand = new("subcommand") { Arity = ArgumentArity.ZeroOrOne, Hidden = true };
 
-    private static CliCommand ConfigureCommandLine(CliCommand rootCommand)
+    private static Command ConfigureCommandLine(Command rootCommand)
     {
         for (int i = rootCommand.Options.Count - 1; i >= 0; i--)
         {
-            CliOption option = rootCommand.Options[i];
+            Option option = rootCommand.Options[i];
 
             if (option is VersionOption)
             {
@@ -170,7 +171,7 @@ private static CliCommand ConfigureCommandLine(CliCommand rootCommand)
         return rootCommand;
     }
 
-    public static CliCommand GetBuiltInCommand(string commandName)
+    public static Command GetBuiltInCommand(string commandName)
     {
         return Subcommands
             .FirstOrDefault(c => c.Name.Equals(commandName, StringComparison.OrdinalIgnoreCase));
@@ -206,7 +207,7 @@ public static bool TokenPerLine(string tokenToReplace, out IReadOnlyList<string>
         }
     }
 
-    public static CliConfiguration Instance { get; } = new(ConfigureCommandLine(RootCommand))
+    public static CommandLineConfiguration Instance { get; } = new(ConfigureCommandLine(RootCommand))
     {
         EnableDefaultExceptionHandler = false,
         EnablePosixBundling = false,
@@ -297,8 +298,8 @@ private static void SetHelpCustomizations(HelpBuilder builder)
         public static void additionalOption(HelpContext context)
         {
             List<TwoColumnHelpRow> options = [];
-            HashSet<CliOption> uniqueOptions = [];
-            foreach (CliOption option in context.Command.Options)
+            HashSet<Option> uniqueOptions = [];
+            foreach (Option option in context.Command.Options)
             {
                 if (!option.Hidden && uniqueOptions.Add(option))
                 {
@@ -374,7 +375,7 @@ public override void Write(HelpContext context)
             {
                 if (command.Name.Equals(ListReferenceCommandParser.GetCommand().Name))
                 {
-                    CliCommand listCommand = command.Parents.Single() as CliCommand;
+                    Command listCommand = command.Parents.Single() as Command;
 
                     for (int i = 0; i < listCommand.Arguments.Count; i++)
                     {
diff --git a/src/Cli/dotnet/Telemetry/AllowListToSendFirstArgument.cs b/src/Cli/dotnet/Telemetry/AllowListToSendFirstArgument.cs
index c606dc925ca8..eb513a5859de 100644
--- a/src/Cli/dotnet/Telemetry/AllowListToSendFirstArgument.cs
+++ b/src/Cli/dotnet/Telemetry/AllowListToSendFirstArgument.cs
@@ -26,7 +26,7 @@ public List<ApplicationInsightsEntryFormat> AllowList(ParseResult parseResult, D
         {
             if (_topLevelCommandNameAllowList.Contains(topLevelCommandNameFromParse))
             {
-                var firstArgument = parseResult.RootCommandResult.Children.FirstOrDefault()?.Tokens.Where(t => t.Type.Equals(CliTokenType.Argument)).FirstOrDefault()?.Value ?? null;
+                var firstArgument = parseResult.RootCommandResult.Children.FirstOrDefault()?.Tokens.Where(t => t.Type.Equals(TokenType.Argument)).FirstOrDefault()?.Value ?? null;
                 if (firstArgument != null)
                 {
                     result.Add(new ApplicationInsightsEntryFormat(
diff --git a/src/Cli/dotnet/Telemetry/AllowListToSendVerbSecondVerbFirstArgument.cs b/src/Cli/dotnet/Telemetry/AllowListToSendVerbSecondVerbFirstArgument.cs
index 4ed44d0b3c18..61f871b5780c 100644
--- a/src/Cli/dotnet/Telemetry/AllowListToSendVerbSecondVerbFirstArgument.cs
+++ b/src/Cli/dotnet/Telemetry/AllowListToSendVerbSecondVerbFirstArgument.cs
@@ -20,11 +20,11 @@ public List<ApplicationInsightsEntryFormat> AllowList(ParseResult parseResult, D
 
         if (topLevelCommandNameFromParse != null)
         {
-            var secondVerb = parseResult.Tokens.Where(s => s.Type == CliTokenType.Command).Skip(1).FirstOrDefault()?.Value ?? "";
+            var secondVerb = parseResult.Tokens.Where(s => s.Type == TokenType.Command).Skip(1).FirstOrDefault()?.Value ?? "";
 
             if (TopLevelCommandNameAllowList.Contains(topLevelCommandNameFromParse))
             {
-                var firstArgument = parseResult.Tokens.FirstOrDefault(t => t.Type.Equals(CliTokenType.Argument))?.Value ?? "";
+                var firstArgument = parseResult.Tokens.FirstOrDefault(t => t.Type.Equals(TokenType.Argument))?.Value ?? "";
                 if (secondVerb != null)
                 {
                     result.Add(new ApplicationInsightsEntryFormat(
diff --git a/src/Cli/dotnet/Telemetry/TopLevelCommandNameAndOptionToLog.cs b/src/Cli/dotnet/Telemetry/TopLevelCommandNameAndOptionToLog.cs
index da63b610084f..310bf4536cd9 100644
--- a/src/Cli/dotnet/Telemetry/TopLevelCommandNameAndOptionToLog.cs
+++ b/src/Cli/dotnet/Telemetry/TopLevelCommandNameAndOptionToLog.cs
@@ -11,10 +11,10 @@ namespace Microsoft.DotNet.Cli.Telemetry;
 
 internal class TopLevelCommandNameAndOptionToLog(
     HashSet<string> topLevelCommandName,
-    HashSet<CliOption> optionsToLog) : IParseResultLogRule
+    HashSet<Option> optionsToLog) : IParseResultLogRule
 {
     private HashSet<string> _topLevelCommandName { get; } = topLevelCommandName;
-    private HashSet<CliOption> _optionsToLog { get; } = optionsToLog;
+    private HashSet<Option> _optionsToLog { get; } = optionsToLog;
 
     public List<ApplicationInsightsEntryFormat> AllowList(ParseResult parseResult, Dictionary<string, double> measurements = null)
     {
diff --git a/src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Program.cs b/src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Program.cs
index 1cf403f061f1..4d1f8e416df8 100644
--- a/src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Program.cs
+++ b/src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Program.cs
@@ -19,22 +19,22 @@ static int Main(string[] args)
             // Important: Keep parameters exposed in sync with the msbuild task frontend.
 
             // Global options
-            CliOption<bool> generateSuppressionFileOption = new("--generate-suppression-file")
+            Option<bool> generateSuppressionFileOption = new("--generate-suppression-file")
             {
                 Description = "If true, generates a compatibility suppression file.",
                 Recursive = true
             };
-            CliOption<bool> preserveUnnecessarySuppressionsOption = new("--preserve-unnecessary-suppressions")
+            Option<bool> preserveUnnecessarySuppressionsOption = new("--preserve-unnecessary-suppressions")
             {
                 Description = "If true, preserves unnecessary suppressions when re-generating the suppression file.",
                 Recursive = true
             };
-            CliOption<bool> permitUnnecessarySuppressionsOption = new("--permit-unnecessary-suppressions")
+            Option<bool> permitUnnecessarySuppressionsOption = new("--permit-unnecessary-suppressions")
             {
                 Description = "If true, permits unnecessary suppressions in the suppression file.",
                 Recursive = true
             };
-            CliOption<string[]> suppressionFilesOption = new("--suppression-file")
+            Option<string[]> suppressionFilesOption = new("--suppression-file")
             {
                 Description = "The path to one or more suppression files to read from.",
                 AllowMultipleArgumentsPerToken = true,
@@ -42,51 +42,51 @@ static int Main(string[] args)
                 HelpName = "file",
                 Recursive = true
             };
-            CliOption<string?> suppressionOutputFileOption = new("--suppression-output-file")
+            Option<string?> suppressionOutputFileOption = new("--suppression-output-file")
             {
                 Description = "The path to a suppression file to write to when --generate-suppression-file is true.",
                 Recursive = true
             };
-            CliOption<string?> noWarnOption = new("--noWarn")
+            Option<string?> noWarnOption = new("--noWarn")
             {
                 Description = "A NoWarn string that allows to disable specific rules.",
                 Recursive = true
             };
-            CliOption<bool> respectInternalsOption = new("--respect-internals")
+            Option<bool> respectInternalsOption = new("--respect-internals")
             {
                 Description = "If true, includes both internal and public API.",
                 Recursive = true
             };
-            CliOption<string?> roslynAssembliesPathOption = new("--roslyn-assemblies-path")
+            Option<string?> roslynAssembliesPathOption = new("--roslyn-assemblies-path")
             {
                 Description = "The path to the directory that contains the Microsoft.CodeAnalysis assemblies.",
                 HelpName = "file",
                 Recursive = true
             };
-            CliOption<MessageImportance> verbosityOption = new("--verbosity", "-v")
+            Option<MessageImportance> verbosityOption = new("--verbosity", "-v")
             {
                 Description = "Controls the log level verbosity. Allowed values are high, normal, and low.",
                 DefaultValueFactory = _ => MessageImportance.Normal,
                 Recursive = true
             };
-            CliOption<bool> enableRuleAttributesMustMatchOption = new("--enable-rule-attributes-must-match")
+            Option<bool> enableRuleAttributesMustMatchOption = new("--enable-rule-attributes-must-match")
             {
                 Description = "If true, enables rule to check that attributes match.",
                 Recursive = true
             };
-            CliOption<string[]> excludeAttributesFilesOption = new("--exclude-attributes-file")
+            Option<string[]> excludeAttributesFilesOption = new("--exclude-attributes-file")
             {
                 Description = "The path to one or more attribute exclusion files with types in DocId format.",
                 Recursive = true
             };
-            CliOption<bool> enableRuleCannotChangeParameterNameOption = new("--enable-rule-cannot-change-parameter-name")
+            Option<bool> enableRuleCannotChangeParameterNameOption = new("--enable-rule-cannot-change-parameter-name")
             {
                 Description = "If true, enables rule to check that the parameter names between public methods do not change.",
                 Recursive = true
             };
 
             // Root command
-            CliOption<string[]> leftAssembliesOption = new("--left-assembly", "--left", "-l")
+            Option<string[]> leftAssembliesOption = new("--left-assembly", "--left", "-l")
             {
                 Description = "The path to one or more assemblies that serve as the left side to compare.",
                 CustomParser = ParseAssemblyArgument,
@@ -94,7 +94,7 @@ static int Main(string[] args)
                 Arity = ArgumentArity.OneOrMore,
                 Required = true
             };
-            CliOption<string[]> rightAssembliesOption = new("--right-assembly", "--right", "-r")
+            Option<string[]> rightAssembliesOption = new("--right-assembly", "--right", "-r")
             {
                 Description = "The path to one or more assemblies that serve as the right side to compare.",
                 CustomParser = ParseAssemblyArgument,
@@ -102,11 +102,11 @@ static int Main(string[] args)
                 Arity = ArgumentArity.OneOrMore,
                 Required = true
             };
-            CliOption<bool> strictModeOption = new("--strict-mode")
+            Option<bool> strictModeOption = new("--strict-mode")
             {
                 Description = "If true, performs api compatibility checks in strict mode"
             };
-            CliOption<string[][]?> leftAssembliesReferencesOption = new("--left-assembly-references", "--lref")
+            Option<string[][]?> leftAssembliesReferencesOption = new("--left-assembly-references", "--lref")
 
             {
                 Description = "Paths to assembly references or the underlying directories for a given left. Values must be separated by commas: ','.",
@@ -115,7 +115,7 @@ static int Main(string[] args)
                 Arity = ArgumentArity.ZeroOrMore,
                 HelpName = "file1,file2,..."
             };
-            CliOption<string[][]?> rightAssembliesReferencesOption = new("--right-assembly-references", "--rref")
+            Option<string[][]?> rightAssembliesReferencesOption = new("--right-assembly-references", "--rref")
             {
                 Description = "Paths to assembly references or the underlying directories for a given right. Values must be separated by commas: ','.",
                 CustomParser = ParseAssemblyReferenceArgument,
@@ -123,18 +123,18 @@ static int Main(string[] args)
                 Arity = ArgumentArity.ZeroOrMore,
                 HelpName = "file1,file2,..."
             };
-            CliOption<bool> createWorkItemPerAssemblyOption = new("--create-work-item-per-assembly")
+            Option<bool> createWorkItemPerAssemblyOption = new("--create-work-item-per-assembly")
             {
                 Description = "If true, enqueues a work item per passed in left and right assembly."
             };
-            CliOption<(string, string)[]?> leftAssembliesTransformationPatternOption = new("--left-assemblies-transformation-pattern")
+            Option<(string, string)[]?> leftAssembliesTransformationPatternOption = new("--left-assemblies-transformation-pattern")
             {
                 Description = "A transformation pattern for the left side assemblies.",
                 CustomParser = ParseTransformationPattern,
                 AllowMultipleArgumentsPerToken = true,
                 Arity = ArgumentArity.ZeroOrMore
             };
-            CliOption<(string, string)[]?> rightAssembliesTransformationPatternOption = new("--right-assemblies-transformation-pattern")
+            Option<(string, string)[]?> rightAssembliesTransformationPatternOption = new("--right-assemblies-transformation-pattern")
             {
                 Description = "A transformation pattern for the right side assemblies.",
                 CustomParser = ParseTransformationPattern,
@@ -142,7 +142,7 @@ static int Main(string[] args)
                 Arity = ArgumentArity.ZeroOrMore
             };
 
-            CliRootCommand rootCommand = new("Microsoft.DotNet.ApiCompat v" + FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion)
+            RootCommand rootCommand = new("Microsoft.DotNet.ApiCompat v" + FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion)
             {
                 TreatUnmatchedTokensAsErrors = true
             };
@@ -223,40 +223,40 @@ static int Main(string[] args)
             });
 
             // Package command
-            CliArgument<string> packageArgument = new("--package")
+            Argument<string> packageArgument = new("--package")
             {
                 Description = "The path to the package that should be validated",
                 Arity = ArgumentArity.ExactlyOne
             };
-            CliOption<string?> runtimeGraphOption = new("--runtime-graph")
+            Option<string?> runtimeGraphOption = new("--runtime-graph")
             {
                 Description = "The path to the runtime graph to read from.",
                 HelpName = "json"
             };
-            CliOption<bool> runApiCompatOption = new("--run-api-compat")
+            Option<bool> runApiCompatOption = new("--run-api-compat")
             {
                 Description = "If true, performs api compatibility checks on the package assets.",
                 DefaultValueFactory = _ => true
             };
-            CliOption<bool> enableStrictModeForCompatibleTfmsOption = new("--enable-strict-mode-for-compatible-tfms")
+            Option<bool> enableStrictModeForCompatibleTfmsOption = new("--enable-strict-mode-for-compatible-tfms")
             {
                 Description = "Validates api compatibility in strict mode for contract and implementation assemblies for all compatible target frameworks.",
                 DefaultValueFactory = _ => true
             };
-            CliOption<bool> enableStrictModeForCompatibleFrameworksInPackageOption = new("--enable-strict-mode-for-compatible-frameworks-in-package")
+            Option<bool> enableStrictModeForCompatibleFrameworksInPackageOption = new("--enable-strict-mode-for-compatible-frameworks-in-package")
             {
                 Description = "Validates api compatibility in strict mode for assemblies that are compatible based on their target framework."
             };
-            CliOption<bool> enableStrictModeForBaselineValidationOption = new("--enable-strict-mode-for-baseline-validation")
+            Option<bool> enableStrictModeForBaselineValidationOption = new("--enable-strict-mode-for-baseline-validation")
             {
                 Description = "Validates api compatibility in strict mode for package baseline checks."
             };
-            CliOption<string?> baselinePackageOption = new("--baseline-package")
+            Option<string?> baselinePackageOption = new("--baseline-package")
             {
                 Description = "The path to a baseline package to validate against the current package.",
                 HelpName = "nupkg"
             };
-            CliOption<Dictionary<NuGetFramework, IEnumerable<string>>?> packageAssemblyReferencesOption = new("--package-assembly-references")
+            Option<Dictionary<NuGetFramework, IEnumerable<string>>?> packageAssemblyReferencesOption = new("--package-assembly-references")
             {
                 Description = "Paths to assembly references or their underlying directories for a specific target framework in the package. Values must be separated by commas: ','.",
                 CustomParser = ParsePackageAssemblyReferenceArgument,
@@ -264,7 +264,7 @@ static int Main(string[] args)
                 Arity = ArgumentArity.ZeroOrMore,
                 HelpName = "tfm=file1,file2,..."
             };
-            CliOption<Dictionary<NuGetFramework, IEnumerable<string>>?> baselinePackageAssemblyReferencesOption = new("--baseline-package-assembly-references")
+            Option<Dictionary<NuGetFramework, IEnumerable<string>>?> baselinePackageAssemblyReferencesOption = new("--baseline-package-assembly-references")
             {
                 Description = "Paths to assembly references or their underlying directories for a specific target framework in the baseline package. Values must be separated by commas: ','.",
                 CustomParser = ParsePackageAssemblyReferenceArgument,
@@ -272,14 +272,14 @@ static int Main(string[] args)
                 Arity = ArgumentArity.ZeroOrMore,
                 HelpName = "tfm=file1,file2,..."
             };
-            CliOption<string[]?> baselinePackageFrameworksToIgnoreOption = new("--baseline-package-frameworks-to-ignore")
+            Option<string[]?> baselinePackageFrameworksToIgnoreOption = new("--baseline-package-frameworks-to-ignore")
             {
                 Description = "Target frameworks to ignore from the baseline package. Supports the wildcard character '*' at the end of the string. Culture and casing is ignored. The framework string must match the folder name in the baseline package.",
                 AllowMultipleArgumentsPerToken = true,
                 Arity = ArgumentArity.ZeroOrMore
             };
 
-            CliCommand packageCommand = new("package", "Validates the compatibility of package assets");
+            Command packageCommand = new("package", "Validates the compatibility of package assets");
             packageCommand.Arguments.Add(packageArgument);
             packageCommand.Options.Add(runtimeGraphOption);
             packageCommand.Options.Add(runApiCompatOption);
diff --git a/src/Compatibility/GenAPI/Microsoft.DotNet.GenAPI.Tool/Program.cs b/src/Compatibility/GenAPI/Microsoft.DotNet.GenAPI.Tool/Program.cs
index c511b14c4d10..0595e4c0c5b5 100644
--- a/src/Compatibility/GenAPI/Microsoft.DotNet.GenAPI.Tool/Program.cs
+++ b/src/Compatibility/GenAPI/Microsoft.DotNet.GenAPI.Tool/Program.cs
@@ -17,7 +17,7 @@ class Program
         static int Main(string[] args)
         {
             // Global options
-            CliOption<string[]> assembliesOption = new("--assembly")
+            Option<string[]> assembliesOption = new("--assembly")
             {
                 Description = "The path to one or more assemblies or directories with assemblies.",
                 CustomParser = ParseAssemblyArgument,
@@ -26,7 +26,7 @@ static int Main(string[] args)
                 Recursive = true
             };
 
-            CliOption<string[]?> assemblyReferencesOption = new("--assembly-reference")
+            Option<string[]?> assemblyReferencesOption = new("--assembly-reference")
             {
                 Description = "Paths to assembly references or their underlying directories for a specific target framework in the package.",
                 CustomParser = ParseAssemblyArgument,
@@ -34,7 +34,7 @@ static int Main(string[] args)
                 Recursive = true
             };
 
-            CliOption<string[]?> excludeApiFilesOption = new("--exclude-api-file")
+            Option<string[]?> excludeApiFilesOption = new("--exclude-api-file")
             {
                 Description = "The path to one or more api exclusion files with types in DocId format.",
                 CustomParser = ParseAssemblyArgument,
@@ -42,7 +42,7 @@ static int Main(string[] args)
                 Recursive = true
             };
 
-            CliOption<string[]?> excludeAttributesFilesOption = new("--exclude-attributes-file")
+            Option<string[]?> excludeAttributesFilesOption = new("--exclude-attributes-file")
             {
                 Description = "The path to one or more attribute exclusion files with types in DocId format.",
                 CustomParser = ParseAssemblyArgument,
@@ -50,37 +50,37 @@ static int Main(string[] args)
                 Recursive = true
             };
 
-            CliOption<string?> outputPathOption = new("--output-path")
+            Option<string?> outputPathOption = new("--output-path")
             {
                 Description = @"Output path. Default is the console. Can specify an existing directory as well
             and then a file will be created for each assembly with the matching name of the assembly.",
                 Recursive = true
             };
 
-            CliOption<string?> headerFileOption = new("--header-file")
+            Option<string?> headerFileOption = new("--header-file")
             {
                 Description = "Specify a file with an alternate header content to prepend to output.",
                 Recursive = true
             };
 
-            CliOption<string?> exceptionMessageOption = new("--exception-message")
+            Option<string?> exceptionMessageOption = new("--exception-message")
             {
                 Description = "If specified - method bodies should throw PlatformNotSupportedException, else `throw null`.",
                 Recursive = true
             };
 
-            CliOption<bool> respectInternalsOption = new("--respect-internals")
+            Option<bool> respectInternalsOption = new("--respect-internals")
             {
                 Description = "If true, includes both internal and public API.",
                 Recursive = true
             };
 
-            CliOption<bool> includeAssemblyAttributesOption = new("--include-assembly-attributes")
+            Option<bool> includeAssemblyAttributesOption = new("--include-assembly-attributes")
             {
                 Description = "Includes assembly attributes which are values that provide information about an assembly. Default is false."
             };
 
-            CliRootCommand rootCommand = new("Microsoft.DotNet.GenAPI v" + FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion)
+            RootCommand rootCommand = new("Microsoft.DotNet.GenAPI v" + FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion)
             {
                 TreatUnmatchedTokensAsErrors = true
             };
diff --git a/src/Containers/containerize/ContainerizeCommand.cs b/src/Containers/containerize/ContainerizeCommand.cs
index 612b589ba7fd..8da04309a921 100644
--- a/src/Containers/containerize/ContainerizeCommand.cs
+++ b/src/Containers/containerize/ContainerizeCommand.cs
@@ -10,115 +10,115 @@
 
 namespace containerize;
 
-internal class ContainerizeCommand : CliRootCommand
+internal class ContainerizeCommand : RootCommand
 {
-    internal CliArgument<DirectoryInfo> PublishDirectoryArgument { get; } = new CliArgument<DirectoryInfo>("PublishDirectory")
+    internal Argument<DirectoryInfo> PublishDirectoryArgument { get; } = new Argument<DirectoryInfo>("PublishDirectory")
     {
         Description = "The directory for the build outputs to be published."
     }.AcceptExistingOnly();
 
-    internal CliOption<string> BaseRegistryOption { get; } = new("--baseregistry")
+    internal Option<string> BaseRegistryOption { get; } = new("--baseregistry")
     {
         Description = "The registry to use for the base image.",
         Required = true
     };
 
-    internal CliOption<string> BaseImageNameOption { get; } = new("--baseimagename")
+    internal Option<string> BaseImageNameOption { get; } = new("--baseimagename")
     {
         Description = "The base image to pull.",
         Required = true
     };
 
-    internal CliOption<string> BaseImageTagOption { get; } = new("--baseimagetag")
+    internal Option<string> BaseImageTagOption { get; } = new("--baseimagetag")
     {
         Description = "The base image tag. Ex: 6.0",
         DefaultValueFactory = (_) => "latest"
     };
 
-    internal CliOption<string> BaseImageDigestOption { get; } = new("--baseimagedigest")
+    internal Option<string> BaseImageDigestOption { get; } = new("--baseimagedigest")
     {
         Description = "The base image digest. Ex: sha256:6cec3641...",
         Required = false
     };
 
-    internal CliOption<string> OutputRegistryOption { get; } = new("--outputregistry")
+    internal Option<string> OutputRegistryOption { get; } = new("--outputregistry")
     {
         Description = "The registry to push to.",
         Required = false
     };
 
-    internal CliOption<string> ArchiveOutputPathOption { get; } = new("--archiveoutputpath")
+    internal Option<string> ArchiveOutputPathOption { get; } = new("--archiveoutputpath")
     {
         Description = "The file path to which to write a tar.gz archive of the container image.",
         Required = false
     };
 
-    internal CliOption<string> RepositoryOption { get; } = new("--repository")
+    internal Option<string> RepositoryOption { get; } = new("--repository")
     {
         Description = "The name of the output container repository that will be pushed to the registry.",
         Required = true
     };
 
-    internal CliOption<string[]> ImageTagsOption { get; } = new("--imagetags")
+    internal Option<string[]> ImageTagsOption { get; } = new("--imagetags")
     {
         Description = "The tags to associate with the new image.",
         AllowMultipleArgumentsPerToken = true
     };
 
-    internal CliOption<string> WorkingDirectoryOption { get; } = new("--workingdirectory")
+    internal Option<string> WorkingDirectoryOption { get; } = new("--workingdirectory")
     {
         Description = "The working directory of the container.",
         Required = true
     };
 
-    internal CliOption<string[]> EntrypointOption { get; } = new("--entrypoint")
+    internal Option<string[]> EntrypointOption { get; } = new("--entrypoint")
     {
         Description = "The entrypoint application of the container.",
         AllowMultipleArgumentsPerToken = true
     };
 
-    internal CliOption<string[]> EntrypointArgsOption { get; } = new("--entrypointargs")
+    internal Option<string[]> EntrypointArgsOption { get; } = new("--entrypointargs")
     {
         Description = "Arguments to pass alongside Entrypoint.",
         AllowMultipleArgumentsPerToken = true
     };
 
-    internal CliOption<string[]> DefaultArgsOption { get; } = new CliOption<string[]>("--defaultargs")
+    internal Option<string[]> DefaultArgsOption { get; } = new Option<string[]>("--defaultargs")
     {
         Description = "Default arguments passed. These can be overridden by the user when the container is created.",
         AllowMultipleArgumentsPerToken = true
     };
 
-    internal CliOption<string[]> AppCommandOption { get; } = new("--appcommand")
+    internal Option<string[]> AppCommandOption { get; } = new("--appcommand")
     {
         Description = "The file name and arguments that launch the application. For example: ['dotnet', 'app.dll'].",
         AllowMultipleArgumentsPerToken = true
     };
 
-    internal CliOption<string[]> AppCommandArgsOption { get; } = new("--appcommandargs")
+    internal Option<string[]> AppCommandArgsOption { get; } = new("--appcommandargs")
     {
         Description = "Arguments always passed to the application.",
         AllowMultipleArgumentsPerToken = true
     };
 
-    internal CliOption<string> AppCommandInstructionOption { get; } = new CliOption<string>("--appcommandinstruction")
+    internal Option<string> AppCommandInstructionOption { get; } = new Option<string>("--appcommandinstruction")
     {
         Description = "The Dockerfile instruction used for AppCommand. Can be set to 'DefaultArgs', 'Entrypoint', 'None', '' (default)."
     };
 
-    internal CliOption<string> LocalRegistryOption { get; } = new CliOption<string>("--localregistry")
+    internal Option<string> LocalRegistryOption { get; } = new Option<string>("--localregistry")
     {
         Description = "The local registry to push to."
     };
 
-    internal CliOption<Dictionary<string, string>> LabelsOption { get; } = new("--labels")
+    internal Option<Dictionary<string, string>> LabelsOption { get; } = new("--labels")
     {
         Description = "Labels that the image configuration will include in metadata.",
         CustomParser = result => ParseDictionary(result, errorMessage: "Incorrectly formatted labels: "),
         AllowMultipleArgumentsPerToken = true
     };
 
-    internal CliOption<Port[]> PortsOption { get; } = new("--ports")
+    internal Option<Port[]> PortsOption { get; } = new("--ports")
     {
         Description = "Ports that the application declares that it will use. Note that this means nothing to container hosts, by default - it's mostly documentation. Ports should be of the form {number}/{type}, where {type} is tcp or udp",
         AllowMultipleArgumentsPerToken = true,
@@ -178,32 +178,32 @@ internal class ContainerizeCommand : CliRootCommand
         }
     };
 
-    internal CliOption<Dictionary<string, string>> EnvVarsOption { get; } = new("--environmentvariables")
+    internal Option<Dictionary<string, string>> EnvVarsOption { get; } = new("--environmentvariables")
     {
         Description = "Container environment variables to set.",
         CustomParser = result => ParseDictionary(result, errorMessage: "Incorrectly formatted environment variables:  "),
         AllowMultipleArgumentsPerToken = true
     };
 
-    internal CliOption<string> RidOption { get; } = new("--rid") { Description = "Runtime Identifier of the generated container." };
+    internal Option<string> RidOption { get; } = new("--rid") { Description = "Runtime Identifier of the generated container." };
 
-    internal CliOption<string> RidGraphPathOption { get; } = new("--ridgraphpath") { Description = "Path to the RID graph file." };
+    internal Option<string> RidGraphPathOption { get; } = new("--ridgraphpath") { Description = "Path to the RID graph file." };
 
-    internal CliOption<string> ContainerUserOption { get; } = new("--container-user") { Description = "User to run the container as." };
+    internal Option<string> ContainerUserOption { get; } = new("--container-user") { Description = "User to run the container as." };
 
-    internal CliOption<bool> GenerateLabelsOption { get; } = new("--generate-labels")
+    internal Option<bool> GenerateLabelsOption { get; } = new("--generate-labels")
     {
         Description = "If true, the tooling may create labels on the generated images.",
         Arity = ArgumentArity.Zero
     };
 
-    internal CliOption<bool> GenerateDigestLabelOption { get; } = new("--generate-digest-label")
+    internal Option<bool> GenerateDigestLabelOption { get; } = new("--generate-digest-label")
     {
         Description = "If true, the tooling will generate an 'org.opencontainers.image.base.digest' label on the generated images containing the digest of the chosen base image.",
         Arity = ArgumentArity.Zero
     };
 
-    internal CliOption<KnownImageFormats?> ImageFormatOption { get; } = new("--image-format")
+    internal Option<KnownImageFormats?> ImageFormatOption { get; } = new("--image-format")
     {
         Description = "If set to OCI or Docker will force the generated image to be that format. If unset, the base images format will be used."
     };
diff --git a/src/SourceBuild/patches/runtime/0001-Don-t-pass-os-twice-for-windows-in-DotNetBuild.props.patch b/src/SourceBuild/patches/runtime/0001-Don-t-pass-os-twice-for-windows-in-DotNetBuild.props.patch
new file mode 100644
index 000000000000..d2f3d1c33d81
--- /dev/null
+++ b/src/SourceBuild/patches/runtime/0001-Don-t-pass-os-twice-for-windows-in-DotNetBuild.props.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
+Date: Wed, 16 Apr 2025 11:51:04 +0200
+Subject: [PATCH] Don't pass -os twice for windows in DotNetBuild.props
+
+Backport: https://github.com/dotnet/runtime/pull/114732
+
+---
+ eng/DotNetBuild.props | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
+index 135b972c32b..1e3137ec241 100644
+--- a/eng/DotNetBuild.props
++++ b/eng/DotNetBuild.props
+@@ -32,7 +32,7 @@
+ 
+       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture)</InnerBuildArgs>
+       <InnerBuildArgs Condition="'$(_portableOS)' == 'win'">$(InnerBuildArgs) $(FlagParameterPrefix)os windows</InnerBuildArgs>
+-      <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)os $(_portableOS)</InnerBuildArgs>
++      <InnerBuildArgs Condition="'$(_portableOS)' != 'win'">$(InnerBuildArgs) $(FlagParameterPrefix)os $(_portableOS)</InnerBuildArgs>
+       <!-- Mobile builds are never "cross" builds as they don't have a rootfs-based filesystem build. -->
+       <InnerBuildArgs Condition="'$(CrossBuild)' == 'true' or ('$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(TargetsMobile)' != 'true')">$(InnerBuildArgs) $(FlagParameterPrefix)cross</InnerBuildArgs>
+       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)configuration $(Configuration)</InnerBuildArgs>
diff --git a/src/SourceBuild/patches/runtime/0001-treat-targetos-and-rid-as-local-properties.patch b/src/SourceBuild/patches/runtime/0001-treat-targetos-and-rid-as-local-properties.patch
deleted file mode 100644
index 0371dae42b4a..000000000000
--- a/src/SourceBuild/patches/runtime/0001-treat-targetos-and-rid-as-local-properties.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9e230fef55109e2e16716136443d8fd5c83bdfae Mon Sep 17 00:00:00 2001
-From: Jeremy Koritzinsky <jekoritz@microsoft.com>
-Date: Fri, 21 Mar 2025 09:09:52 -0700
-Subject: [PATCH] Allow TargetOS and TargetRid to be overridden in
- DotNetBuild.props
-
-This is needed to fix the linux-bionic builds in the VMR
-Backport: https://github.com/dotnet/runtime/pull/113765
----
-diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
-index 1631f76ce95..7b88a2177d0 100644
---- a/eng/DotNetBuild.props
-+++ b/eng/DotNetBuild.props
-@@ -1,6 +1,6 @@
- <!-- When altering this file, include @dotnet/product-construction as a reviewer. -->
- 
--<Project>
-+<Project TreatAsLocalProperty="TargetOS;TargetRid">
- 
-   <PropertyGroup>
-     <GitHubRepositoryName>runtime</GitHubRepositoryName>
-diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
-index 7b88a2177d0deb..5403d38e544465 100644
---- a/eng/DotNetBuild.props
-+++ b/eng/DotNetBuild.props
-@@ -16,6 +16,7 @@
-     <_targetRidPlatformIndex>$(TargetRid.LastIndexOf('-'))</_targetRidPlatformIndex>
-     <TargetArch>$(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-'))</TargetArch>
-     <TargetOS>$(TargetRid.Substring(0, $(_targetRidPlatformIndex)))</TargetOS>
-+    <TargetOS Condition="'$(TargetOS)' == 'win'">windows</TargetOS>
- 
-     <_hostRidPlatformIndex>$(_hostRid.LastIndexOf('-'))</_hostRidPlatformIndex>
-     <_hostArch>$(_hostRid.Substring($(_hostRidPlatformIndex)).TrimStart('-'))</_hostArch>
diff --git a/src/StaticWebAssetsSdk/Tool/Program.cs b/src/StaticWebAssetsSdk/Tool/Program.cs
index a92c5ebd1f94..9dc0fc5e4867 100644
--- a/src/StaticWebAssetsSdk/Tool/Program.cs
+++ b/src/StaticWebAssetsSdk/Tool/Program.cs
@@ -12,20 +12,20 @@ internal static class Program
 {
     public static int Main(string[] args)
     {
-        CliRootCommand rootCommand = new();
-        CliCommand brotli = new("brotli");
+        RootCommand rootCommand = new();
+        Command brotli = new("brotli");
 
-        CliOption<CompressionLevel> compressionLevelOption = new("-c")
+        Option<CompressionLevel> compressionLevelOption = new("-c")
         {
             DefaultValueFactory = (_) => CompressionLevel.SmallestSize,
             Description = "System.IO.Compression.CompressionLevel for the Brotli compression algorithm."
         };
-        CliOption<List<string>> sourcesOption = new("-s")
+        Option<List<string>> sourcesOption = new("-s")
         {
             Description = "A list of files to compress.",
             AllowMultipleArgumentsPerToken = false
         };
-        CliOption<List<string>> outputsOption = new("-o")
+        Option<List<string>> outputsOption = new("-o")
         {
             Description = "The filenames to output the compressed file to.",
             AllowMultipleArgumentsPerToken = false
diff --git a/src/System.CommandLine.StaticCompletions/CompletionsCommand.cs b/src/System.CommandLine.StaticCompletions/CompletionsCommand.cs
index 9131e763f978..3b1520693dd9 100644
--- a/src/System.CommandLine.StaticCompletions/CompletionsCommand.cs
+++ b/src/System.CommandLine.StaticCompletions/CompletionsCommand.cs
@@ -9,7 +9,7 @@ namespace System.CommandLine.StaticCompletions;
 using System.CommandLine.StaticCompletions.Shells;
 using System.Linq;
 
-public class CompletionsCommand : CliCommand
+public class CompletionsCommand : Command
 {
     public static IShellProvider[] DefaultShells = [
         new BashShellProvider(),
@@ -30,7 +30,7 @@ public CompletionsCommand(IEnumerable<IShellProvider>? supportedShells = null, s
 
     private CompletionsCommand(Dictionary<string, IShellProvider> shellMap, string commandName, string commandDescription) : base(commandName, commandDescription)
     {
-        var shellArg = new CliArgument<IShellProvider>("shell")
+        var shellArg = new Argument<IShellProvider>("shell")
         {
             Description = Strings.CompletionsCommand_ShellArgument_Description,
             Arity = ArgumentArity.ZeroOrOne,
@@ -104,9 +104,9 @@ static Func<CompletionContext, IEnumerable<CompletionItem>> CreateCompletions(Di
     }
 }
 
-public class GenerateScriptCommand : CliCommand
+public class GenerateScriptCommand : Command
 {
-    public GenerateScriptCommand(CliArgument<IShellProvider> shellArg)
+    public GenerateScriptCommand(Argument<IShellProvider> shellArg)
         : base("script", Strings.GenerateCommand_Description)
     {
         Arguments.Add(shellArg);
diff --git a/src/System.CommandLine.StaticCompletions/HelpGenerationExtensions.cs b/src/System.CommandLine.StaticCompletions/HelpGenerationExtensions.cs
index e604ce92db1a..a78e854e690e 100644
--- a/src/System.CommandLine.StaticCompletions/HelpGenerationExtensions.cs
+++ b/src/System.CommandLine.StaticCompletions/HelpGenerationExtensions.cs
@@ -15,7 +15,7 @@ public static class HelpExtensions
     /// <param name="command"></param>
     /// <param name="parentCommandNames">The chain of commands to get to this command</param>
     /// <returns></returns>
-    public static string FunctionName(this CliCommand command, string[]? parentCommandNames = null) => parentCommandNames switch
+    public static string FunctionName(this Command command, string[]? parentCommandNames = null) => parentCommandNames switch
     {
         null => "_" + command.Name,
         [] => "_" + command.Name,
@@ -34,13 +34,13 @@ public static class HelpExtensions
     /// </summary>
     /// <param name="option"></param>
     /// <returns></returns>
-    public static string[] Names(this CliOption option)
+    public static string[] Names(this Option option)
     {
         var (primary, aliases) = PrimaryNameAndAliases(option);
         return aliases is null ? [primary] : [primary, .. aliases];
     }
 
-    public static (string primary, string[]? aliases) PrimaryNameAndAliases(this CliOption option)
+    public static (string primary, string[]? aliases) PrimaryNameAndAliases(this Option option)
     {
         if (option.Aliases.Count == 0)
         {
@@ -61,7 +61,7 @@ public static (string primary, string[]? aliases) PrimaryNameAndAliases(this Cli
     /// </summary>
     /// <param name="command"></param>
     /// <returns></returns>
-    public static string[] Names(this CliCommand command)
+    public static string[] Names(this Command command)
     {
         if (command.Aliases.Count == 0)
         {
@@ -73,7 +73,7 @@ public static string[] Names(this CliCommand command)
         }
     }
 
-    public static IEnumerable<CliOption> HierarchicalOptions(this CliCommand c)
+    public static IEnumerable<Option> HierarchicalOptions(this Command c)
     {
         // don't include hidden options, because hidden shouldn't be shown in completions at all.
         var myOptions = c.Options.Where(o => !o.Hidden);
@@ -84,11 +84,11 @@ public static IEnumerable<CliOption> HierarchicalOptions(this CliCommand c)
         else
         {
             // the parents could return the same logical option, so we need to dedupe them in order to not crowd the completion lists.
-            return myOptions.Concat(c.Parents.OfType<CliCommand>().SelectMany(OptionsForParent)).DistinctBy(o => o.Name);
+            return myOptions.Concat(c.Parents.OfType<Command>().SelectMany(OptionsForParent)).DistinctBy(o => o.Name);
         }
     }
 
-    private static IEnumerable<CliOption> OptionsForParent(CliCommand c)
+    private static IEnumerable<Option> OptionsForParent(Command c)
     {
         foreach (var o in c.Options)
         {
@@ -97,7 +97,7 @@ private static IEnumerable<CliOption> OptionsForParent(CliCommand c)
                 yield return o;
             }
         }
-        foreach (var p in c.Parents.OfType<CliCommand>())
+        foreach (var p in c.Parents.OfType<Command>())
         {
             foreach (var o in OptionsForParent(p))
             {
@@ -111,8 +111,8 @@ private static IEnumerable<CliOption> OptionsForParent(CliCommand c)
     public static bool IsLongAlias(this string name) => name.Length > 2 && name[0] == '-' && name[1] == '-';
     public static bool IsShortAlias(this string name) => name.Length == 2 && name[0] == '-' && char.IsAsciiLetter(name[1]);
 
-    public static bool IsDynamic(this CliOption option) => option.GetType().GetInterface(nameof(IDynamicOption)) is not null;
-    public static bool IsDynamic(this CliArgument argument) => argument.GetType().GetInterface(nameof(IDynamicArgument)) is not null;
+    public static bool IsDynamic(this Option option) => option.GetType().GetInterface(nameof(IDynamicOption)) is not null;
+    public static bool IsDynamic(this Argument argument) => argument.GetType().GetInterface(nameof(IDynamicArgument)) is not null;
 
-    public static bool IsFlag(this CliOption option) => option.Arity.Equals(ArgumentArity.Zero);
+    public static bool IsFlag(this Option option) => option.Arity.Equals(ArgumentArity.Zero);
 }
diff --git a/src/System.CommandLine.StaticCompletions/shells/BashShellProvider.cs b/src/System.CommandLine.StaticCompletions/shells/BashShellProvider.cs
index a9300b5bf9a8..d1f39ae2798b 100644
--- a/src/System.CommandLine.StaticCompletions/shells/BashShellProvider.cs
+++ b/src/System.CommandLine.StaticCompletions/shells/BashShellProvider.cs
@@ -20,7 +20,7 @@ public class BashShellProvider : IShellProvider
     // override the ToString method to return the argument name so that CLI help is cleaner for 'default' values
     public override string ToString() => ArgumentName;
 
-    public string GenerateCompletions(CliCommand command)
+    public string GenerateCompletions(Command command)
     {
         var initialFunctionName = command.FunctionName().MakeSafeFunctionName();
         return
@@ -32,7 +32,7 @@ public string GenerateCompletions(CliCommand command)
             """;
     }
 
-    private string GenerateCommandsCompletions(string[] parentCommandNames, CliCommand command, bool isNestedCommand)
+    private string GenerateCommandsCompletions(string[] parentCommandNames, Command command, bool isNestedCommand)
     {
         var functionName = command.FunctionName(parentCommandNames).MakeSafeFunctionName();
 
@@ -128,7 +128,7 @@ private string GenerateCommandsCompletions(string[] parentCommandNames, CliComma
         return textWriter.ToString() + string.Join('\n', visibleSubcommands.Select(c => GenerateCommandsCompletions(parentCommandNamesForSubcommands, c, isNestedCommand: true)));
     }
 
-    internal static string[] PositionalArgumentTerms(CliArgument[] arguments)
+    internal static string[] PositionalArgumentTerms(Argument[] arguments)
     {
         var completions = new List<string>();
         foreach (var argument in arguments)
@@ -160,7 +160,7 @@ internal static string GenerateDynamicCall()
         return $$"""${COMP_WORDS[0]} complete --position ${COMP_POINT} ${COMP_LINE} 2>/dev/null | tr '\n' ' '""";
     }
 
-    internal static string? GenerateOptionHandlers(CliCommand command)
+    internal static string? GenerateOptionHandlers(Command command)
     {
         var optionHandlers = command.Options.Where(o => !o.Hidden).Select(GenerateOptionHandler).Where(handler => handler is not null).ToArray();
         if (optionHandlers.Length == 0)
@@ -187,7 +187,7 @@ internal static string GenerateDynamicCall()
     /// </summary>
     /// <param name="option"></param>
     /// <returns>a bash switch case expression for providing completions for this option</returns>
-    internal static string? GenerateOptionHandler(CliOption option)
+    internal static string? GenerateOptionHandler(Option option)
     {
         // unlike the completion-options generation, for actually implementing suggestions we should be able to handle all of the options' aliases.
         // this ensures if the user manually enters an alias we can support that usage.
diff --git a/src/System.CommandLine.StaticCompletions/shells/FishShellProvider.cs b/src/System.CommandLine.StaticCompletions/shells/FishShellProvider.cs
index bd820aa5ecbf..1d7d7ff4d69b 100644
--- a/src/System.CommandLine.StaticCompletions/shells/FishShellProvider.cs
+++ b/src/System.CommandLine.StaticCompletions/shells/FishShellProvider.cs
@@ -24,5 +24,5 @@ public class FishShellProvider : IShellProvider
         complete -f -c dotnet -a "(dotnet complete (commandline -cp))"
         """;
 
-    public string GenerateCompletions(System.CommandLine.CliCommand command) => _dynamicCompletionScript;
+    public string GenerateCompletions(System.CommandLine.Command command) => _dynamicCompletionScript;
 }
diff --git a/src/System.CommandLine.StaticCompletions/shells/NuShellShellProvider.cs b/src/System.CommandLine.StaticCompletions/shells/NuShellShellProvider.cs
index a2b55965fced..fdd50157d9f2 100644
--- a/src/System.CommandLine.StaticCompletions/shells/NuShellShellProvider.cs
+++ b/src/System.CommandLine.StaticCompletions/shells/NuShellShellProvider.cs
@@ -45,5 +45,5 @@ dotnet complete (
         }
         """;
 
-    public string GenerateCompletions(System.CommandLine.CliCommand command) => _dynamicCompletionScript;
+    public string GenerateCompletions(System.CommandLine.Command command) => _dynamicCompletionScript;
 }
diff --git a/src/System.CommandLine.StaticCompletions/shells/PowershellShellProvider.cs b/src/System.CommandLine.StaticCompletions/shells/PowershellShellProvider.cs
index 08ab50bbc1e5..cd96b450c5eb 100644
--- a/src/System.CommandLine.StaticCompletions/shells/PowershellShellProvider.cs
+++ b/src/System.CommandLine.StaticCompletions/shells/PowershellShellProvider.cs
@@ -21,7 +21,7 @@ public class PowershellShellProvider : IShellProvider
     // override the ToString method to return the argument name so that CLI help is cleaner for 'default' values
     public override string ToString() => ArgumentName;
 
-    public string GenerateCompletions(CliCommand command)
+    public string GenerateCompletions(Command command)
     {
         var binaryName = command.Name;
 
@@ -83,14 +83,14 @@ private static string CompletionResult(string name, string value, string type, s
 
     private static string ParameterValueResult(string name, string value, string? helpText) => CompletionResult(name, value, "ParameterValue", helpText);
 
-    private static string? SanitizeHelpDescription(CliSymbol s) => s.Description?.ReplaceLineEndings(" ").Replace("`", "``").Replace("'", "`'").Replace("\"", "`\"").Replace("$", "`$");
+    private static string? SanitizeHelpDescription(Symbol s) => s.Description?.ReplaceLineEndings(" ").Replace("`", "``").Replace("'", "`'").Replace("\"", "`\"").Replace("$", "`$");
 
     /// <summary>
     /// Generations completion-list items for the names of the given option. Typically used by commands/subcommands for static lookup lists.
     /// </summary>
     /// <param name="o"></param>
     /// <returns></returns>
-    private static IEnumerable<string> GenerateOptionNameCompletions(CliOption o)
+    private static IEnumerable<string> GenerateOptionNameCompletions(Option o)
     {
         if (o.Hidden)
         {
@@ -116,7 +116,7 @@ private static IEnumerable<string> GenerateOptionNameCompletions(CliOption o)
     /// </summary>
     /// <param name="argument"></param>
     /// <returns></returns>
-    private static IEnumerable<string> GenerateArgumentCompletions(CliArgument argument)
+    private static IEnumerable<string> GenerateArgumentCompletions(Argument argument)
     {
         if (argument.Hidden)
         {
@@ -146,7 +146,7 @@ private static IEnumerable<string> GenerateArgumentCompletions(CliArgument argum
     /// <param name="writer"></param>
     /// <param name="command"></param>
     /// <remarks>Dynamically-generated completions are not yet supported</remarks>
-    internal static void GenerateSubcommandCompletions(string[] parentCommandNames, IndentedTextWriter writer, CliCommand command)
+    internal static void GenerateSubcommandCompletions(string[] parentCommandNames, IndentedTextWriter writer, Command command)
     {
         string[] commandNameList = parentCommandNames switch
         {
@@ -173,7 +173,7 @@ internal static void GenerateSubcommandCompletions(string[] parentCommandNames,
     /// <summary>
     /// Generate completions for the statically-known options, arguments, and subcommands of a given command.
     /// </summary>
-    private static void GenerateStaticCompletionsForCommand(string[] commandPath, CliCommand command, IndentedTextWriter writer)
+    private static void GenerateStaticCompletionsForCommand(string[] commandPath, Command command, IndentedTextWriter writer)
     {
         List<string> completions = new();
 
@@ -237,11 +237,11 @@ private static void GenerateDynamicCompletionsCall(IndentedTextWriter writer)
     }
 
 
-    private static void GenerateDynamicCompletionsForArguments(string[] commandNameList, IList<CliArgument> arguments, IndentedTextWriter writer)
+    private static void GenerateDynamicCompletionsForArguments(string[] commandNameList, IList<Argument> arguments, IndentedTextWriter writer)
     {
 
     }
-    private static void GenerateDynamicCompletionsForOptions(string[] commandNameList, IList<CliOption> options, IndentedTextWriter writer)
+    private static void GenerateDynamicCompletionsForOptions(string[] commandNameList, IList<Option> options, IndentedTextWriter writer)
     {
 
     }
diff --git a/src/System.CommandLine.StaticCompletions/shells/ShellProvider.cs b/src/System.CommandLine.StaticCompletions/shells/ShellProvider.cs
index 68e699232154..cf40b3681a33 100644
--- a/src/System.CommandLine.StaticCompletions/shells/ShellProvider.cs
+++ b/src/System.CommandLine.StaticCompletions/shells/ShellProvider.cs
@@ -29,7 +29,7 @@ public interface IShellProvider
     /// </summary>
     /// <param name="command"></param>
     /// <returns></returns>
-    string GenerateCompletions(System.CommandLine.CliCommand command);
+    string GenerateCompletions(System.CommandLine.Command command);
 }
 
 
diff --git a/src/System.CommandLine.StaticCompletions/shells/ZshShellProvider.cs b/src/System.CommandLine.StaticCompletions/shells/ZshShellProvider.cs
index 9a63974a84cb..8bbcff4436ce 100644
--- a/src/System.CommandLine.StaticCompletions/shells/ZshShellProvider.cs
+++ b/src/System.CommandLine.StaticCompletions/shells/ZshShellProvider.cs
@@ -17,7 +17,7 @@ public class ZshShellProvider : IShellProvider
     // override the ToString method to return the argument name so that CLI help is cleaner for 'default' values
     public override string ToString() => ArgumentName;
 
-    public string GenerateCompletions(CliCommand command)
+    public string GenerateCompletions(Command command)
     {
         var binaryName = command.Name;
         using var textWriter = new StringWriter { NewLine = "\n" };
@@ -75,7 +75,7 @@ compdef _{{binaryName}} {{binaryName}}
         return textWriter.ToString();
     }
 
-    private static void GenerateOptionsAndArgumentsForCommand(string[] commandPathForThisCommand, CliCommand command, IndentedTextWriter writer)
+    private static void GenerateOptionsAndArgumentsForCommand(string[] commandPathForThisCommand, Command command, IndentedTextWriter writer)
     {
         var shouldWriteDynamicCompleter = false;
         foreach (var option in command.HierarchicalOptions())
@@ -178,7 +178,7 @@ static void WriteValueExpression(IndentedTextWriter writer, string[]? argumentVa
         }
     }
 
-    private static void GenerateSubcommandList(string[] pathToCurrentCommand, CliCommand command, IndentedTextWriter writer)
+    private static void GenerateSubcommandList(string[] pathToCurrentCommand, Command command, IndentedTextWriter writer)
     {
         if (command.Subcommands.Count == 0)
         {
@@ -193,7 +193,7 @@ private static void GenerateSubcommandList(string[] pathToCurrentCommand, CliCom
         // but it's load-bearing and I haven't been able to rip it out yet. No where else seems to have this hidden argument, so for tracking purposes
         // we can skip it here.
         // in addition, optional arguments interfere with position counting, so we need to skip them as well.
-        var parentArguments = command.Parents.OfType<CliCommand>().SelectMany(parent => parent.Arguments).Select(arg => arg.Name).ToHashSet();
+        var parentArguments = command.Parents.OfType<Command>().SelectMany(parent => parent.Arguments).Select(arg => arg.Name).ToHashSet();
         var pos = command.Arguments.Where(a => !parentArguments.Contains(a.Name) && !a.Hidden).Count() + 1;
         writer.WriteLine($$"""words=($line[{{pos}}] "${words[@]}")""");
         writer.WriteLine("(( CURRENT += 1 ))");
@@ -240,7 +240,7 @@ private static void GenerateDynamicCompleter(IndentedTextWriter writer)
         writer.WriteLine(";;");
     }
 
-    private static void GenerateSubcommandHandlers(string[] pathToThisCommand, CliCommand command, IndentedTextWriter writer)
+    private static void GenerateSubcommandHandlers(string[] pathToThisCommand, Command command, IndentedTextWriter writer)
     {
 
         var unique_command_name = string.Join("__", pathToThisCommand);
@@ -304,7 +304,7 @@ private static string SanitizeValue(string? s) =>
             .Replace(" ", "\\ ")
         ?? "";
 
-    private static string[]? ZshValueExpression(CliOption option)
+    private static string[]? ZshValueExpression(Option option)
     {
         if (option is IDynamicOption)
         {
@@ -312,11 +312,11 @@ private static string SanitizeValue(string? s) =>
         }
         else
         {
-            return ZshValueExpression(option as CliSymbol);
+            return ZshValueExpression(option as Symbol);
         }
     }
 
-    private static string[]? ZshValueExpression(CliArgument arg)
+    private static string[]? ZshValueExpression(Argument arg)
     {
         if (arg is IDynamicArgument)
         {
@@ -324,21 +324,21 @@ private static string SanitizeValue(string? s) =>
         }
         else
         {
-            return ZshValueExpression(arg as CliSymbol);
+            return ZshValueExpression(arg as Symbol);
         }
     }
 
-    private static string[]? ZshValueExpression(CliSymbol sym)
+    private static string[]? ZshValueExpression(Symbol sym)
     {
         var staticCompletions = sym.GetCompletions(Completions.CompletionContext.Empty).ToArray();
         if (staticCompletions.Length == 0)
         {
             //TODO: attempt to do zsh helpers here
-            if (sym is CliOption<FileInfo> || sym is CliArgument<FileInfo>)
+            if (sym is Option<FileInfo> || sym is Argument<FileInfo>)
             {
                 return ["_files"];
             }
-            else if (sym is CliOption<Uri> || sym is CliArgument<Uri>)
+            else if (sym is Option<Uri> || sym is Argument<Uri>)
             {
                 return ["_urls"];
             }
@@ -372,6 +372,6 @@ private static string SanitizeValue(string? s) =>
 
     private static string ArgumentsHandler() => "_arguments \"${_arguments_options[@]}\" : \\";
 
-    private static string[] AppendCommandToPath(string[] path, CliCommand command) =>
+    private static string[] AppendCommandToPath(string[] path, Command command) =>
         path.Length == 0 ? [command.Name] : [.. path, command.Name];
 }
diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json
index 3c486bcab22d..5175b4ffe8e8 100644
--- a/src/VirtualMonoRepo/source-mappings.json
+++ b/src/VirtualMonoRepo/source-mappings.json
@@ -150,9 +150,7 @@
         },
         {
             "name": "sourcelink",
-            "defaultRemote": "https://github.com/dotnet/sourcelink",
-            // Migrated onto the flat flow
-            "disableSynchronization": true
+            "defaultRemote": "https://github.com/dotnet/sourcelink"
         },
         {
             "name": "symreader",
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstallTests.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstallTests.cs
index 8500a82ca5da..5716bc4f1b85 100644
--- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstallTests.cs
+++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstallTests.cs
@@ -229,7 +229,7 @@ public void CommandExampleCanShowParentCommandsBeyondNew()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
-            CliCommand rootCommand = new("dotnet")
+            Command rootCommand = new("dotnet")
             {
                 myCommand
             };
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstantiateTests.Subcommand.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstantiateTests.Subcommand.cs
index c5696cef8014..d7dbba8f2678 100644
--- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstantiateTests.Subcommand.cs
+++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstantiateTests.Subcommand.cs
@@ -74,7 +74,7 @@ internal void Create_CanParseNameOption(string command, string? expectedValue)
             IEngineEnvironmentSettings settings = new EngineEnvironmentSettings(host, virtualizeSettings: true);
             TemplatePackageManager packageManager = A.Fake<TemplatePackageManager>();
 
-            CliRootCommand rootCommand = new();
+            RootCommand rootCommand = new();
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
             rootCommand.Add(myCommand);
 
@@ -83,7 +83,7 @@ internal void Create_CanParseNameOption(string command, string? expectedValue)
             var instantiateCommand = (InstantiateCommand)parseResult.CommandResult.Command;
             var args = new InstantiateCommandArgs(instantiateCommand, parseResult);
             TemplateCommand templateCommand = new(instantiateCommand, settings, packageManager, templateGroup, templateGroup.Templates.Single());
-            CliConfiguration parser = ParserFactory.CreateParser(templateCommand);
+            CommandLineConfiguration parser = ParserFactory.CreateParser(templateCommand);
             ParseResult templateParseResult = parser.Parse(args.TokensToInvoke ?? Array.Empty<string>());
             var templateArgs = new TemplateCommandArgs(templateCommand, instantiateCommand, templateParseResult);
 
@@ -111,7 +111,7 @@ internal void Create_CanValidateOptionUsage_InNewCommand(string command, string?
             IEngineEnvironmentSettings settings = new EngineEnvironmentSettings(host, virtualizeSettings: true);
             TemplatePackageManager packageManager = A.Fake<TemplatePackageManager>();
 
-            CliRootCommand rootCommand = new();
+            RootCommand rootCommand = new();
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
             rootCommand.Add(myCommand);
 
@@ -146,7 +146,7 @@ internal void Create_CanParseTemplateOptions(string command, string parameterNam
             var instantiateCommand = (InstantiateCommand)parseResult.CommandResult.Command;
             var args = new InstantiateCommandArgs(instantiateCommand, parseResult);
             TemplateCommand templateCommand = new(instantiateCommand, settings, packageManager, templateGroup, templateGroup.Templates.Single());
-            CliConfiguration parser = ParserFactory.CreateParser(templateCommand);
+            CommandLineConfiguration parser = ParserFactory.CreateParser(templateCommand);
             ParseResult templateParseResult = parser.Parse(args.RemainingArguments ?? Array.Empty<string>());
             var templateArgs = new TemplateCommandArgs(templateCommand, instantiateCommand, templateParseResult);
 
@@ -181,7 +181,7 @@ internal void Create_CanParseChoiceTemplateOptions(string command, string parame
             var instantiateCommand = (InstantiateCommand)parseResult.CommandResult.Command;
             var args = new InstantiateCommandArgs(instantiateCommand, parseResult);
             TemplateCommand templateCommand = new(instantiateCommand, settings, packageManager, templateGroup, templateGroup.Templates.Single());
-            CliConfiguration parser = ParserFactory.CreateParser(templateCommand);
+            CommandLineConfiguration parser = ParserFactory.CreateParser(templateCommand);
             ParseResult templateParseResult = parser.Parse(args.RemainingArguments ?? Array.Empty<string>());
             var templateArgs = new TemplateCommandArgs(templateCommand, instantiateCommand, templateParseResult);
 
@@ -224,7 +224,7 @@ internal void Create_CanDetectParseErrorsTemplateOptions(
             var args = new InstantiateCommandArgs(instantiateCommand, parseResult);
 
             TemplateCommand templateCommand = new(instantiateCommand, settings, packageManager, templateGroup, templateGroup.Templates.Single());
-            CliConfiguration parser = ParserFactory.CreateParser(templateCommand);
+            CommandLineConfiguration parser = ParserFactory.CreateParser(templateCommand);
             ParseResult templateParseResult = parser.Parse(args.RemainingArguments ?? Array.Empty<string>());
             Assert.True(templateParseResult.Errors.Any());
             Assert.Equal(expectedError, templateParseResult.Errors.Single().Message);
@@ -258,7 +258,7 @@ internal void Create_CanDetectParseErrorsChoiceTemplateOptions(
             var args = new InstantiateCommandArgs(instantiateCommand, parseResult);
 
             TemplateCommand templateCommand = new(instantiateCommand, settings, packageManager, templateGroup, templateGroup.Templates.Single());
-            CliConfiguration parser = ParserFactory.CreateParser(templateCommand);
+            CommandLineConfiguration parser = ParserFactory.CreateParser(templateCommand);
             ParseResult templateParseResult = parser.Parse(args.RemainingArguments ?? Array.Empty<string>());
             Assert.True(templateParseResult.Errors.Any());
             Assert.Equal(expectedError, templateParseResult.Errors.Single().Message);
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstantiateTests.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstantiateTests.cs
index 641fdefe7d94..d3a0b2beeaa7 100644
--- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstantiateTests.cs
+++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstantiateTests.cs
@@ -249,13 +249,13 @@ internal void CanParseNameOption(string command, string? expectedValue)
             IEngineEnvironmentSettings settings = new EngineEnvironmentSettings(host, virtualizeSettings: true);
             TemplatePackageManager packageManager = A.Fake<TemplatePackageManager>();
 
-            CliRootCommand rootCommand = new();
+            RootCommand rootCommand = new();
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
             rootCommand.Subcommands.Add(myCommand);
             ParseResult parseResult = rootCommand.Parse(command);
             InstantiateCommandArgs args = InstantiateCommandArgs.FromNewCommandArgs(new NewCommandArgs(myCommand, parseResult));
             TemplateCommand templateCommand = new(myCommand, settings, packageManager, templateGroup, templateGroup.Templates.Single());
-            CliConfiguration parser = ParserFactory.CreateParser(templateCommand);
+            CommandLineConfiguration parser = ParserFactory.CreateParser(templateCommand);
             ParseResult templateParseResult = parser.Parse(args.TokensToInvoke ?? Array.Empty<string>());
             var templateArgs = new TemplateCommandArgs(templateCommand, myCommand, templateParseResult);
 
@@ -317,11 +317,11 @@ internal void CanParseTemplateOptions(string command, string parameterName, stri
             TemplatePackageManager packageManager = A.Fake<TemplatePackageManager>();
 
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
-            CliConfiguration parser = ParserFactory.CreateParser(myCommand);
+            CommandLineConfiguration parser = ParserFactory.CreateParser(myCommand);
             ParseResult parseResult = parser.Parse($" new {command}");
             InstantiateCommandArgs args = InstantiateCommandArgs.FromNewCommandArgs(new NewCommandArgs(myCommand, parseResult));
             TemplateCommand templateCommand = new(myCommand, settings, packageManager, templateGroup, templateGroup.Templates.Single());
-            CliConfiguration templateCommandParser = ParserFactory.CreateParser(templateCommand);
+            CommandLineConfiguration templateCommandParser = ParserFactory.CreateParser(templateCommand);
             ParseResult templateParseResult = templateCommandParser.Parse(args.RemainingArguments ?? Array.Empty<string>());
             var templateArgs = new TemplateCommandArgs(templateCommand, myCommand, templateParseResult);
 
@@ -364,7 +364,7 @@ internal void CanParseChoiceTemplateOptions(string command, string parameterName
             ParseResult parseResult = myCommand.Parse($" new {command}");
             InstantiateCommandArgs args = InstantiateCommandArgs.FromNewCommandArgs(new NewCommandArgs(myCommand, parseResult));
             TemplateCommand templateCommand = new(myCommand, settings, packageManager, templateGroup, templateGroup.Templates.Single());
-            CliConfiguration parser = ParserFactory.CreateParser(templateCommand);
+            CommandLineConfiguration parser = ParserFactory.CreateParser(templateCommand);
             ParseResult templateParseResult = parser.Parse(args.RemainingArguments ?? Array.Empty<string>());
             var templateArgs = new TemplateCommandArgs(templateCommand, myCommand, templateParseResult);
 
@@ -408,7 +408,7 @@ internal void CanParseMultiChoiceTemplateOptions(string command, string paramete
             ParseResult parseResult = myCommand.Parse($" new {command}");
             InstantiateCommandArgs args = InstantiateCommandArgs.FromNewCommandArgs(new NewCommandArgs(myCommand, parseResult));
             TemplateCommand templateCommand = new(myCommand, settings, packageManager, templateGroup, templateGroup.Templates.Single());
-            CliConfiguration parser = ParserFactory.CreateParser(templateCommand);
+            CommandLineConfiguration parser = ParserFactory.CreateParser(templateCommand);
             ParseResult templateParseResult = parser.Parse(args.RemainingArguments ?? Array.Empty<string>());
             var templateArgs = new TemplateCommandArgs(templateCommand, myCommand, templateParseResult);
 
@@ -479,7 +479,7 @@ internal void CanDetectParseErrorsTemplateOptions(
             InstantiateCommandArgs args = InstantiateCommandArgs.FromNewCommandArgs(new NewCommandArgs(myCommand, parseResult));
 
             TemplateCommand templateCommand = new(myCommand, settings, packageManager, templateGroup, templateGroup.Templates.Single());
-            CliConfiguration parser = ParserFactory.CreateParser(templateCommand);
+            CommandLineConfiguration parser = ParserFactory.CreateParser(templateCommand);
             ParseResult templateParseResult = parser.Parse(args.RemainingArguments ?? Array.Empty<string>());
             Assert.True(templateParseResult.Errors.Any());
             Assert.Equal(expectedError, templateParseResult.Errors.Single().Message);
@@ -519,12 +519,12 @@ internal void CanDetectParseErrorsChoiceTemplateOptions(
             TemplatePackageManager packageManager = A.Fake<TemplatePackageManager>();
 
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
-            CliConfiguration parser = ParserFactory.CreateParser(myCommand);
+            CommandLineConfiguration parser = ParserFactory.CreateParser(myCommand);
             ParseResult parseResult = parser.Parse($" new {command}");
             InstantiateCommandArgs args = InstantiateCommandArgs.FromNewCommandArgs(new NewCommandArgs(myCommand, parseResult));
 
             TemplateCommand templateCommand = new(myCommand, settings, packageManager, templateGroup, templateGroup.Templates.Single());
-            CliConfiguration templateCommandParser = ParserFactory.CreateParser(templateCommand);
+            CommandLineConfiguration templateCommandParser = ParserFactory.CreateParser(templateCommand);
             ParseResult templateParseResult = templateCommandParser.Parse(args.RemainingArguments ?? Array.Empty<string>());
             Assert.True(templateParseResult.Errors.Any());
             Assert.Equal(expectedError, templateParseResult.Errors.Single().Message);
@@ -548,7 +548,7 @@ internal void DoNotAddAllowScriptOptionForTemplate()
             InstantiateCommandArgs args = InstantiateCommandArgs.FromNewCommandArgs(new NewCommandArgs(myCommand, parseResult));
 
             TemplateCommand templateCommand = new(myCommand, settings, packageManager, templateGroup, templateGroup.Templates.Single());
-            CliConfiguration parser = ParserFactory.CreateParser(templateCommand);
+            CommandLineConfiguration parser = ParserFactory.CreateParser(templateCommand);
             ParseResult templateParseResult = parser.Parse(args.RemainingArguments ?? Array.Empty<string>());
 
             TemplateCommandArgs templateArgs = new(templateCommand, myCommand, templateParseResult);
@@ -581,7 +581,7 @@ internal void CanParseAllowScriptsOption(string command, AllowRunScripts? result
             InstantiateCommandArgs args = InstantiateCommandArgs.FromNewCommandArgs(new NewCommandArgs(myCommand, parseResult));
 
             TemplateCommand templateCommand = new(myCommand, settings, packageManager, templateGroup, templateGroup.Templates.Single());
-            CliConfiguration parser = ParserFactory.CreateParser(templateCommand);
+            CommandLineConfiguration parser = ParserFactory.CreateParser(templateCommand);
             ParseResult templateParseResult = parser.Parse(args.RemainingArguments ?? Array.Empty<string>());
 
             TemplateCommandArgs templateArgs = new(templateCommand, myCommand, templateParseResult);
@@ -734,7 +734,7 @@ internal void CanParseFlagsOption(string command, string action)
             IEngineEnvironmentSettings settings = new EngineEnvironmentSettings(host, virtualizeSettings: true);
             TemplatePackageManager packageManager = A.Fake<TemplatePackageManager>();
 
-            CliRootCommand rootCommand = new();
+            RootCommand rootCommand = new();
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
             rootCommand.Subcommands.Add(myCommand);
             ParseResult parseResult = rootCommand.Parse(command);
@@ -745,7 +745,7 @@ internal void CanParseFlagsOption(string command, string action)
                 templatePackageManager: packageManager,
                 templateGroup: templateGroup,
                 template: templateGroup.Templates.Single());
-            CliConfiguration parser = ParserFactory.CreateParser(templateCommand);
+            CommandLineConfiguration parser = ParserFactory.CreateParser(templateCommand);
             ParseResult templateParseResult = parser.Parse(args.TokensToInvoke ?? Array.Empty<string>());
             var templateArgs = new TemplateCommandArgs(templateCommand, myCommand, templateParseResult);
 
@@ -765,7 +765,7 @@ internal void CanParse_WithoutRequiredParameter()
             IEngineEnvironmentSettings settings = new EngineEnvironmentSettings(host, virtualizeSettings: true);
             TemplatePackageManager packageManager = A.Fake<TemplatePackageManager>();
 
-            CliRootCommand rootCommand = new();
+            RootCommand rootCommand = new();
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
             rootCommand.Subcommands.Add(myCommand);
             ParseResult parseResult = rootCommand.Parse("new foo");
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/ListTests.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/ListTests.cs
index d3338cd7aa7f..d8f69adfdca2 100644
--- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/ListTests.cs
+++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/ListTests.cs
@@ -269,7 +269,7 @@ public void CommandExampleCanShowParentCommandsBeyondNew()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
-            CliCommand rootCommand = new("dotnet")
+            Command rootCommand = new("dotnet")
             {
                 myCommand
             };
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/MiscTests.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/MiscTests.cs
index 9a936480726e..10ad62d08119 100644
--- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/MiscTests.cs
+++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/MiscTests.cs
@@ -18,10 +18,10 @@ public class MiscTests : BaseTest
         [Fact]
         public void KnownHelpAliasesAreCorrect()
         {
-            ParseResult result = new CliConfiguration(new CliRootCommand())
+            ParseResult result = new CommandLineConfiguration(new RootCommand())
                 .Parse(Constants.KnownHelpAliases[0]);
 
-            CliOption helpOption = result.CommandResult
+            Option helpOption = result.CommandResult
                 .Children
                 .OfType<OptionResult>()
                 .Select(r => r.Option)
@@ -151,7 +151,7 @@ public void ManuallyAddedOptionIsPreservedOnTemplateSubcommandLevel()
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
 
-            var customOption = new CliOption<string>("--newOption")
+            var customOption = new Option<string>("--newOption")
             {
                 Recursive = true
             };
@@ -177,7 +177,7 @@ public void CanParseOutputOption(string command, string? expected)
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
 
-            CliRootCommand rootCommand = new();
+            RootCommand rootCommand = new();
 
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
             rootCommand.Add(myCommand);
@@ -195,7 +195,7 @@ public void CanParseProjectOption(string command, string? expected)
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
 
-            CliRootCommand rootCommand = new();
+            RootCommand rootCommand = new();
 
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
             rootCommand.Add(myCommand);
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/SearchTests.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/SearchTests.cs
index 51d647fee2df..cc75fe669e23 100644
--- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/SearchTests.cs
+++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/SearchTests.cs
@@ -244,7 +244,7 @@ public void CommandExampleCanShowParentCommandsBeyondNew()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
-            CliCommand rootCommand = new("dotnet")
+            Command rootCommand = new("dotnet")
             {
                 myCommand
             };
@@ -258,7 +258,7 @@ public void CommandExampleShowsMandatoryArg()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
-            CliCommand rootCommand = new("dotnet")
+            Command rootCommand = new("dotnet")
             {
                 myCommand
             };
@@ -272,7 +272,7 @@ public void CommandExampleShowsOptionalArgWhenOptionsAreGiven()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
-            CliCommand rootCommand = new("dotnet")
+            Command rootCommand = new("dotnet")
             {
                 myCommand
             };
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/TabCompletionTests.Approval.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/TabCompletionTests.Approval.cs
index 049cac00401c..94120f6f4b0f 100644
--- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/TabCompletionTests.Approval.cs
+++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/TabCompletionTests.Approval.cs
@@ -13,7 +13,7 @@ public partial class TabCompletionTests : BaseTest
         public Task RootCommand_GetAllSuggestions()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = ParserFactory.CreateParser(myCommand).Parse("new ");
             System.CommandLine.Completions.CompletionItem[] result = parseResult.GetCompletions().ToArray();
@@ -25,7 +25,7 @@ public Task RootCommand_GetAllSuggestions()
         public Task RootCommand_GetStartsWtihSuggestions()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse("new c");
             System.CommandLine.Completions.CompletionItem[] result = parseResult.GetCompletions().ToArray();
@@ -37,7 +37,7 @@ public Task RootCommand_GetStartsWtihSuggestions()
         public Task Install_GetAllSuggestions()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse("new install ");
             System.CommandLine.Completions.CompletionItem[] result = parseResult.GetCompletions().ToArray();
@@ -49,7 +49,7 @@ public Task Install_GetAllSuggestions()
         public Task Uninstall_GetAllSuggestions()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse("new uninstall ");
             System.CommandLine.Completions.CompletionItem[] result = parseResult.GetCompletions().ToArray();
@@ -61,7 +61,7 @@ public Task Uninstall_GetAllSuggestions()
         public Task Update_GetAllSuggestions()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse("new update ");
             System.CommandLine.Completions.CompletionItem[] result = parseResult.GetCompletions().ToArray();
@@ -73,7 +73,7 @@ public Task Update_GetAllSuggestions()
         public Task List_GetAllSuggestions()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse("new list ");
             System.CommandLine.Completions.CompletionItem[] result = parseResult.GetCompletions().ToArray();
@@ -85,7 +85,7 @@ public Task List_GetAllSuggestions()
         public Task Search_GetAllSuggestions()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse("new search ");
             System.CommandLine.Completions.CompletionItem[] result = parseResult.GetCompletions().ToArray();
@@ -97,7 +97,7 @@ public Task Search_GetAllSuggestions()
         public Task Create_GetAllSuggestions()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse("new create ");
             System.CommandLine.Completions.CompletionItem[] result = parseResult.GetCompletions().ToArray();
@@ -109,7 +109,7 @@ public Task Create_GetAllSuggestions()
         public Task TemplateCommand_GetAllSuggestions()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse("new console ");
             System.CommandLine.Completions.CompletionItem[] result = parseResult.GetCompletions().ToArray();
@@ -121,7 +121,7 @@ public Task TemplateCommand_GetAllSuggestions()
         public Task DetailsCommand_GetAllSuggestions()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse("new details ");
             System.CommandLine.Completions.CompletionItem[] result = parseResult.GetCompletions().ToArray();
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/TabCompletionTests.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/TabCompletionTests.cs
index 3b20f00c2733..6a0efd3511a9 100644
--- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/TabCompletionTests.cs
+++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/TabCompletionTests.cs
@@ -20,7 +20,7 @@ public partial class TabCompletionTests
         public void Instantiate_CanSuggestTemplateOption_StartsWith()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse($"new console --framework {ToolsetInfo.CurrentTargetFramework} --l");
             string[] suggestions = parseResult.GetCompletions().Select(l => l.Label).ToArray();
@@ -36,7 +36,7 @@ public void Instantiate_CanSuggestTemplateOption_StartsWith()
         public void Instantiate_CanSuggestLanguages()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse("new console --language ");
             string[] suggestions = parseResult.GetCompletions().Select(l => l.Label).ToArray();
@@ -53,7 +53,7 @@ public void Instantiate_CanSuggestLanguages()
         public void Install_GetSuggestionsAfterInteractive()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse("new install --interactive ");
             string[] result = parseResult.GetCompletions().Select(l => l.Label).ToArray();
@@ -66,7 +66,7 @@ public void Install_GetSuggestionsAfterInteractive()
         public void Install_GetSuggestionsAfterOptionWithoutArg()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse("new install --nuget-source ");
             CompletionItem[] result = parseResult.GetCompletions().ToArray();
@@ -80,7 +80,7 @@ public void Install_GetSuggestionsAfterOptionWithoutArg()
         public void Install_GetSuggestionsAfterOptionWithArg()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse("new install --nuget-source me");
             string[] result = parseResult.GetCompletions().Select(l => l.Label).ToArray();
@@ -93,7 +93,7 @@ public void Install_GetSuggestionsAfterOptionWithArg()
         public void Instantiate_CanSuggestTemplate_StartsWith()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliCommand myCommand = NewCommandFactory.Create("new", _ => host);
+            Command myCommand = NewCommandFactory.Create("new", _ => host);
 
             ParseResult parseResult = myCommand.Parse("new co");
             string[] suggestions = parseResult.GetCompletions().Select(l => l.Label).ToArray();
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/UninstallTests.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/UninstallTests.cs
index 481880e42f49..607f2dd2a7da 100644
--- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/UninstallTests.cs
+++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/UninstallTests.cs
@@ -90,7 +90,7 @@ public void CommandExampleCanShowParentCommandsBeyondNew()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
-            CliCommand rootCommand = new("dotnet")
+            Command rootCommand = new("dotnet")
             {
                 myCommand
             };
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/UpdateTests.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/UpdateTests.cs
index 7ada93f796ad..6fb3fe63d6ca 100644
--- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/UpdateTests.cs
+++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/UpdateTests.cs
@@ -188,7 +188,7 @@ public void CommandExampleCanShowParentCommandsBeyondNew()
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
-            CliCommand rootCommand = new("dotnet")
+            Command rootCommand = new("dotnet")
             {
                 myCommand
             };
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/TemplateResolutionTests/ListTemplateResolverTests.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/TemplateResolutionTests/ListTemplateResolverTests.cs
index 6df8a4eb41ae..b9dee47fad62 100644
--- a/test/Microsoft.TemplateEngine.Cli.UnitTests/TemplateResolutionTests/ListTemplateResolverTests.cs
+++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/TemplateResolutionTests/ListTemplateResolverTests.cs
@@ -596,7 +596,7 @@ public async Task TestGetTemplateResolutionResult_IgnoreConstraintsMismatch()
         private static ListCommandArgs GetListCommandArgsFor(string commandInput)
         {
             ICliTemplateEngineHost host = CliTestHostFactory.GetVirtualHost(additionalComponents: BuiltInTemplatePackagesProviderFactory.GetComponents(RepoTemplatePackages));
-            CliRootCommand rootCommand = new();
+            RootCommand rootCommand = new();
             NewCommand myCommand = (NewCommand)NewCommandFactory.Create("new", _ => host);
             rootCommand.Add(myCommand);
 
diff --git a/test/System.CommandLine.StaticCompletions.Tests/BashShellProviderTests.cs b/test/System.CommandLine.StaticCompletions.Tests/BashShellProviderTests.cs
index 4181f0f7db96..c5e30435528d 100644
--- a/test/System.CommandLine.StaticCompletions.Tests/BashShellProviderTests.cs
+++ b/test/System.CommandLine.StaticCompletions.Tests/BashShellProviderTests.cs
@@ -20,7 +20,7 @@ public async Task GenericCompletions()
     public async Task SimpleOptionCompletion()
     {
         await provider.Verify(new("mycommand") {
-            new CliOption<string>("--name")
+            new Option<string>("--name")
         }, log);
     }
 
@@ -28,8 +28,8 @@ await provider.Verify(new("mycommand") {
     public async Task SubcommandAndOptionInTopLevelList()
     {
         await provider.Verify(new("mycommand") {
-                new CliOption<string>("--name"),
-                new CliCommand("subcommand")
+                new Option<string>("--name"),
+                new Command("subcommand")
             }, log);
     }
 
@@ -37,8 +37,8 @@ await provider.Verify(new("mycommand") {
     public async Task NestedSubcommandCompletion()
     {
         await provider.Verify(new("mycommand") {
-            new CliCommand("subcommand") {
-                new CliCommand("nested")
+            new Command("subcommand") {
+                new Command("nested")
             }
         }, log);
     }
diff --git a/test/System.CommandLine.StaticCompletions.Tests/HelpExtensionsTests.cs b/test/System.CommandLine.StaticCompletions.Tests/HelpExtensionsTests.cs
index 600fcb25f1e2..239f55acb956 100644
--- a/test/System.CommandLine.StaticCompletions.Tests/HelpExtensionsTests.cs
+++ b/test/System.CommandLine.StaticCompletions.Tests/HelpExtensionsTests.cs
@@ -19,27 +19,27 @@ public void HelpOptionOnlyShowsUsefulNames()
     [Fact]
     public void OptionNamesListNameThenAliases()
     {
-        new CliOption<string>("--name", "-n", "--nombre").Names().Should().Equal(["--name", "-n", "--nombre"]);
+        new Option<string>("--name", "-n", "--nombre").Names().Should().Equal(["--name", "-n", "--nombre"]);
     }
 
     [Fact]
     public void OptionsWithNoAliasesHaveOnlyOneName()
     {
-        new CliOption<string>("--name").Names().Should().Equal(["--name"]);
+        new Option<string>("--name").Names().Should().Equal(["--name"]);
     }
 
     [Fact]
     public void HeirarchicalOptionsAreFlattened()
     {
-        var parentCommand = new CliCommand("parent");
-        var childCommand = new CliCommand("child");
+        var parentCommand = new Command("parent");
+        var childCommand = new Command("child");
         parentCommand.Subcommands.Add(childCommand);
-        parentCommand.Options.Add(new CliOption<string>("--parent-global") { Recursive = true });
-        parentCommand.Options.Add(new CliOption<string>("--parent-local") { Recursive = false });
-        parentCommand.Options.Add(new CliOption<string>("--parent-global-but-hidden") { Recursive = true, Hidden = true });
+        parentCommand.Options.Add(new Option<string>("--parent-global") { Recursive = true });
+        parentCommand.Options.Add(new Option<string>("--parent-local") { Recursive = false });
+        parentCommand.Options.Add(new Option<string>("--parent-global-but-hidden") { Recursive = true, Hidden = true });
 
-        childCommand.Options.Add(new CliOption<string>("--child-local"));
-        childCommand.Options.Add(new CliOption<string>("--child-hidden") { Hidden = true });
+        childCommand.Options.Add(new Option<string>("--child-local"));
+        childCommand.Options.Add(new Option<string>("--child-hidden") { Hidden = true });
 
         // note: no parent-local or parent-global-but-hidden options, and no locally hidden options
         childCommand.HierarchicalOptions().Select(c => c.Name).Should().Equal(["--child-local", "--parent-global"]);
diff --git a/test/System.CommandLine.StaticCompletions.Tests/PowershellProviderTests.cs b/test/System.CommandLine.StaticCompletions.Tests/PowershellProviderTests.cs
index 452ef63103bb..d8522568a8c1 100644
--- a/test/System.CommandLine.StaticCompletions.Tests/PowershellProviderTests.cs
+++ b/test/System.CommandLine.StaticCompletions.Tests/PowershellProviderTests.cs
@@ -22,7 +22,7 @@ public async Task GenericCompletions()
     public async Task SimpleOptionCompletion()
     {
         await provider.Verify(new("mycommand") {
-            new CliOption<string>("--name")
+            new Option<string>("--name")
         }, log);
     }
 
@@ -30,8 +30,8 @@ await provider.Verify(new("mycommand") {
     public async Task SubcommandAndOptionInTopLevelList()
     {
         await provider.Verify(new("mycommand") {
-                new CliOption<string>("--name"),
-                new CliCommand("subcommand")
+                new Option<string>("--name"),
+                new Command("subcommand")
             }, log);
     }
 
@@ -39,8 +39,8 @@ await provider.Verify(new("mycommand") {
     public async Task NestedSubcommandCompletion()
     {
         await provider.Verify(new("mycommand") {
-            new CliCommand("subcommand") {
-                new CliCommand("nested")
+            new Command("subcommand") {
+                new Command("nested")
             }
         }, log);
     }
diff --git a/test/System.CommandLine.StaticCompletions.Tests/TestHelpers.cs b/test/System.CommandLine.StaticCompletions.Tests/TestHelpers.cs
index e0365c4c70fb..b3e16ea61a98 100644
--- a/test/System.CommandLine.StaticCompletions.Tests/TestHelpers.cs
+++ b/test/System.CommandLine.StaticCompletions.Tests/TestHelpers.cs
@@ -3,14 +3,14 @@
 
 namespace System.CommandLine.StaticCompletions.Tests;
 
-public class DynamicOption<T> : CliOption<T>, IDynamicOption
+public class DynamicOption<T> : Option<T>, IDynamicOption
 {
     public DynamicOption(string name) : base(name)
     {
     }
 }
 
-public class DynamicArgument<T> : CliArgument<T>, IDynamicArgument
+public class DynamicArgument<T> : Argument<T>, IDynamicArgument
 {
     public DynamicArgument(string name) : base(name)
     {
diff --git a/test/System.CommandLine.StaticCompletions.Tests/VerifyExtensions.cs b/test/System.CommandLine.StaticCompletions.Tests/VerifyExtensions.cs
index 3881256457d9..a365e6478bce 100644
--- a/test/System.CommandLine.StaticCompletions.Tests/VerifyExtensions.cs
+++ b/test/System.CommandLine.StaticCompletions.Tests/VerifyExtensions.cs
@@ -9,7 +9,7 @@ namespace System.CommandLine.StaticCompletions.Tests;
 
 public static class VerifyExtensions
 {
-    public static async Task Verify(this IShellProvider provider, CliCommand command, ITestOutputHelper log, [CallerFilePath] string sourceFile = "")
+    public static async Task Verify(this IShellProvider provider, Command command, ITestOutputHelper log, [CallerFilePath] string sourceFile = "")
     {
         // Can't use sourceFile directly because in CI the file may be rooted at a different location than the compile-time location
         // We do have the source code available, just at a different root, so we can use that compute
diff --git a/test/System.CommandLine.StaticCompletions.Tests/ZshShellProviderTests.cs b/test/System.CommandLine.StaticCompletions.Tests/ZshShellProviderTests.cs
index 49f38b42dce8..3450ed01ce9f 100644
--- a/test/System.CommandLine.StaticCompletions.Tests/ZshShellProviderTests.cs
+++ b/test/System.CommandLine.StaticCompletions.Tests/ZshShellProviderTests.cs
@@ -15,23 +15,23 @@ public class ZshShellProviderTests(ITestOutputHelper log)
     [Fact]
     public async Task GenericCompletions()
     {
-        CliCommand command = new CliCommand("my-app") {
-            new CliOption<bool>("-c") {
+        Command command = new Command("my-app") {
+            new Option<bool>("-c") {
                 Arity = ArgumentArity.Zero,
                 Recursive = true
             },
-            new CliOption<bool>("-v") {
+            new Option<bool>("-v") {
                 Arity = ArgumentArity.Zero
             },
             new HelpOption(),
-            new CliCommand("test", "Subcommand\nwith a second line") {
-                new CliOption<bool>("--debug", "-d")
+            new Command("test", "Subcommand\nwith a second line") {
+                new Option<bool>("--debug", "-d")
                 {
                     Arity = ArgumentArity.Zero
                 }
             },
-            new CliCommand("help", "Print this message or the help of the given subcommand(s)") {
-                new CliCommand("test")
+            new Command("help", "Print this message or the help of the given subcommand(s)") {
+                new Command("test")
             }
         };
         await _provider.Verify(command, log);
@@ -51,7 +51,7 @@ public async Task DynamicCompletionsGeneration()
                 new ("6")
             ];
         });
-        CliCommand command = new CliCommand("my-app")
+        Command command = new Command("my-app")
         {
             staticOption,
             dynamicArg
@@ -62,9 +62,9 @@ public async Task DynamicCompletionsGeneration()
     [Fact]
     public async Task CustomStaticCompletionsGeneration()
     {
-        var staticOption = new CliOption<int>("--static");
+        var staticOption = new Option<int>("--static");
         staticOption.AcceptOnlyFromAmong("1", "2", "3");
-        var dynamicArg = new CliArgument<int>("--dynamic");
+        var dynamicArg = new Argument<int>("--dynamic");
         dynamicArg.CompletionSources.Add((context) =>
         {
             return [
@@ -73,7 +73,7 @@ public async Task CustomStaticCompletionsGeneration()
                 new ("6")
             ];
         });
-        CliCommand command = new CliCommand("my-app")
+        Command command = new Command("my-app")
         {
             staticOption,
             dynamicArg
diff --git a/test/dotnet.Tests/CommandTests/Build/BuildRelatedCommandParserTests.cs b/test/dotnet.Tests/CommandTests/Build/BuildRelatedCommandParserTests.cs
index f0dbd5cfe397..a761aa66bfeb 100644
--- a/test/dotnet.Tests/CommandTests/Build/BuildRelatedCommandParserTests.cs
+++ b/test/dotnet.Tests/CommandTests/Build/BuildRelatedCommandParserTests.cs
@@ -44,12 +44,12 @@ public static TheoryData<string, string> BuildRelatedCommandsAndOptions()
         [Theory]
         public void Build(string command, string option)
         {
-            var cliCommand = Parser.Instance.RootCommand.Children.OfType<CliCommand>().FirstOrDefault(c => c.Name == command);
+            var cliCommand = Parser.Instance.RootCommand.Children.OfType<Command>().FirstOrDefault(c => c.Name == command);
             if (cliCommand is null)
             {
                 throw new ArgumentException($"Command {command} not found in the dotnet CLI");
             }
-            var cliOption = cliCommand.Children.OfType<CliOption>().FirstOrDefault(o => o.Name == option || o.Aliases.Contains(option));
+            var cliOption = cliCommand.Children.OfType<Option>().FirstOrDefault(o => o.Name == option || o.Aliases.Contains(option));
             if (cliOption is null)
             {
                 throw new ArgumentException($"Option {option} not found in the {command} command");
diff --git a/test/dotnet.Tests/CommandTests/Build/GivenDotnetBuildBuildsCsproj.cs b/test/dotnet.Tests/CommandTests/Build/GivenDotnetBuildBuildsCsproj.cs
index b9f1b0860327..9cb6e8f4b700 100644
--- a/test/dotnet.Tests/CommandTests/Build/GivenDotnetBuildBuildsCsproj.cs
+++ b/test/dotnet.Tests/CommandTests/Build/GivenDotnetBuildBuildsCsproj.cs
@@ -400,8 +400,8 @@ static string RelativeNuGetPath(string absoluteNuGetPath)
         [InlineData("run")]
         public void It_uses_correct_runtime_help_description(string command)
         {
-            CliConfiguration sharedConfig = Parser.Instance;
-            CliConfiguration localCopy = new(sharedConfig.RootCommand)
+            CommandLineConfiguration sharedConfig = Parser.Instance;
+            CommandLineConfiguration localCopy = new(sharedConfig.RootCommand)
             {
                 EnableDefaultExceptionHandler = sharedConfig.EnableDefaultExceptionHandler,
                 ResponseFileTokenReplacer = sharedConfig.ResponseFileTokenReplacer,
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/MSBuildArgumentCommandLineParserTests.cs b/test/dotnet.Tests/CommandTests/MSBuild/MSBuildArgumentCommandLineParserTests.cs
index 10dbad2a6cd0..95e9158ba901 100644
--- a/test/dotnet.Tests/CommandTests/MSBuild/MSBuildArgumentCommandLineParserTests.cs
+++ b/test/dotnet.Tests/CommandTests/MSBuild/MSBuildArgumentCommandLineParserTests.cs
@@ -55,7 +55,7 @@ public void MSBuildArgumentsAreForwardedCorrectly(string[] arguments, bool build
         public void Can_pass_msbuild_properties_safely(string[] tokens, string[] forwardedTokens)
         {
             var forwardingFunction = (CommonOptions.PropertiesOption as ForwardedOption<string[]>).GetForwardingFunction();
-            var result = new CliRootCommand() { CommonOptions.PropertiesOption }.Parse(tokens);
+            var result = new RootCommand() { CommonOptions.PropertiesOption }.Parse(tokens);
             var parsedTokens = forwardingFunction(result);
             parsedTokens.Should().BeEquivalentTo(forwardedTokens);
         }
diff --git a/test/dotnet.Tests/ParserTests/CommonOptionsTests.cs b/test/dotnet.Tests/ParserTests/CommonOptionsTests.cs
index 031f5ebe72ff..a7949775bade 100644
--- a/test/dotnet.Tests/ParserTests/CommonOptionsTests.cs
+++ b/test/dotnet.Tests/ParserTests/CommonOptionsTests.cs
@@ -11,7 +11,7 @@ public class CommonOptionsTests
     [Fact]
     public void Duplicates()
     {
-        var command = new CliRootCommand();
+        var command = new RootCommand();
         command.Options.Add(CommonOptions.EnvOption);
 
         var result = command.Parse(["-e", "A=1", "-e", "A=2"]);
@@ -26,7 +26,7 @@ public void Duplicates()
     [Fact]
     public void Duplicates_CasingDifference()
     {
-        var command = new CliRootCommand();
+        var command = new RootCommand();
         command.Options.Add(CommonOptions.EnvOption);
 
         var result = command.Parse(["-e", "A=1", "-e", "a=2"]);
@@ -53,7 +53,7 @@ public void Duplicates_CasingDifference()
     [Fact]
     public void MultiplePerToken()
     {
-        var command = new CliRootCommand();
+        var command = new RootCommand();
         command.Options.Add(CommonOptions.EnvOption);
 
         var result = command.Parse(["-e", "A=1;B=2,C=3 D=4", "-e", "B==Y=", "-e", "C;=;"]);
@@ -73,7 +73,7 @@ public void MultiplePerToken()
     [Fact]
     public void NoValue()
     {
-        var command = new CliRootCommand();
+        var command = new RootCommand();
         command.Options.Add(CommonOptions.EnvOption);
 
         var result = command.Parse(["-e", "A"]);
@@ -88,7 +88,7 @@ public void NoValue()
     [Fact]
     public void WhitespaceTrimming()
     {
-        var command = new CliRootCommand();
+        var command = new RootCommand();
         command.Options.Add(CommonOptions.EnvOption);
 
         var result = command.Parse(["-e", " A \t\n\r\u2002 = X Y \t\n\r\u2002"]);
@@ -107,7 +107,7 @@ public void WhitespaceTrimming()
     [InlineData("  \u2002 = X")]
     public void Errors(string token)
     {
-        var command = new CliRootCommand();
+        var command = new RootCommand();
         command.Options.Add(CommonOptions.EnvOption);
 
         var result = command.Parse(["-e", token]);