diff --git a/CODEOWNERS b/CODEOWNERS
index 4591eb1ff8d7..56b8d3dacc51 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -31,7 +31,7 @@
 /src/WasmSdk @lewing @akoeplinger @pavelsavara @maraf
 
 # Area-Format
-/src/Cli/dotnet/commands/dotnet-format @phil-allen-msft
+/src/Cli/dotnet/Commands/Format @phil-allen-msft
 /test/dotnet-format.UnitTests @phil-allen-msft
 
 # Area-NuGet
@@ -47,21 +47,21 @@
 /test/dotnet.Tests/CommandTests/Restore @dotnet/nuget-team
 
 # Area-FSharp
-/src/Cli/dotnet/commands/dotnet-fsi @dotnet/fsharp
+/src/Cli/dotnet/Commands/Fsi @dotnet/fsharp
 /test/dotnet-fsi.Tests @dotnet/fsharp
 
 # Area-DotNet Test
-/src/Cli/dotnet/commands/dotnet-test @dotnet/dotnet-testing-admin
-/src/Cli/dotnet/commands/dotnet-vstest @dotnet/dotnet-testing-admin
-/test/dotnet-test.Tests @dotnet/dotnet-testing-admin
-/test/dotnet-vstest.Tests @dotnet/dotnet-testing-admin
+/src/Cli/dotnet/Commands/Test @dotnet/dotnet-testing-admin
+/src/Cli/dotnet/Commands/VSTest @dotnet/dotnet-testing-admin
+/test/dotnet.Tests/CommandTests/Test @dotnet/dotnet-testing-admin
+/test/dotnet.Tests/CommandTests/VSTest @dotnet/dotnet-testing-admin
 /test/dotnet-new.IntegrationTests @dotnet/dotnet-testing-admin
 /template_feed/Microsoft.DotNet.Common.*/content/MSTest* @dotnet/dotnet-testing-admin
 /template_feed/Microsoft.DotNet.Common.*/content/NUnit* @dotnet/dotnet-testing-admin
 /template_feed/Microsoft.DotNet.Common.*/content/XUnit* @dotnet/dotnet-testing-admin
 
 # Area-Templates
-/src/Cli/dotnet/commands/dotnet-new @dotnet/templating-engine-maintainers
+/src/Cli/dotnet/Commands/New @dotnet/templating-engine-maintainers
 /src/Cli/Microsoft.TemplateEngine.Cli @dotnet/templating-engine-maintainers
 /test/dotnet-new.IntegrationTests @dotnet/templating-engine-maintainers
 /test/Microsoft.TemplateEngine.* @dotnet/templating-engine-maintainers
@@ -117,4 +117,4 @@
 # Area-Infrastructure
 .vsts-ci.yml @MiYanni
 .vsts-pr.yml @MiYanni
-/eng/pipelines @MiYanni
\ No newline at end of file
+/eng/pipelines @MiYanni