diff --git a/docs/content/guides/author-apps/aws/howto-aws-resources/index.md b/docs/content/guides/author-apps/aws/howto-aws-resources/index.md
index 1c7c05e74..3ad94695d 100644
--- a/docs/content/guides/author-apps/aws/howto-aws-resources/index.md
+++ b/docs/content/guides/author-apps/aws/howto-aws-resources/index.md
@@ -38,7 +38,7 @@ eksctl create cluster --name <my-cluster> --region=<my-region>
 
 Create a [Radius Environment]({{< ref "/guides/deploy-apps/environments/overview" >}}) where you will deploy your application.
 
-Run [`rad init --full`]({{< ref rad_init >}}) to initialize a new environment into your current kubectl context:
+Run [`rad init --full`]({{< ref rad_initialize >}}) to initialize a new environment into your current kubectl context:
 
 ```bash
 rad init --full
@@ -105,7 +105,7 @@ This creates a container that will be deployed to your Kubernetes cluster. This
 
 ## Step 7: Cleanup
 
-1. When you're done with testing, you can use the rad CLI to [delete an environment]({{< ref rad_env_delete.md >}}) to delete all Radius resources running on the EKS Cluster.
+1. When you're done with testing, you can use the rad CLI to [delete an environment]({{< ref rad_environment_delete.md >}}) to delete all Radius resources running on the EKS Cluster.
 
 1. Cleanup AWS Resources - AWS resources are not deleted when deleting a Radius Environment, so make sure to delete all resources created in this reference app to prevent additional charges. You can delete these resources in the AWS Console or via the AWS CLI. Instructions to delete an AWS S3 Bucket are available [here](https://docs.aws.amazon.com/AmazonS3/latest/userguide/delete-bucket.html).
 
diff --git a/docs/content/guides/author-apps/azure/howto-azure-resources/index.md b/docs/content/guides/author-apps/azure/howto-azure-resources/index.md
index e610a4ed9..6b2129fe4 100644
--- a/docs/content/guides/author-apps/azure/howto-azure-resources/index.md
+++ b/docs/content/guides/author-apps/azure/howto-azure-resources/index.md
@@ -26,7 +26,7 @@ The steps below will showcase a "rad-ified" version of the existing [Azure AD wo
 
 ## Step 1: Initialize Radius
 
-Begin by running [`rad init --full`]({{< ref rad_init >}}). Make sure to configure an Azure cloud provider:
+Begin by running [`rad init --full`]({{< ref rad_initialize >}}). Make sure to configure an Azure cloud provider:
 
 ```bash
 rad init --full
diff --git a/docs/content/guides/author-apps/containers/howto-keyvault-volume/index.md b/docs/content/guides/author-apps/containers/howto-keyvault-volume/index.md
index 628b41751..ec4111c2c 100644
--- a/docs/content/guides/author-apps/containers/howto-keyvault-volume/index.md
+++ b/docs/content/guides/author-apps/containers/howto-keyvault-volume/index.md
@@ -27,7 +27,7 @@ This how-to guide will provide an overview of how to:
 
 ## Step 1: Initialize Radius
 
-Begin by running [`rad init --full`]({{< ref rad_init >}}). Make sure to configure an Azure cloud provider:
+Begin by running [`rad init --full`]({{< ref rad_initialize >}}). Make sure to configure an Azure cloud provider:
 
 ```bash
 rad init --full
diff --git a/docs/content/guides/deploy-apps/environments/howto-environment/index.md b/docs/content/guides/deploy-apps/environments/howto-environment/index.md
index 361eb92ef..f4abd50d0 100644
--- a/docs/content/guides/deploy-apps/environments/howto-environment/index.md
+++ b/docs/content/guides/deploy-apps/environments/howto-environment/index.md
@@ -20,7 +20,7 @@ Radius Environments can be setup with the rad CLI via two paths: interactive or
 
 ## Create a development environment
 
-1. Initialize a new [Radius Environment]({{< ref "/guides/deploy-apps/environments/overview">}}) with [`rad init`]({{< ref rad_init >}}):
+1. Initialize a new [Radius Environment]({{< ref "/guides/deploy-apps/environments/overview">}}) with [`rad init`]({{< ref rad_initialize >}}):
    ```bash
    rad init
    ```
@@ -55,7 +55,7 @@ Radius Environments can be setup with the rad CLI via two paths: interactive or
    contour-contour           1/1     1            1           46s
    ```
 
