diff --git a/specification/cosmos-db/data-plane/Microsoft.Tables/preview/2019-02-02/examples/TableQueryEntitiesWithPartitionAndRowKey.json b/specification/cosmos-db/data-plane/Microsoft.Tables/preview/2019-02-02/examples/TableQueryEntitiesWithPartitionAndRowKey.json
deleted file mode 100644
index 94896182a26b..000000000000
--- a/specification/cosmos-db/data-plane/Microsoft.Tables/preview/2019-02-02/examples/TableQueryEntitiesWithPartitionAndRowKey.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "parameters": {
-    "x-ms-version": "2019-02-02",
-    "DataServiceVersion": "3.0",
-    "url": "myaccount.table.core.windows.net",
-    "table": "Customers",
-    "partitionKey": "Customer",
-    "rowKey": "Name"
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "odata.metadata": " https://myaccount.table.core.windows.net/metadata#Customers",
-        "value": [
-          {
-            "odata.type": "myaccount.Customers",
-            "odata.id": "https://myaccount.table.core.windows.net/Customers(PartitionKey=Customer',RowKey='Name')",
-            "odata.etag": "W/\"0x5B168C7B6E589D2\"",
-            "odata.editLink": "Customers(PartitionKey=Customer',RowKey='Name')",
-            "PartitionKey": "Customer",
-            "RowKey": "Name",
-            "Timestamp@odata.type": "Edm.DateTime",
-            "Timestamp": "2013-08-22T00:20:16.3134645Z",
-            "CustomerSince@odata.type": "Edm.DateTime",
-            "CustomerSince": "2008-10-01T15:25:05.2852025Z"
-          }
-        ]
-      }
-    }
-  }
-}
diff --git a/specification/cosmos-db/data-plane/Microsoft.Tables/preview/2019-02-02/examples/TableQueryEntityWithPartitionAndRowKey.json b/specification/cosmos-db/data-plane/Microsoft.Tables/preview/2019-02-02/examples/TableQueryEntityWithPartitionAndRowKey.json
new file mode 100644
index 000000000000..665f5b8328d2
--- /dev/null
+++ b/specification/cosmos-db/data-plane/Microsoft.Tables/preview/2019-02-02/examples/TableQueryEntityWithPartitionAndRowKey.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "x-ms-version": "2019-02-02",
+    "DataServiceVersion": "3.0",
+    "url": "myaccount.table.core.windows.net",
+    "table": "Customers",
+    "partitionKey": "Customer",
+    "rowKey": "Name"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "odata.metadata": " https://myaccount.table.core.windows.net/metadata#Customers",
+        "odata.type": "myaccount.Customers",
+        "odata.id": "https://myaccount.table.core.windows.net/Customers(PartitionKey=Customer',RowKey='Name')",
+        "odata.etag": "W/\"0x5B168C7B6E589D2\"",
+        "odata.editLink": "Customers(PartitionKey=Customer',RowKey='Name')",
+        "PartitionKey": "Customer",
+        "RowKey": "Name",
+        "Timestamp@odata.type": "Edm.DateTime",
+        "Timestamp": "2013-08-22T00:20:16.3134645Z",
+        "CustomerSince@odata.type": "Edm.DateTime",
+        "CustomerSince": "2008-10-01T15:25:05.2852025Z"
+      }
+    }
+  }
+}
diff --git a/specification/cosmos-db/data-plane/Microsoft.Tables/preview/2019-02-02/table.json b/specification/cosmos-db/data-plane/Microsoft.Tables/preview/2019-02-02/table.json
index abc01960c97c..cf64b5aae44f 100644
--- a/specification/cosmos-db/data-plane/Microsoft.Tables/preview/2019-02-02/table.json
+++ b/specification/cosmos-db/data-plane/Microsoft.Tables/preview/2019-02-02/table.json
@@ -402,13 +402,13 @@
         "tags": [
           "table"
         ],
-        "operationId": "Table_QueryEntitiesWithPartitionAndRowKey",
+        "operationId": "Table_QueryEntityWithPartitionAndRowKey",
         "x-ms-examples": {
           "TableQueryEntitiesWithPartitionAndRowKey": {
-            "$ref": "./examples/TableQueryEntitiesWithPartitionAndRowKey.json"
+            "$ref": "./examples/TableQueryEntityWithPartitionAndRowKey.json"
           }
         },
-        "description": "Queries entities in a table.",
+        "description": "Queries a single entity in a table.",
         "parameters": [
           {
             "$ref": "#/parameters/Timeout"
@@ -479,7 +479,7 @@
               }
             },
             "schema": {
-              "$ref": "#/definitions/TableEntityQueryResponse"
+              "$ref": "#/definitions/TableEntityProperties"
             }
           },
           "default": {