diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2023-09-01-preview/apigateway.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2023-09-01-preview/apigateway.json
index fd8917c97f0d..15818e301be0 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2023-09-01-preview/apigateway.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2023-09-01-preview/apigateway.json
@@ -37,9 +37,9 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/gateways/{gatewayName}": {
       "put": {
         "tags": [
-          "ApiManagementGateway"
+          "ApiGateway"
         ],
-        "operationId": "ApiManagementGateway_CreateOrUpdate",
+        "operationId": "ApiGateway_CreateOrUpdate",
         "description": "Creates or updates an API Management gateway. This is long running operation and could take several minutes to complete.",
         "x-ms-examples": {
           "ApiManagementCreateStandardGateway": {
@@ -96,9 +96,9 @@
       },
       "patch": {
         "tags": [
-          "ApiManagementGateway"
+          "ApiGateway"
         ],
-        "operationId": "ApiManagementGateway_Update",
+        "operationId": "ApiGateway_Update",
         "description": "Updates an existing API Management gateway.",
         "x-ms-examples": {
           "ApiManagementUpdateStandardGateway": {
@@ -155,9 +155,9 @@
       },
       "get": {
         "tags": [
-          "ApiManagementGateway"
+          "ApiGateway"
         ],
-        "operationId": "ApiManagementGateway_Get",
+        "operationId": "ApiGateway_Get",
         "description": "Gets an API Management gateway resource description.",
         "x-ms-examples": {
           "ApiManagementGatewayGetGateway": {
@@ -195,9 +195,9 @@
       },
       "delete": {
         "tags": [
-          "ApiManagementGateway"
+          "ApiGateway"
         ],
-        "operationId": "ApiManagementGateway_Delete",
+        "operationId": "ApiGateway_Delete",
         "description": "Deletes an existing API Management gateway.",
         "x-ms-examples": {
           "ApiManagementGatewayDeleteGateway": {
@@ -247,9 +247,9 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/gateways": {
       "get": {
         "tags": [
-          "ApiManagementGateway"
+          "ApiGateway"
         ],
-        "operationId": "ApiManagementGateway_ListByResourceGroup",
+        "operationId": "ApiGateway_ListByResourceGroup",
         "description": "List all API Management gateways within a resource group.",
         "x-ms-examples": {
           "ApiManagementListGatewaysBySubscriptionAndResourceGroup": {
@@ -289,9 +289,9 @@
     "/subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/gateways": {
       "get": {
         "tags": [
-          "ApiManagementGateway"
+          "ApiGateway"
         ],
-        "operationId": "ApiManagementGateway_List",
+        "operationId": "ApiGateway_List",
         "description": "List all API Management gateways within a subscription.",
         "x-ms-examples": {
           "ApiManagementListGatewaysBySubscription": {
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2023-09-01-preview/apimgatewayConfigConnections.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2023-09-01-preview/apimgatewayConfigConnections.json
index 605aee698f8c..052e96a8d148 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2023-09-01-preview/apimgatewayConfigConnections.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2023-09-01-preview/apimgatewayConfigConnections.json
@@ -37,9 +37,9 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/gateways/{gatewayName}/configConnections": {
       "get": {
         "tags": [
-          "ApiManagementGatewayConfigConnection"
+          "ApiGatewayConfigConnection"
         ],
-        "operationId": "ApiManagementGatewayConfigConnection_ListByGateway",
+        "operationId": "ApiGatewayConfigConnection_ListByGateway",
         "description": "List all API Management gateway config connections within a gateway.",
         "x-ms-examples": {
           "ApiManagementListGatewayConfigConnection": {
@@ -82,9 +82,9 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/gateways/{gatewayName}/configConnections/{configConnectionName}": {
       "get": {
         "tags": [
-          "ApiManagementGatewayConfigConnection"
+          "ApiGatewayConfigConnection"
         ],
-        "operationId": "ApiManagementGatewayConfigConnection_Get",
+        "operationId": "ApiGatewayConfigConnection_Get",
         "description": "Gets an API Management gateway config connection resource description.",
         "x-ms-examples": {
           "ApiManagementGetGatewayConfigConnection": {
@@ -125,9 +125,9 @@
       },
       "put": {
         "tags": [
-          "ApiManagementGatewayConfigConnection"
+          "ApiGatewayConfigConnection"
         ],
-        "operationId": "ApiManagementGatewayConfigConnection_CreateOrUpdate",
+        "operationId": "ApiGatewayConfigConnection_CreateOrUpdate",
         "description": "Creates or updates an API Management gateway config connection. This is long running operation and could take several minutes to complete.",
         "x-ms-examples": {
           "ApiManagementCreateGatewayConfigConnection": {
@@ -187,9 +187,9 @@
       },
       "delete": {
         "tags": [
-          "ApiManagementGatewayConfigConnection"
+          "ApiGatewayConfigConnection"
         ],
-        "operationId": "ApiManagementGatewayConfigConnection_Delete",
+        "operationId": "ApiGatewayConfigConnection_Delete",
         "description": "Deletes an existing API Management gateway config connection.",
         "x-ms-examples": {
           "ApiManagementGatewayDeleteGateway": {