-   You can also use [`rad env list`]({{< ref rad_env_list.md >}}) to view your environment:
+   You can also use [`rad env list`]({{< ref rad_environment_list.md >}}) to view your environment:
 
    ```bash
    rad env list
@@ -75,7 +75,7 @@ Radius Environments can be setup with the rad CLI via two paths: interactive or
 
 ## Create an environment interactively
 
-1. Initialize a new environment with [`rad init --full`]({{< ref rad_init >}}):
+1. Initialize a new environment with [`rad init --full`]({{< ref rad_initialize >}}):
 
    ```bash
    rad init --full
@@ -120,7 +120,7 @@ Radius Environments can be setup with the rad CLI via two paths: interactive or
    contour-contour   1/1     1            1           2m33s
    ```
 
-1. Verify an environment was created with [`rad env show`]({{< ref rad_env_show.md >}}):
+1. Verify an environment was created with [`rad env show`]({{< ref rad_environment_show.md >}}):
 
    ```bash
    rad env show -o json
@@ -185,7 +185,7 @@ Radius can also be installed and an environment created with manual rad CLI comm
 
 1. Create your Radius Environment:
 
-   Run [`rad env create`]({{< ref rad_env_create >}}) to create a new environment in your resource group. Specify the `--namespace` flag to select the Kubernetes namespace to deploy resources into:
+   Run [`rad env create`]({{< ref rad_environment_create >}}) to create a new environment in your resource group. Specify the `--namespace` flag to select the Kubernetes namespace to deploy resources into:
 
    ```bash
    rad env create myEnvironment --group myGroup --namespace my-namespace
@@ -213,7 +213,7 @@ Radius can also be installed and an environment created with manual rad CLI comm
    contour-contour   1/1     1            1           2m33s
    ```
 
-   You can also use [`rad env list`]({{< ref rad_env_list.md >}}) to see if the created environment gets listed:
+   You can also use [`rad env list`]({{< ref rad_environment_list.md >}}) to see if the created environment gets listed:
 
    ```bash
    rad env list --group myGroup
diff --git a/docs/content/guides/deploy-apps/environments/overview/index.md b/docs/content/guides/deploy-apps/environments/overview/index.md
index d3f5a9ecc..29cc3db64 100644
--- a/docs/content/guides/deploy-apps/environments/overview/index.md
+++ b/docs/content/guides/deploy-apps/environments/overview/index.md
@@ -60,7 +60,7 @@ rad init
 {{% /codetab %}}
 
 {{% codetab %}}
-[rad env list]({{< ref rad_env_list >}}) lists all of the environments in your [workspace]({{< ref workspaces >}}):
+[rad env list]({{< ref rad_environment_list >}}) lists all of the environments in your [workspace]({{< ref workspaces >}}):
 
 ```bash
 rad env list
@@ -68,7 +68,7 @@ rad env list
 {{% /codetab %}}
 
 {{% codetab %}}
-[rad env show]({{< ref rad_env_show >}}) prints information on the default or specified environment:
+[rad env show]({{< ref rad_environment_show >}}) prints information on the default or specified environment:
 
 ```bash
 rad env show
@@ -76,7 +76,7 @@ rad env show
 {{% /codetab %}}
 
 {{% codetab %}}
-[rad env delete]({{< ref rad_env_delete >}}) deletes the specified environment:
+[rad env delete]({{< ref rad_environment_delete >}}) deletes the specified environment:
 
 ```bash
 rad env delete -e myenv
