diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-10-01/Incidents.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-10-01/Incidents.json
index 63e83d17c53a..a51e59977a97 100644
--- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-10-01/Incidents.json
+++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-10-01/Incidents.json
@@ -242,7 +242,7 @@
           "IncidentAlerts"
         ],
         "description": "Gets all alerts for an incident.",
-        "operationId": "Incidents_ListOfAlerts",
+        "operationId": "Incidents_ListAlerts",
         "parameters": [
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
@@ -287,7 +287,7 @@
           "IncidentBookmarks"
         ],
         "description": "Gets all bookmarks for an incident.",
-        "operationId": "Incidents_ListOfBookmarks",
+        "operationId": "Incidents_ListBookmarks",
         "parameters": [
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
@@ -332,7 +332,7 @@
           "IncidentComments"
         ],
         "description": "Gets all comments for a given incident.",
-        "operationId": "IncidentComments_ListByIncident",
+        "operationId": "IncidentComments_List",
         "parameters": [
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
@@ -439,7 +439,7 @@
           "IncidentComments"
         ],
         "description": "Creates or updates a comment for a given incident.",
-        "operationId": "IncidentComments_CreateComment",
+        "operationId": "IncidentComments_CreateOrUpdate",
         "parameters": [
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
@@ -494,7 +494,7 @@
           "IncidentComments"
         ],
         "description": "Deletes a comment for a given incident.",
-        "operationId": "IncidentComments_DeleteComment",
+        "operationId": "IncidentComments_Delete",
         "parameters": [
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
@@ -542,7 +542,7 @@
           "IncidentEntities"
         ],
         "description": "Gets all entities for an incident.",
-        "operationId": "Incidents_ListOfEntities",
+        "operationId": "Incidents_ListEntities",
         "parameters": [
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
@@ -648,7 +648,7 @@
           "IncidentRelations"
         ],
         "description": "Gets a relation for a given incident.",
-        "operationId": "IncidentRelations_GetRelation",
+        "operationId": "IncidentRelations_Get",
         "parameters": [
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
@@ -694,7 +694,7 @@
           "IncidentRelations"
         ],
         "description": "Creates or updates a relation for a given incident.",
-        "operationId": "IncidentRelations_CreateOrUpdateRelation",
+        "operationId": "IncidentRelations_CreateOrUpdate",
         "parameters": [
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
@@ -749,7 +749,7 @@
           "IncidentRelations"
         ],
         "description": "Deletes a relation for a given incident.",
-        "operationId": "IncidentRelations_DeleteRelation",
+        "operationId": "IncidentRelations_Delete",
         "parameters": [
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-10-01/ThreatIntelligence.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-10-01/ThreatIntelligence.json
index 31bd5a07a025..4139ad587f73 100644
--- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-10-01/ThreatIntelligence.json
+++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-10-01/ThreatIntelligence.json
@@ -34,7 +34,7 @@
     }
   },
   "paths": {
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{operationalInsightsResourceProvider}/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/threatIntelligence/main/createIndicator": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/threatIntelligence/main/createIndicator": {
       "post": {
         "x-ms-examples": {
           "Create a new Threat Intelligence": {
@@ -56,9 +56,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -88,7 +85,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{operationalInsightsResourceProvider}/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/threatIntelligence/main/indicators": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/threatIntelligence/main/indicators": {
       "get": {
         "x-ms-examples": {
           "Get all threat intelligence indicators": {
@@ -110,9 +107,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -148,7 +142,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{operationalInsightsResourceProvider}/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/threatIntelligence/main/indicators/{name}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/threatIntelligence/main/indicators/{name}": {
       "get": {
         "x-ms-examples": {
           "View a threat intelligence indicator by name": {
@@ -170,9 +164,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -216,9 +207,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -271,9 +259,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -297,7 +282,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{operationalInsightsResourceProvider}/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/threatIntelligence/main/queryIndicators": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/threatIntelligence/main/queryIndicators": {
       "post": {
         "x-ms-examples": {
           "Query threat intelligence indicators as per filtering criteria": {
@@ -319,9 +304,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -348,7 +330,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{operationalInsightsResourceProvider}/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/threatIntelligence/main/metrics": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/threatIntelligence/main/metrics": {
       "get": {
         "x-ms-examples": {
           "Get threat intelligence indicators metrics.": {
@@ -370,9 +352,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           }
@@ -393,7 +372,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{operationalInsightsResourceProvider}/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/threatIntelligence/main/indicators/{name}/appendTags": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/threatIntelligence/main/indicators/{name}/appendTags": {
       "post": {
         "x-ms-examples": {
           "Append tags to a threat intelligence indicator": {
@@ -415,9 +394,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -441,7 +417,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{operationalInsightsResourceProvider}/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/threatIntelligence/main/indicators/{name}/replaceTags": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/threatIntelligence/main/indicators/{name}/replaceTags": {
       "post": {
         "x-ms-examples": {
           "Replace tags to a Threat Intelligence": {
@@ -463,9 +439,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -577,6 +550,7 @@
           "description": "The kind of the entity."
         }
       },
+      "discriminator": "kind",
       "required": [
         "kind"
       ],
diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-10-01/Watchlists.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-10-01/Watchlists.json
index ecf7b92d615d..82cdf266357e 100644
--- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-10-01/Watchlists.json
+++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-10-01/Watchlists.json
@@ -34,7 +34,7 @@
     }
   },
   "paths": {
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{operationalInsightsResourceProvider}/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/watchlists": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/watchlists": {
       "get": {
         "x-ms-examples": {
           "Get all watchlists.": {
@@ -56,9 +56,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -85,7 +82,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{operationalInsightsResourceProvider}/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/watchlists/{watchlistAlias}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/watchlists/{watchlistAlias}": {
       "get": {
         "x-ms-examples": {
           "Get a watchlist.": {
@@ -107,9 +104,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -153,9 +147,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -202,9 +193,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -237,7 +225,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{operationalInsightsResourceProvider}/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/watchlists/{watchlistAlias}/watchlistItems": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/watchlists/{watchlistAlias}/watchlistItems": {
       "get": {
         "x-ms-examples": {
           "Get all watchlist Items.": {
@@ -259,9 +247,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -291,7 +276,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{operationalInsightsResourceProvider}/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/watchlists/{watchlistAlias}/watchlistItems/{watchlistItemId}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/watchlists/{watchlistAlias}/watchlistItems/{watchlistItemId}": {
       "get": {
         "x-ms-examples": {
           "Get a watchlist item.": {
@@ -313,9 +298,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -362,9 +344,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },
@@ -411,9 +390,6 @@
           {
             "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
           },
-          {
-            "$ref": "../../../common/2.0/types.json#/parameters/OperationalInsightsResourceProvider"
-          },
           {
             "$ref": "../../../common/2.0/types.json#/parameters/WorkspaceName"
           },