diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2024-04-01-preview/ThreatIntelligenceCount.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2024-04-01-preview/ThreatIntelligenceCount.json
index 227d838b41fe..71599e678748 100644
--- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2024-04-01-preview/ThreatIntelligenceCount.json
+++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2024-04-01-preview/ThreatIntelligenceCount.json
@@ -63,7 +63,7 @@
             "$ref": "#/parameters/TiType"
           },
           {
-            "$ref": "#/parameters/Query"
+            "$ref": "#/parameters/CountQuery"
           }
         ],
         "responses": {
@@ -99,7 +99,7 @@
         "count"
       ]
     },
-    "Query": {
+    "CountQuery": {
       "description": "Represents a query to run on the TI objects in the workspace.",
       "properties": {
         "properties": {
@@ -315,12 +315,12 @@
     }
   },
   "parameters": {
-    "Query": {
+    "CountQuery": {
       "description": "The query to run on the TI objects in the workspace.",
       "in": "body",
       "name": "query",
       "schema": {
-        "$ref": "#/definitions/Query"
+        "$ref": "#/definitions/CountQuery"
       },
       "x-ms-parameter-location": "method"
     },
diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2024-04-01-preview/ThreatIntelligenceQuery.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2024-04-01-preview/ThreatIntelligenceQuery.json
index 1fab139bf7e2..4a122dba33ef 100644
--- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2024-04-01-preview/ThreatIntelligenceQuery.json
+++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2024-04-01-preview/ThreatIntelligenceQuery.json
@@ -177,7 +177,7 @@
         },
         "createdBy": {
           "description": "The UserInfo of the user/entity which originally created this TI object.",
-          "$ref": "#/definitions/UserInfo",
+          "$ref": "../../../common/2.0/types.json#/definitions/UserInfo",
           "readOnly": true,
           "type": "object"
         },
@@ -211,7 +211,7 @@
         },
         "lastModifiedBy": {
           "description": "The UserInfo of the user/entity which last modified this TI object.",
-          "$ref": "#/definitions/UserInfo",
+          "$ref": "../../../common/2.0/types.json#/definitions/UserInfo",
           "readOnly": true,
           "type": "object"
         },
@@ -482,26 +482,6 @@
       ],
       "type": "object"
     },
-    "UserInfo": {
-      "description": "Data about a user or client application.",
-      "properties": {
-        "objectId": {
-          "description": "The user's object ID.",
-          "readOnly": true,
-          "format": "uuid",
-          "type": "string"
-        },
-        "email": {
-          "description": "The user's email address.",
-          "type": "string"
-        },
-        "name": {
-          "description": "The user's name.",
-          "type": "string"
-        }
-      },
-      "type": "object"
-    },
     "ThreatActor": {
       "allOf": [
         {