@@ -84,7 +84,7 @@ rad env delete -e myenv
 {{% /codetab %}}
 
 {{% codetab %}}
-[rad env switch]({{< ref rad_env_switch >}}) switches the default environment:
+[rad env switch]({{< ref rad_environment_switch >}}) switches the default environment:
 
 ```bash
 rad env switch -e myenv
diff --git a/docs/content/guides/operations/providers/aws-provider/howto-aws-provider-access-key/index.md b/docs/content/guides/operations/providers/aws-provider/howto-aws-provider-access-key/index.md
index c095b1db0..049ee14a4 100644
--- a/docs/content/guides/operations/providers/aws-provider/howto-aws-provider-access-key/index.md
+++ b/docs/content/guides/operations/providers/aws-provider/howto-aws-provider-access-key/index.md
@@ -21,7 +21,7 @@ The AWS provider allows you to deploy and connect to AWS resources from a Radius
 
 ## Interactive configuration
 
-1. Initialize a new environment with [`rad init --full`]({{< ref rad_init >}}):
+1. Initialize a new environment with [`rad init --full`]({{< ref rad_initialize >}}):
 
    ```bash
    rad init --full
@@ -62,7 +62,7 @@ The AWS provider allows you to deploy and connect to AWS resources from a Radius
     rad env update myEnvironment --aws-region myAwsRegion --aws-account-id myAwsAccountId
     ```
 
-    This command updates the configuration of an environment for properties that are able to be changed. For more information visit [`rad env update`]({{< ref rad_env_update >}})
+    This command updates the configuration of an environment for properties that are able to be changed. For more information visit [`rad env update`]({{< ref rad_environment_update >}})
 
 1. Add your AWS cloud provider credentials:
 
diff --git a/docs/content/guides/operations/providers/aws-provider/howto-aws-provider-irsa/index.md b/docs/content/guides/operations/providers/aws-provider/howto-aws-provider-irsa/index.md
index 3c7c7d4b0..8e0728616 100644
--- a/docs/content/guides/operations/providers/aws-provider/howto-aws-provider-irsa/index.md
+++ b/docs/content/guides/operations/providers/aws-provider/howto-aws-provider-irsa/index.md
@@ -76,7 +76,7 @@ Now that the setup is complete, you can install Radius with AWS IRSA enabled.
 
 ## Interactive configuration
 
-1. Initialize a new environment with [`rad init --full`]({{< ref rad_init >}}):
+1. Initialize a new environment with [`rad init --full`]({{< ref rad_initialize >}}):
 
    ```bash
    rad init --full
@@ -127,7 +127,7 @@ Now that the setup is complete, you can install Radius with AWS IRSA enabled.
     rad env create default
     ```
 
-1. Use [`rad env update`]({{< ref rad_env_update >}}) to update your Radius Environment with your your AWS region and AWS account ID:
+1. Use [`rad env update`]({{< ref rad_environment_update >}}) to update your Radius Environment with your your AWS region and AWS account ID:
 
     ```bash
     rad env update myEnvironment --aws-region myAwsRegion --aws-account-id myAwsAccountId
diff --git a/docs/content/guides/operations/providers/azure-provider/howto-azure-provider-sp/index.md b/docs/content/guides/operations/providers/azure-provider/howto-azure-provider-sp/index.md
index 40e4d275d..1b5e968c1 100644
--- a/docs/content/guides/operations/providers/azure-provider/howto-azure-provider-sp/index.md
+++ b/docs/content/guides/operations/providers/azure-provider/howto-azure-provider-sp/index.md
@@ -21,7 +21,7 @@ The Azure provider allows you to deploy and connect to Azure resources from a se
 
 ## Interactive configuration
 
