diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/kustoPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/kustoPool.json
index 5c9f911c6e20..4dae0732558e 100644
--- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/kustoPool.json
+++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/kustoPool.json
@@ -877,7 +877,7 @@
           "AttachedDatabaseConfigurations"
         ],
         "description": "Returns the list of attached database configurations of the given Kusto Pool.",
-        "operationId": "AttachedDatabaseConfigurations_ListByKustoPool",
+        "operationId": "KustoPoolAttachedDatabaseConfigurations_ListByKustoPool",
         "x-ms-examples": {
           "KustoPoolAttachedDatabaseConfigurationsListByKustoPool": {
             "$ref": "./examples/KustoPoolAttachedDatabaseConfigurationsListByKustoPool.json"
@@ -925,7 +925,7 @@
           "AttachedDatabaseConfigurations"
         ],
         "description": "Returns an attached database configuration.",
-        "operationId": "AttachedDatabaseConfigurations_Get",
+        "operationId": "KustoPoolAttachedDatabaseConfigurations_Get",
         "x-ms-examples": {
           "KustoPoolAttachedDatabaseConfigurationsGet": {
             "$ref": "./examples/KustoPoolAttachedDatabaseConfigurationsGet.json"
@@ -971,7 +971,7 @@
           "AttachedDatabaseConfigurations"
         ],
         "description": "Creates or updates an attached database configuration.",
-        "operationId": "AttachedDatabaseConfigurations_CreateOrUpdate",
+        "operationId": "KustoPoolAttachedDatabaseConfigurations_CreateOrUpdate",
         "x-ms-examples": {
           "KustoPoolAttachedDatabaseConfigurationsCreateOrUpdate": {
             "$ref": "./examples/KustoPoolAttachedDatabaseConfigurationsCreateOrUpdate.json"
@@ -1039,7 +1039,7 @@
           "AttachedDatabaseConfigurations"
         ],
         "description": "Deletes the attached database configuration with the given name.",
-        "operationId": "AttachedDatabaseConfigurations_Delete",
+        "operationId": "KustoPoolAttachedDatabaseConfigurations_Delete",
         "x-ms-examples": {
           "KustoPoolAttachedDatabaseConfigurationsDelete": {
             "$ref": "./examples/KustoPoolAttachedDatabaseConfigurationsDelete.json"
@@ -1091,7 +1091,7 @@
           "Databases"
         ],
         "description": "Returns the list of databases of the given Kusto pool.",
-        "operationId": "Databases_ListByKustoPool",
+        "operationId": "KustoPoolDatabases_ListByKustoPool",
         "x-ms-examples": {
           "KustoDatabasesListByKustoPool": {
             "$ref": "./examples/KustoDatabasesListByKustoPool.json"
@@ -1139,7 +1139,7 @@
           "Databases"
         ],
         "description": "Returns a database.",
-        "operationId": "Databases_Get",
+        "operationId": "KustoPoolDatabases_Get",
         "x-ms-examples": {
           "KustoPoolDatabasesGet": {
             "$ref": "./examples/KustoPoolDatabasesGet.json"
@@ -1185,7 +1185,7 @@
           "Databases"
         ],
         "description": "Creates or updates a database.",
-        "operationId": "Databases_CreateOrUpdate",
+        "operationId": "KustoPoolDatabases_CreateOrUpdate",
         "x-ms-examples": {
           "KustoPoolDatabasesCreateOrUpdate": {
             "$ref": "./examples/KustoPoolDatabasesCreateOrUpdate.json"
@@ -1247,7 +1247,7 @@
           "Databases"
         ],
         "description": "Updates a database.",
-        "operationId": "Databases_Update",
+        "operationId": "KustoPoolDatabases_Update",
         "x-ms-examples": {
           "KustoPoolDatabasesUpdate": {
             "$ref": "./examples/KustoPoolDatabasesUpdate.json"
@@ -1309,7 +1309,7 @@
           "Databases"
         ],
         "description": "Deletes the database with the given name.",
-        "operationId": "Databases_Delete",
+        "operationId": "KustoPoolDatabases_Delete",
         "x-ms-examples": {
           "KustoPoolDatabasesDelete": {
             "$ref": "./examples/KustoPoolDatabasesDelete.json"
@@ -1360,7 +1360,7 @@
         "tags": [
           "DataConnections"
         ],
-        "operationId": "DataConnections_CheckNameAvailability",
+        "operationId": "KustoPoolDataConnections_CheckNameAvailability",
         "x-ms-examples": {
           "KustoPoolDataConnectionsCheckNameAvailability": {
             "$ref": "./examples/KustoPoolDataConnectionsCheckNameAvailability.json"
@@ -1417,7 +1417,7 @@
         "tags": [
           "DataConnections"
         ],
-        "operationId": "DataConnections_dataConnectionValidation",
+        "operationId": "KustoPoolDataConnections_dataConnectionValidation",
         "x-ms-examples": {
           "KustoPoolDataConnectionValidation": {
             "$ref": "./examples/KustoPoolDataConnectionValidation.json"
@@ -1482,7 +1482,7 @@
           "DataConnections"
         ],
         "description": "Returns the list of data connections of the given Kusto pool database.",
-        "operationId": "DataConnections_ListByDatabase",
+        "operationId": "KustoPoolDataConnections_ListByDatabase",
         "x-ms-examples": {
           "KustoPoolDataConnectionsListByDatabase": {
             "$ref": "./examples/KustoPoolDataConnectionsListByDatabase.json"
@@ -1533,7 +1533,7 @@
           "DataConnections"
         ],
         "description": "Returns a data connection.",
-        "operationId": "DataConnections_Get",
+        "operationId": "KustoPoolDataConnections_Get",
         "x-ms-examples": {
           "KustoPoolDataConnectionsGet": {
             "$ref": "./examples/KustoPoolDataConnectionsGet.json"
@@ -1582,7 +1582,7 @@
           "DataConnections"
         ],
         "description": "Creates or updates a data connection.",
-        "operationId": "DataConnections_CreateOrUpdate",
+        "operationId": "KustoPoolDataConnections_CreateOrUpdate",
         "x-ms-examples": {
           "KustoPoolDataConnectionsCreateOrUpdate.json": {
             "$ref": "./examples/KustoPoolDataConnectionsCreateOrUpdate.json"
@@ -1647,7 +1647,7 @@
           "DataConnections"
         ],
         "description": "Updates a data connection.",
-        "operationId": "DataConnections_Update",
+        "operationId": "KustoPoolDataConnections_Update",
         "x-ms-examples": {
           "KustoPoolDataConnectionsUpdate": {
             "$ref": "./examples/KustoPoolDataConnectionsUpdate.json"
@@ -1712,7 +1712,7 @@
           "DataConnections"
         ],
         "description": "Deletes the data connection with the given name.",
-        "operationId": "DataConnections_Delete",
+        "operationId": "KustoPoolDataConnections_Delete",
         "x-ms-examples": {
           "KustoPoolDataConnectionsDelete": {
             "$ref": "./examples/KustoPoolDataConnectionsDelete.json"
@@ -2028,7 +2028,7 @@
         "tags": [
           "DatabasePrincipalAssignments"
         ],
-        "operationId": "DatabasePrincipalAssignments_CheckNameAvailability",
+        "operationId": "KustoPoolDatabasePrincipalAssignments_CheckNameAvailability",
         "x-ms-examples": {
           "KustoPoolDatabasePrincipalAssignmentsCheckNameAvailability": {
             "$ref": "./examples/KustoPoolDatabasePrincipalAssignmentsCheckNameAvailability.json"
@@ -2085,7 +2085,7 @@
         "tags": [
           "DatabasePrincipalAssignments"
         ],
-        "operationId": "DatabasePrincipalAssignments_List",
+        "operationId": "KustoPoolDatabasePrincipalAssignments_List",
         "x-ms-examples": {
           "KustoPoolDatabasePrincipalAssignmentsList": {
             "$ref": "./examples/KustoPoolDatabasePrincipalAssignmentsList.json"
@@ -2136,7 +2136,7 @@
         "tags": [
           "DatabasePrincipalAssignments"
         ],
-        "operationId": "DatabasePrincipalAssignments_Get",
+        "operationId": "KustoPoolDatabasePrincipalAssignments_Get",
         "x-ms-examples": {
           "KustoPoolDatabasePrincipalAssignmentsGet": {
             "$ref": "./examples/KustoPoolDatabasePrincipalAssignmentsGet.json"
@@ -2185,7 +2185,7 @@
         "tags": [
           "DatabasePrincipalAssignments"
         ],
-        "operationId": "DatabasePrincipalAssignments_CreateOrUpdate",
+        "operationId": "KustoPoolDatabasePrincipalAssignments_CreateOrUpdate",
         "x-ms-examples": {
           "KustoPoolDatabasePrincipalAssignmentsCreateOrUpdate": {
             "$ref": "./examples/KustoPoolDatabasePrincipalAssignmentsCreateOrUpdate.json"
@@ -2250,7 +2250,7 @@
         "tags": [
           "DatabasePrincipalAssignments"
         ],
-        "operationId": "DatabasePrincipalAssignments_Delete",
+        "operationId": "KustoPoolDatabasePrincipalAssignments_Delete",
         "x-ms-examples": {
           "KustoPoolDatabasePrincipalAssignmentsDelete": {
             "$ref": "./examples/KustoPoolDatabasePrincipalAssignmentsDelete.json"
@@ -2773,7 +2773,8 @@
         },
         "clusterResourceId": {
           "type": "string",
-          "description": "The resource id of the kusto pool where the databases you would like to attach reside."
+          "description": "The resource id of the kusto pool where the databases you would like to attach reside.",
+          "x-ms-client-name": "kustoPoolResourceId"
         },
         "attachedDatabaseNames": {
           "type": "array",
@@ -3353,7 +3354,8 @@
       "properties": {
         "clusterResourceId": {
           "type": "string",
-          "description": "Resource id of the cluster that follows a database owned by this cluster."
+          "description": "Resource id of the cluster that follows a database owned by this cluster.",
+          "x-ms-client-name": "kustoPoolResourceId"
         },
         "attachedDatabaseConfigurationName": {
           "type": "string",