diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/TableOperationQuery.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/TableOperationList.json
similarity index 100%
rename from specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/TableOperationQuery.json
rename to specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/TableOperationList.json
diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/queue.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/queue.json
index b78d84f5900e..f1a166d16aa7 100644
--- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/queue.json
+++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/queue.json
@@ -21,7 +21,7 @@
         "tags": [
           "QueueServiceProperties"
         ],
-        "operationId": "ListQueueService",
+        "operationId": "QueueServices_List",
         "x-ms-examples": {
           "QueueServicesList": {
             "$ref": "./examples/QueueServicesList.json"
@@ -160,7 +160,7 @@
         "tags": [
           "QueueService"
         ],
-        "operationId": "PutQueue",
+        "operationId": "Queue_Create",
         "x-ms-examples": {
           "QueueOperationPut": {
             "$ref": "./examples/QueueOperationPut.json"
@@ -215,7 +215,7 @@
         "tags": [
           "QueueService"
         ],
-        "operationId": "PatchQueue",
+        "operationId": "Queue_Update",
         "x-ms-examples": {
           "QueueOperationPatch": {
             "$ref": "./examples/QueueOperationPatch.json"
@@ -267,7 +267,7 @@
         "tags": [
           "QueueService"
         ],
-        "operationId": "GetQueue",
+        "operationId": "Queue_Get",
         "x-ms-examples": {
           "QueueOperationGet": {
             "$ref": "./examples/QueueOperationGet.json"
@@ -310,7 +310,7 @@
         "tags": [
           "QueueService"
         ],
-        "operationId": "DeleteQueue",
+        "operationId": "Queue_Delete",
         "x-ms-examples": {
           "QueueOperationDelete": {
             "$ref": "./examples/QueueOperationDelete.json"
@@ -352,7 +352,7 @@
         "tags": [
           "QueueService"
         ],
-        "operationId": "ListQueue",
+        "operationId": "Queue_List",
         "x-ms-examples": {
           "QueueOperationList": {
             "$ref": "./examples/QueueOperationList.json"
diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/table.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/table.json
index 7834c4680226..fdec08c8d5fb 100644
--- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/table.json
+++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/table.json
@@ -21,7 +21,7 @@
         "tags": [
           "TableServiceProperties"
         ],
-        "operationId": "ListTableService",
+        "operationId": "TableServices_List",
         "x-ms-examples": {
           "TableServicesList": {
             "$ref": "./examples/TableServicesList.json"
@@ -160,7 +160,7 @@
         "tags": [
           "TableService"
         ],
-        "operationId": "PutTable",
+        "operationId": "Table_Create",
         "x-ms-examples": {
           "TableOperationPut": {
             "$ref": "./examples/TableOperationPut.json"
@@ -203,7 +203,7 @@
         "tags": [
           "TableService"
         ],
-        "operationId": "PatchTable",
+        "operationId": "Table_Update",
         "x-ms-examples": {
           "TableOperationPatch": {
             "$ref": "./examples/TableOperationPatch.json"
@@ -246,7 +246,7 @@
         "tags": [
           "TableService"
         ],
-        "operationId": "GetTable",
+        "operationId": "Table_Get",
         "x-ms-examples": {
           "TableOperationGet": {
             "$ref": "./examples/TableOperationGet.json"
@@ -289,7 +289,7 @@
         "tags": [
           "TableService"
         ],
-        "operationId": "DeleteTable",
+        "operationId": "Table_Delete",
         "x-ms-examples": {
           "TableOperationDelete": {
             "$ref": "./examples/TableOperationDelete.json"
@@ -331,10 +331,10 @@
         "tags": [
           "TableService"
         ],
-        "operationId": "QueryTable",
+        "operationId": "Table_List",
         "x-ms-examples": {
-          "TableOperationQuery": {
-            "$ref": "./examples/TableOperationQuery.json"
+          "TableOperationList": {
+            "$ref": "./examples/TableOperationList.json"
           }
         },
         "description": "Gets a list of all the tables under the specified storage account",