-1. Initialize a new environment with [`rad init --full`]({{< ref rad_init >}}):
+1. Initialize a new environment with [`rad init --full`]({{< ref rad_initialize >}}):
 
    ```bash
    rad init --full
@@ -66,7 +66,7 @@ The Azure provider allows you to deploy and connect to Azure resources from a se
 
 ## Manual configuration
 
-1. Use [`rad env update`]({{< ref rad_env_update >}}) to update your Radius Environment with your Azure subscription ID and Azure resource group:
+1. Use [`rad env update`]({{< ref rad_environment_update >}}) to update your Radius Environment with your Azure subscription ID and Azure resource group:
 
     ```bash
     rad env update myEnvironment --azure-subscription-id myAzureSubscriptionId --azure-resource-group  myAzureResourceGroup
diff --git a/docs/content/guides/operations/providers/azure-provider/howto-azure-provider-wi/index.md b/docs/content/guides/operations/providers/azure-provider/howto-azure-provider-wi/index.md
index 71189b566..fc2bd7415 100644
--- a/docs/content/guides/operations/providers/azure-provider/howto-azure-provider-wi/index.md
+++ b/docs/content/guides/operations/providers/azure-provider/howto-azure-provider-wi/index.md
@@ -34,7 +34,7 @@ Now that the setup is complete, you can now install Radius with Azure workload i
 
 ## Interactive configuration
 
-1. Initialize a new environment with [`rad init --full`]({{< ref rad_init >}}):
+1. Initialize a new environment with [`rad init --full`]({{< ref rad_initialize >}}):
 
    ```bash
    rad init --full
@@ -82,7 +82,7 @@ Now that the setup is complete, you can now install Radius with Azure workload i
     rad env create default
     ```
 
-1. Use [`rad env update`]({{< ref rad_env_update >}}) to update your Radius Environment with your Azure subscription ID and Azure resource group:
+1. Use [`rad env update`]({{< ref rad_environment_update >}}) to update your Radius Environment with your Azure subscription ID and Azure resource group:
 
     ```bash
     rad env update myEnvironment --azure-subscription-id myAzureSubscriptionId --azure-resource-group  myAzureResourceGroup
diff --git a/docs/content/guides/operations/workspaces/howto-workspaces/index.md b/docs/content/guides/operations/workspaces/howto-workspaces/index.md
index f2f1b74a9..6640b511b 100644
--- a/docs/content/guides/operations/workspaces/howto-workspaces/index.md
+++ b/docs/content/guides/operations/workspaces/howto-workspaces/index.md
@@ -28,7 +28,7 @@ When you have multiple environments initialized for different purposes workspace
    rad group create mygroup
    ```
 
-1. Create an environment named `myenvironment` using [`rad env create`]({{< ref rad_env_create >}}):
+1. Create an environment named `myenvironment` using [`rad env create`]({{< ref rad_environment_create >}}):
 
    ```sh
    rad env create myenvironment
@@ -47,7 +47,7 @@ When you have multiple environments initialized for different purposes workspace
    rad group create yourgroup
    ```
 
