diff --git a/readme.md b/readme.md
index 58d28ea..437cadb 100644
--- a/readme.md
+++ b/readme.md
@@ -122,7 +122,7 @@ Examples:
 
 <!-- EXAMPLES_BEGIN -->
 ```
-# Installs VS enterprise with the Xamarin/Mobile workload
+# Installs VS enterprise with the Maui/Mobile workload
 # Note the -sku: switch/prefix is optional
 > vs install Enterprise +mobile
 
@@ -248,8 +248,8 @@ Examples:
 
 <!-- EXAMPLES_BEGIN -->
 ```
-# Runs the first VS enterprise with the Xamarin/Mobile workload
-> vs -sku:ent -first +mobile
+# Runs the first VS enterprise with the Maui workload
+> vs -sku:ent -first +maui
 
 # Runs VS 16.8
 > vs -v:16.8
@@ -360,13 +360,14 @@ For commands that receive workload ID switches (i.e. `vs where -requires [WORKLO
 |  Alias    | Workload ID |
 |-----------|----------------------------|
 | `mobile`  | Microsoft.VisualStudio.Workload.NetCrossPlat |
-| `core`    | Microsoft.VisualStudio.Workload.NetCoreTools |
+| `xamarin` | Microsoft.VisualStudio.Workload.NetCrossPlat |
+| `maui`    | Microsoft.VisualStudio.Workload.NetCrossPlat |
+| `core`    | Microsoft.NetCore.Component.DevelopmentTools |
 | `azure`   | Microsoft.VisualStudio.Workload.Azure |
 | `data`    | Microsoft.VisualStudio.Workload.Data |
 | `desktop` | Microsoft.VisualStudio.Workload.ManagedDesktop |
 | `unity`   | Microsoft.VisualStudio.Workload.ManagedGame |
 | `native`  | Microsoft.VisualStudio.Workload.NativeDesktop |
-| `xamarin` | Microsoft.VisualStudio.Workload.NetCrossPlat |
 | `web`     | Microsoft.VisualStudio.Workload.NetWeb |
 | `node`    | Microsoft.VisualStudio.Workload.Node |
 | `office`  | Microsoft.VisualStudio.Workload.Office |
diff --git a/src/VisualStudio/Docs/alias.md b/src/VisualStudio/Docs/alias.md
index 4c262d5..d2597f8 100644
--- a/src/VisualStudio/Docs/alias.md
+++ b/src/VisualStudio/Docs/alias.md
@@ -15,7 +15,7 @@ Examples:
 
 <!-- EXAMPLES_BEGIN -->
 ```
-# Save the first VS enterprise with the Xamarin/Mobile workload as the "mobile" alias
+# Save the first VS enterprise with the Maui/Mobile workload as the "mobile" alias
 > vs -sku:ent -first +mobile -save:mobile
 
 # Runs the saved alias with all the original arguments
diff --git a/src/VisualStudio/Docs/install.md b/src/VisualStudio/Docs/install.md
index 542d505..78a68d4 100644
--- a/src/VisualStudio/Docs/install.md
+++ b/src/VisualStudio/Docs/install.md
@@ -20,7 +20,7 @@ Examples:
 
 <!-- EXAMPLES_BEGIN -->
 ```
-# Installs VS enterprise with the Xamarin/Mobile workload
+# Installs VS enterprise with the Maui/Mobile workload
 # Note the -sku: switch/prefix is optional
 > vs install Enterprise +mobile
 
diff --git a/src/VisualStudio/Docs/readme.md b/src/VisualStudio/Docs/readme.md
index e859cc0..7dba214 100644
--- a/src/VisualStudio/Docs/readme.md
+++ b/src/VisualStudio/Docs/readme.md
@@ -36,13 +36,14 @@ For commands that receive workload ID switches (i.e. `vs where -requires [WORKLO
 |  Alias    | Workload ID |
 |-----------|----------------------------|
 | `mobile`  | Microsoft.VisualStudio.Workload.NetCrossPlat |
-| `core`    | Microsoft.VisualStudio.Workload.NetCoreTools |
+| `xamarin` | Microsoft.VisualStudio.Workload.NetCrossPlat |
+| `maui`    | Microsoft.VisualStudio.Workload.NetCrossPlat |
+| `core`    | Microsoft.NetCore.Component.DevelopmentTools |
 | `azure`   | Microsoft.VisualStudio.Workload.Azure |
 | `data`    | Microsoft.VisualStudio.Workload.Data |
 | `desktop` | Microsoft.VisualStudio.Workload.ManagedDesktop |
 | `unity`   | Microsoft.VisualStudio.Workload.ManagedGame |
 | `native`  | Microsoft.VisualStudio.Workload.NativeDesktop |
-| `xamarin` | Microsoft.VisualStudio.Workload.NetCrossPlat |
 | `web`     | Microsoft.VisualStudio.Workload.NetWeb |
 | `node`    | Microsoft.VisualStudio.Workload.Node |
 | `office`  | Microsoft.VisualStudio.Workload.Office |
diff --git a/src/VisualStudio/Docs/run.md b/src/VisualStudio/Docs/run.md
index fa2366d..9dadab8 100644
--- a/src/VisualStudio/Docs/run.md
+++ b/src/VisualStudio/Docs/run.md
@@ -19,7 +19,7 @@ Examples:
 
 <!-- EXAMPLES_BEGIN -->
 ```
-# Runs the first VS enterprise with the Xamarin/Mobile workload
+# Runs the first VS enterprise with the Maui/Mobile workload
 > vs -sku:ent -first +mobile
 
 # Runs VS 16.8
diff --git a/src/VisualStudio/Options/WorkloadOptions.cs b/src/VisualStudio/Options/WorkloadOptions.cs
index ee0d1dc..6091fab 100644
--- a/src/VisualStudio/Options/WorkloadOptions.cs
+++ b/src/VisualStudio/Options/WorkloadOptions.cs
@@ -26,6 +26,7 @@ public WorkloadOptions() : base(ImmutableArray.Create<string>())
         {
             { "mobile", "Microsoft.VisualStudio.Workload.NetCrossPlat" },
             { "xamarin", "Microsoft.VisualStudio.Workload.NetCrossPlat" },
+            { "maui", "Microsoft.VisualStudio.Workload.NetCrossPlat" },
             { "core", "Microsoft.VisualStudio.Workload.NetCoreTools" },
             { "azure", "Microsoft.VisualStudio.Workload.Azure" },
             { "data", "Microsoft.VisualStudio.Workload.Data" },