diff --git a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/monitoringAccounts_API.json b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/monitoringAccounts_API.json
index 2b152003310e..5808526ad422 100644
--- a/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/monitoringAccounts_API.json
+++ b/specification/monitor/resource-manager/Microsoft.Monitor/preview/2021-06-03-preview/monitoringAccounts_API.json
@@ -1,8 +1,8 @@
 {
   "swagger": "2.0",
   "info": {
-    "title": "Azure Monitoring Accounts Control Plane API",
-    "description": "Provides operations for working with Azure Monitoring Accounts",
+    "title": "Azure Monitor Workspaces Control Plane API",
+    "description": "Provides operations for working with Azure Monitor Workspaces",
     "version": "2021-06-03-preview",
     "x-ms-code-generation-settings": {
       "name": "MonitorManagementClient"
@@ -41,7 +41,7 @@
   },
   "tags": [
     {
-      "name": "MonitoringAccounts",
+      "name": "AzureMonitorWorkspaces",
       "description": "A management operation for microsoft.monitor/accounts"
     }
   ],
@@ -49,10 +49,10 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Monitor/accounts": {
       "get": {
         "tags": [
-          "MonitoringAccounts"
+          "AzureMonitorWorkspaces"
         ],
-        "description": "Lists all monitoring accounts in the specified resource group",
-        "operationId": "MonitoringAccounts_ListByResourceGroup",
+        "description": "Lists all workspaces in the specified resource group",
+        "operationId": "AzureMonitorWorkspaces_ListByResourceGroup",
         "produces": [
           "application/json"
         ],
@@ -85,7 +85,7 @@
           "nextLinkName": "nextLink"
         },
         "x-ms-examples": {
-          "List monitoring accounts by resource group": {
+          "List monitor workspaces by resource group": {
             "$ref": "./examples/MonitoringAccountsListByResourceGroup.json"
           }
         }
@@ -94,10 +94,10 @@
     "/subscriptions/{subscriptionId}/providers/Microsoft.Monitor/accounts": {
       "get": {
         "tags": [
-          "MonitoringAccounts"
+          "AzureMonitorWorkspaces"
         ],
-        "description": "Lists all monitoring accounts in the specified subscription",
-        "operationId": "MonitoringAccounts_ListBySubscription",
+        "description": "Lists all workspaces in the specified subscription",
+        "operationId": "AzureMonitorWorkspaces_ListBySubscription",
         "produces": [
           "application/json"
         ],
@@ -127,7 +127,7 @@
           "nextLinkName": "nextLink"
         },
         "x-ms-examples": {
-          "List monitoring accounts by subscription": {
+          "List workspaces by subscription": {
             "$ref": "./examples/MonitoringAccountsListBySubscription.json"
           }
         }
@@ -136,10 +136,10 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Monitor/accounts/{monitoringAccountName}": {
       "get": {
         "tags": [
-          "MonitoringAccounts"
+          "AzureMonitorWorkspaces"
         ],
-        "description": "Returns the specific monitoring account",
-        "operationId": "MonitoringAccounts_Get",
+        "description": "Returns the specific Azure Monitor workspace",
+        "operationId": "AzureMonitorWorkspaces_Get",
         "produces": [
           "application/json"
         ],
@@ -172,17 +172,17 @@
           }
         },
         "x-ms-examples": {
-          "Get monitoring account": {
+          "Get workspace": {
             "$ref": "./examples/MonitoringAccountsGet.json"
           }
         }
       },
       "put": {
         "tags": [
-          "MonitoringAccounts"
+          "AzureMonitorWorkspaces"
         ],
-        "description": "Create or update a monitoring account",
-        "operationId": "MonitoringAccounts_Create",
+        "description": "Create or update a workspace",
+        "operationId": "AzureMonitorWorkspaces_Create",
         "consumes": [
           "application/json"
         ],
@@ -205,7 +205,7 @@
           {
             "in": "body",
             "name": "monitoringAccountProperties",
-            "description": "Properties that need to be specified to create a new monitoring account",
+            "description": "Properties that need to be specified to create a new workspace",
             "required": true,
             "schema": {
               "$ref": "#/definitions/MonitoringAccountResource"
@@ -214,13 +214,13 @@
         ],
         "responses": {
           "200": {
-            "description": "Monitoring account was successfully updated",
+            "description": "Azure Monitor workspace was successfully updated",
             "schema": {
               "$ref": "#/definitions/MonitoringAccountResource"
             }
           },
           "201": {
-            "description": "Monitoring account was successfully created",
+            "description": "Azure Monitor workspace was successfully created",
             "schema": {
               "$ref": "#/definitions/MonitoringAccountResource"
             }
@@ -233,17 +233,17 @@
           }
         },
         "x-ms-examples": {
-          "Create or update monitoring account": {
+          "Create or update workspace": {
             "$ref": "./examples/MonitoringAccountsCreate.json"
           }
         }
       },
       "patch": {
         "tags": [
-          "MonitoringAccounts"
+          "AzureMonitorWorkspaces"
         ],
-        "description": "Updates part of a monitoring account",
-        "operationId": "MonitoringAccounts_Update",
+        "description": "Updates part of a workspace",
+        "operationId": "AzureMonitorWorkspaces_Update",
         "consumes": [
           "application/json"
         ],
@@ -287,17 +287,17 @@
           }
         },
         "x-ms-examples": {
-          "Update monitoring account": {
+          "Update workspace": {
             "$ref": "./examples/MonitoringAccountsUpdate.json"
           }
         }
       },
       "delete": {
         "tags": [
-          "MonitoringAccounts"
+          "AzureMonitorWorkspaces"
         ],
-        "description": "Delete an monitoring account",
-        "operationId": "MonitoringAccounts_Delete",
+        "description": "Delete a workspace",
+        "operationId": "AzureMonitorWorkspaces_Delete",
         "produces": [
           "application/json"
         ],
@@ -317,10 +317,10 @@
         ],
         "responses": {
           "200": {
-            "description": "Monitoring account was successfully deleted"
+            "description": "Workspace was successfully deleted"
           },
           "204": {
-            "description": "Monitoring account did not exist"
+            "description": "Workspace did not exist"
           },
           "default": {
             "description": "Error",
@@ -330,7 +330,7 @@
           }
         },
         "x-ms-examples": {
-          "Delete monitoring account": {
+          "Delete workspace": {
             "$ref": "./examples/MonitoringAccountsDelete.json"
           }
         }
@@ -339,11 +339,11 @@
   },
   "definitions": {
     "Metrics": {
-      "description": "Information about metrics for the monitoring account",
+      "description": "Information about metrics for the workspace",
       "type": "object",
       "properties": {
         "prometheusQueryEndpoint": {
-          "description": "The Prometheus query endpoint for the monitoring account",
+          "description": "The Prometheus query endpoint for the workspace",
           "type": "string",
           "readOnly": true,
           "x-ms-mutability": [
@@ -365,7 +365,7 @@
       "type": "object",
       "properties": {
         "dataCollectionRuleResourceId": {
-          "description": "The Azure resource Id of the default data collection rule for this monitoring account.",
+          "description": "The Azure resource Id of the default data collection rule for this workspace.",
           "type": "string",
           "readOnly": true,
           "x-ms-mutability": [
@@ -373,7 +373,7 @@
           ]
         },
         "dataCollectionEndpointResourceId": {
-          "description": "The Azure resource Id of the default data collection endpoint for this monitoring account.",
+          "description": "The Azure resource Id of the default data collection endpoint for this workspace.",
           "type": "string",
           "readOnly": true,
           "x-ms-mutability": [
@@ -383,11 +383,11 @@
       }
     },
     "MonitoringAccount": {
-      "description": "Properties of a monitoring account",
+      "description": "Properties of an Azure Monitor workspace",
       "type": "object",
       "properties": {
         "accountId": {
-          "description": "The immutable ID of the monitoring account. This property is read-only.",
+          "description": "The immutable ID of the Azure Monitor workspace. This property is read-only.",
           "type": "string",
           "readOnly": true,
           "x-ms-mutability": [
@@ -395,7 +395,7 @@
           ]
         },
         "metrics": {
-          "description": "Information about metrics for the monitoring account",
+          "description": "Information about metrics for the Azure Monitor workspace",
           "allOf": [
             {
               "$ref": "#/definitions/Metrics"
@@ -407,7 +407,7 @@
           ]
         },
         "provisioningState": {
-          "description": "The provisioning state of the monitoring account. Set to Succeeded if everything is healthy.",
+          "description": "The provisioning state of the Azure Monitor workspace. Set to Succeeded if everything is healthy.",
           "enum": [
             "Creating",
             "Succeeded",
@@ -440,7 +440,7 @@
       }
     },
     "MonitoringAccountResource": {
-      "description": "A Monitoring Account definition",
+      "description": "An Azure Monitor Workspace definition",
       "required": [
         "location"
       ],
@@ -509,7 +509,7 @@
     "MonitoringAccountNameParameter": {
       "in": "path",
       "name": "monitoringAccountName",
-      "description": "The name of the monitoring account.  The name is case insensitive",
+      "description": "The name of the Azure Monitor workspace.  The name is case insensitive",
       "required": true,
       "type": "string",
       "x-ms-parameter-location": "method"