-1. Create an environment named `yourenvironment` using [`rad env create`]({{< ref rad_env_create >}}):
+1. Create an environment named `yourenvironment` using [`rad env create`]({{< ref rad_environment_create >}}):
 
    ```sh
    rad env create yourenvironment
diff --git a/docs/content/guides/recipes/howto-private-bicep-registry/index.md b/docs/content/guides/recipes/howto-private-bicep-registry/index.md
index a97b0f4cd..d45492112 100644
--- a/docs/content/guides/recipes/howto-private-bicep-registry/index.md
+++ b/docs/content/guides/recipes/howto-private-bicep-registry/index.md
@@ -69,4 +69,4 @@ rad env delete my-env
 - [Recipes overview]({{< ref "/guides/recipes/overview" >}})
 - [Radius Environments]({{< ref "/guides/deploy-apps/environments/overview" >}})
 - [`rad recipe CLI reference`]({{< ref rad_recipe >}})
-- [`rad env CLI reference`]({{< ref rad_env >}})
\ No newline at end of file
+- [`rad env CLI reference`]({{< ref rad_environment >}})
\ No newline at end of file
diff --git a/docs/content/guides/recipes/overview/index.md b/docs/content/guides/recipes/overview/index.md
index 72e00ac80..d84027aa7 100644
--- a/docs/content/guides/recipes/overview/index.md
+++ b/docs/content/guides/recipes/overview/index.md
@@ -37,7 +37,7 @@ Use [**rad recipe list**]({{< ref rad_recipe_list >}}) to view the Recipes avail
 
 ### Use lightweight "local-dev" Recipes
 
-Radius Environments make it easy to get up and running with Recipes instantly. When you run [`rad init`]({{< ref rad_init >}}) you get a set of containerized local-dev Recipes pre-registered in your environment. These Recipes are designed to help you get started quickly with Recipes using lightweight containers. You can use these Recipes to test your app locally, or deploy them to a dev environment.
+Radius Environments make it easy to get up and running with Recipes instantly. When you run [`rad init`]({{< ref rad_initialize >}}) you get a set of containerized local-dev Recipes pre-registered in your environment. These Recipes are designed to help you get started quickly with Recipes using lightweight containers. You can use these Recipes to test your app locally, or deploy them to a dev environment.
 
 ### Customize with parameters
 
diff --git a/docs/content/guides/recipes/terraform/howto-custom-provider/index.md b/docs/content/guides/recipes/terraform/howto-custom-provider/index.md
index 2835a24f4..49a356218 100644
--- a/docs/content/guides/recipes/terraform/howto-custom-provider/index.md
+++ b/docs/content/guides/recipes/terraform/howto-custom-provider/index.md
@@ -84,4 +84,4 @@ rad env delete my-env
 - [Recipes overview]({{< ref "/guides/recipes/overview" >}})
 - [Radius Environments]({{< ref "/guides/deploy-apps/environments/overview" >}})
 - [`rad recipe CLI reference`]({{< ref rad_recipe >}})
-- [`rad env CLI reference`]({{< ref rad_env >}})
\ No newline at end of file
+- [`rad env CLI reference`]({{< ref rad_environment >}})
\ No newline at end of file
diff --git a/docs/content/guides/recipes/terraform/howto-private-registry/index.md b/docs/content/guides/recipes/terraform/howto-private-registry/index.md
index 3bc857c6b..6241c6728 100644
--- a/docs/content/guides/recipes/terraform/howto-private-registry/index.md
+++ b/docs/content/guides/recipes/terraform/howto-private-registry/index.md
@@ -79,4 +79,4 @@ rad env delete my-env
 - [Recipes overview]({{< ref "/guides/recipes/overview" >}})
 - [Radius Environments]({{< ref "/guides/deploy-apps/environments/overview" >}})
 - [`rad recipe CLI reference`]({{< ref rad_recipe >}})
-- [`rad env CLI reference`]({{< ref rad_env >}})
\ No newline at end of file
+- [`rad env CLI reference`]({{< ref rad_environment >}})
\ No newline at end of file
diff --git a/docs/content/tutorials/new-app/index.md b/docs/content/tutorials/new-app/index.md
index 1b16d1331..62eb0ec46 100644
--- a/docs/content/tutorials/new-app/index.md
+++ b/docs/content/tutorials/new-app/index.md
@@ -36,7 +36,7 @@ By the end of the tutorial, you will have created and deployed a new Radius Appl
    cd myapp
    ```
 
-1. Initialize a new Radius Environment with [`rad init`]({{< ref rad_init >}}):
+1. Initialize a new Radius Environment with [`rad init`]({{< ref rad_initialize >}}):
 
    ```bash
    rad init
diff --git a/docs/content/tutorials/tutorial-recipe/index.md b/docs/content/tutorials/tutorial-recipe/index.md
index 963e92eb8..62c11deee 100644
--- a/docs/content/tutorials/tutorial-recipe/index.md
+++ b/docs/content/tutorials/tutorial-recipe/index.md
@@ -287,7 +287,7 @@ This step requires an Azure subscription or an AWS account to deploy cloud resou
 
 ## Step 5: Cleanup your environment
 
-1. You can use the rad CLI to [delete your environment]({{< ref rad_env_delete.md >}}) and all the  Radius resources running on your cluster:
+1. You can use the rad CLI to [delete your environment]({{< ref rad_environment_delete.md >}}) and all the  Radius resources running on your cluster:
 
    ```bash
    rad env delete default --yes
diff --git a/docs/shared-content/installation/install-radius/initialize-radius.md b/docs/shared-content/installation/install-radius/initialize-radius.md
index ea9146d22..67231c9f1 100644
--- a/docs/shared-content/installation/install-radius/initialize-radius.md
+++ b/docs/shared-content/installation/install-radius/initialize-radius.md
@@ -11,7 +11,7 @@ Initializing Radius installs the Radius control-plane and creates a Radius Envir
    kubectl config current-context
    ```
 
-1. Initialize a new [Radius Environment]({{< ref "/guides/deploy-apps/environments/overview">}}) with [`rad init`]({{< ref rad_init >}}):
+1. Initialize a new [Radius Environment]({{< ref "/guides/deploy-apps/environments/overview">}}) with [`rad init`]({{< ref rad_initialize >}}):
 
    ```bash
    rad init
@@ -49,7 +49,7 @@ Initializing Radius installs the Radius control-plane and creates a Radius Envir
    contour-contour           1/1     1            1           46s
    ```
 
-   You can also use [`rad env list`]({{< ref rad_env_list.md >}}) to view your environment:
+   You can also use [`rad env list`]({{< ref rad_environment_list.md >}}) to view your environment:
 
    ```bash
    rad env list
diff --git a/holding-pen/reference-apps/aws-rds/index.md b/holding-pen/reference-apps/aws-rds/index.md
index d8bfaf3be..5be5d943e 100644
--- a/holding-pen/reference-apps/aws-rds/index.md
+++ b/holding-pen/reference-apps/aws-rds/index.md
@@ -50,7 +50,7 @@ The setup here ensures that the RDS instance is deployed to the set of subnets a
 ## Cleanup
 
 {{% alert title="Delete environment" color="warning" %}}
-If you're done with testing, you can use the rad CLI to [delete an environment]({{< ref rad_env_delete.md >}}) to delete all Radius resources running on the EKS Cluster.
+If you're done with testing, you can use the rad CLI to [delete an environment]({{< ref rad_environment_delete.md >}}) to delete all Radius resources running on the EKS Cluster.
 {{% /alert %}}
 
 {{% alert title="Cleanup AWS Resources" color="warning" %}}
diff --git a/holding-pen/reference-apps/aws-sqs/_index.md b/holding-pen/reference-apps/aws-sqs/_index.md
index d97aee3ec..5f6dee58c 100644
--- a/holding-pen/reference-apps/aws-sqs/_index.md
+++ b/holding-pen/reference-apps/aws-sqs/_index.md
@@ -53,7 +53,7 @@ This application models two http services: (1) `producer` and (2) `consumer` tha
 ## Cleanup
 
 {{% alert title="Delete environment" color="warning" %}}
-If you're done with testing, you can use the rad CLI to [delete an environment]({{< ref rad_env_delete.md >}}) to delete all Radius resources running on the EKS Cluster.
+If you're done with testing, you can use the rad CLI to [delete an environment]({{< ref rad_environment_delete.md >}}) to delete all Radius resources running on the EKS Cluster.
 {{% /alert %}}
 
 {{% alert title="Cleanup AWS Resources" color="warning" %}}