diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertResourceGroupLocation_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertResourceGroupLocation_example.json
index cfb20956e779..f7d1de97b849 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertResourceGroupLocation_example.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertResourceGroupLocation_example.json
@@ -19,7 +19,7 @@
                     "detectedTimeUtc": "2018-05-01T19:50:47.083633Z",
                     "description": "Process was detected running on the host and is considered to be suspicious, verify that the user run it",
                     "remediationSteps": "verify that the user invoked this process\r\nrun antimalware scan of the VM",
-                    "actionTaken": "Undefined",
+                    "actionTaken": "Detected",
                     "reportedSeverity": "High",
                     "compromisedEntity": "vm1",
                     "associatedResource": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg1/providers/Microsoft.Compute/virtualMachines/vm1",
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertSubscriptionLocation_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertSubscriptionLocation_example.json
index e8b0cf529f60..bcb4d7fd727d 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertSubscriptionLocation_example.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertSubscriptionLocation_example.json
@@ -18,7 +18,7 @@
                     "detectedTimeUtc": "2018-05-01T19:50:47.083633Z",
                     "description": "Process was detected running on the host and is considered to be suspicious, verify that the user run it",
                     "remediationSteps": "verify that the user invoked this process\r\nrun antimalware scan of the VM",
-                    "actionTaken": "Undefined",
+                    "actionTaken": "Detected",
                     "reportedSeverity": "High",
                     "compromisedEntity": "vm1",
                     "associatedResource": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg1/providers/Microsoft.Compute/virtualMachines/vm1",
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsResourceGroupLocation_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsResourceGroupLocation_example.json
index 0767746c55da..ddc50444a3f7 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsResourceGroupLocation_example.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsResourceGroupLocation_example.json
@@ -19,7 +19,7 @@
                         "detectedTimeUtc": "2018-05-01T19:50:47.083633Z",
                         "description": "Process was detected running on the host and is considered to be suspicious, verify that the user run it",
                         "remediationSteps": "verify that the user invoked this process\r\nrun antimalware scan of the VM",
-                        "actionTaken": "Undefined",
+                        "actionTaken": "Detected",
                         "reportedSeverity": "High",
                         "compromisedEntity": "vm1",
                         "associatedResource": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg1/providers/Microsoft.Compute/virtualMachines/vm1",
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsResourceGroup_example.json
index e795b7a2fcb5..415c4dd5a394 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsResourceGroup_example.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsResourceGroup_example.json
@@ -18,7 +18,7 @@
                         "detectedTimeUtc": "2018-05-01T19:50:47.083633Z",
                         "description": "Process was detected running on the host and is considered to be suspicious, verify that the user run it",
                         "remediationSteps": "verify that the user invoked this process\r\nrun antimalware scan of the VM",
-                        "actionTaken": "Undefined",
+                        "actionTaken": "Detected",
                         "reportedSeverity": "High",
                         "compromisedEntity": "vm1",
                         "associatedResource": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg1/providers/Microsoft.Compute/virtualMachines/vm1",
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsSubscription_example.json
index 45ea8c897f83..b1c6da1dce8a 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsSubscription_example.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsSubscription_example.json
@@ -17,7 +17,7 @@
                             "detectedTimeUtc": "2018-05-01T19:50:47.083633Z",
                             "description": "Process was detected running on the host and is considered to be suspicious, verify that the user run it",
                             "remediationSteps": "verify that the user invoked this process\r\nrun antimalware scan of the VM",
-                            "actionTaken": "Undefined",
+                            "actionTaken": "Detected",
                             "reportedSeverity": "High",
                             "compromisedEntity": "vm1",
                             "associatedResource": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg1/providers/Microsoft.Compute/virtualMachines/vm1",
@@ -77,7 +77,7 @@
                             "detectedTimeUtc": "2018-05-07T13:51:45.0045913Z",
                             "description": "The process ‘%{process name}’ was observed executing from an uncommon location.\r\n\r\nFiles with the .scr extensions are screen saver files and are normally reside and execute from the Windows system directory.",
                             "remediationSteps": "1. Run Process Explorer and try to identify unknown running processes (see https://technet.microsoft.com/en-us/sysinternals/bb896653.aspx)\r\n2. Make sure the machine is completely updated and has an updated anti-malware application installed\r\n3. Run a full anti-malware scan and verify that the threat was removed\r\n4. Install and run Microsoft’s Malicious Software Removal Tool (see https://www.microsoft.com/en-us/download/malicious-software-removal-tool-details.aspx)\r\n5. Run Microsoft’s Autoruns utility and try to identify unknown applications that are configured to run at login (see https://technet.microsoft.com/en-us/sysinternals/bb963902.aspx)\r\n6. Escalate the alert to the information security team",
-                            "actionTaken": "Undefined",
+                            "actionTaken": "Detected",
                             "reportedSeverity": "Low",
                             "compromisedEntity": "vm2",
                             "associatedResource": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourcegroups/myRg2/providers/microsoft.compute/virtualmachines/vm2",
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsSubscriptionsLocation_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsSubscriptionsLocation_example.json
index 3307bce701c5..506adecf7f6e 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsSubscriptionsLocation_example.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/Alerts/GetAlertsSubscriptionsLocation_example.json
@@ -18,7 +18,7 @@
                             "detectedTimeUtc": "2018-05-01T19:50:47.083633Z",
                             "description": "Process was detected running on the host and is considered to be suspicious, verify that the user run it",
                             "remediationSteps": "verify that the user invoked this process\r\nrun antimalware scan of the VM",
-                            "actionTaken": "Undefined",
+                            "actionTaken": "Detected",
                             "reportedSeverity": "High",
                             "compromisedEntity": "vm1",
                             "associatedResource": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg1/providers/Microsoft.Compute/virtualMachines/vm1",
@@ -78,7 +78,7 @@
                             "detectedTimeUtc": "2018-05-07T13:51:45.0045913Z",
                             "description": "The process ‘%{process name}’ was observed executing from an uncommon location.\r\n\r\nFiles with the .scr extensions are screen saver files and are normally reside and execute from the Windows system directory.",
                             "remediationSteps": "1. Run Process Explorer and try to identify unknown running processes (see https://technet.microsoft.com/en-us/sysinternals/bb896653.aspx)\r\n2. Make sure the machine is completely updated and has an updated anti-malware application installed\r\n3. Run a full anti-malware scan and verify that the threat was removed\r\n4. Install and run Microsoft’s Malicious Software Removal Tool (see https://www.microsoft.com/en-us/download/malicious-software-removal-tool-details.aspx)\r\n5. Run Microsoft’s Autoruns utility and try to identify unknown applications that are configured to run at login (see https://technet.microsoft.com/en-us/sysinternals/bb963902.aspx)\r\n6. Escalate the alert to the information security team",
-                            "actionTaken": "Undefined",
+                            "actionTaken": "Detected",
                             "reportedSeverity": "Low",
                             "compromisedEntity": "vm2",
                             "associatedResource": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourcegroups/myRg2/providers/microsoft.compute/virtualmachines/vm2",
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/JitNetworkAccessPolicies/InvokeJitNetworkAccessPolicy_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/JitNetworkAccessPolicies/InvokeJitNetworkAccessPolicy_example.json
index dffff38e1b41..95e378b7cb31 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/JitNetworkAccessPolicies/InvokeJitNetworkAccessPolicy_example.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/examples/JitNetworkAccessPolicies/InvokeJitNetworkAccessPolicy_example.json
@@ -22,7 +22,7 @@
         }        
     },
     "responses": {
-        "204": {
+        "202": {
         }
     }
 }
\ No newline at end of file
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json
index 09e0d934582e..21a02cdcb8ef 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2015-06-01-preview/security.json
@@ -47,6 +47,9 @@
                             "$ref": "#/definitions/CloudError"
                         }
                     }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
                 }
             }
         },
@@ -58,7 +61,7 @@
                     }
                 },
                 "tags": ["Locations"],
-                "description": "The location of the responsible ASC of the specific subscription. For each subscription there is only one responsible location. The location in the response should be used to read or write other resources in ASC according to their ID.",
+                "description": "The location of the responsible ASC of the specific subscription (home region). For each subscription there is only one responsible location. The location in the response should be used to read or write other resources in ASC according to their ID.",
                 "operationId": "Locations_List",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
@@ -78,6 +81,9 @@
                             "$ref": "#/definitions/CloudError"
                         }
                     }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
                 }
             }
         },
@@ -123,7 +129,7 @@
                 },
                 "tags": ["Tasks"],
                 "description": "Recommended tasks that will help improve the security of the subscription proactively",
-                "operationId": "TasksSubscription_List",
+                "operationId": "Tasks_List",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -135,7 +141,7 @@
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/TaskList"
+                            "$ref": "#/definitions/SecurityTaskList"
                         }
                     },
                     "default": {
@@ -159,7 +165,7 @@
                 },
                 "tags": ["Tasks"],
                 "description": "Recommended tasks that will help improve the security of the subscription proactively",
-                "operationId": "TasksSubscriptionLocation_List",
+                "operationId": "Tasks_ListByHomeRegion",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -173,7 +179,7 @@
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/TaskList"
+                            "$ref": "#/definitions/SecurityTaskList"
                         }
                     },
                     "default": {
@@ -197,7 +203,7 @@
                 },
                 "tags": ["Tasks"],
                 "description": "Recommended tasks that will help improve the security of the subscription proactively",
-                "operationId": "TasksSubscriptionLocation_Get",
+                "operationId": "Tasks_GetSubscriptionLevelTask",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -211,7 +217,7 @@
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/Task"
+                            "$ref": "#/definitions/SecurityTask"
                         }
                     },
                     "default": {
@@ -232,7 +238,7 @@
                 },
                 "tags": ["Tasks"],
                 "description": "Recommended tasks that will help improve the security of the subscription proactively",
-                "operationId": "TasksSubscriptionLocation_Update",
+                "operationId": "Tasks_UpdateSubscriptionLevelTaskState",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -266,7 +272,7 @@
                 },
                 "tags": ["Tasks"],
                 "description": "Recommended tasks that will help improve the security of the subscription proactively",
-                "operationId": "TasksResourceGroupLocation_List",
+                "operationId": "Tasks_ListByResourceGroup",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -282,7 +288,7 @@
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/TaskList"
+                            "$ref": "#/definitions/SecurityTaskList"
                         }
                     },
                     "default": {
@@ -306,7 +312,7 @@
                 },
                 "tags": ["Tasks"],
                 "description": "Recommended tasks that will help improve the security of the subscription proactively",
-                "operationId": "TasksResourceGroupLocation_Get",
+                "operationId": "Tasks_GetResourceGroupLevelTask",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -322,7 +328,7 @@
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/Task"
+                            "$ref": "#/definitions/SecurityTask"
                         }
                     },
                     "default": {
@@ -343,7 +349,7 @@
                 },
                 "tags": ["Tasks"],
                 "description": "Recommended tasks that will help improve the security of the subscription proactively",
-                "operationId": "TasksResourceGroupLocation_Update",
+                "operationId": "Tasks_UpdateResourceGroupLevelTaskState",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -379,7 +385,7 @@
                 },
                 "tags": ["Alerts"],
                 "description": "Alerts on security events that happened on the subscription",
-                "operationId": "AlertsSubscription_List",
+                "operationId": "Alerts_List",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -419,7 +425,7 @@
                 },
                 "tags": ["Alerts"],
                 "description": "Alerts on security events that happened on the subscription",
-                "operationId": "AlertsResourceGroup_List",
+                "operationId": "Alerts_ListByResourceGroup",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -461,7 +467,7 @@
                 },
                 "tags": ["Alerts"],
                 "description": "Alerts on security events that happened on the subscription",
-                "operationId": "AlertsSubscriptionLocation_List",
+                "operationId": "Alerts_ListSubscriptionLevelAlertsByRegion",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -503,7 +509,7 @@
                 },
                 "tags": ["Alerts"],
                 "description": "Alerts on security events that happened on the subscription",
-                "operationId": "AlertsResourceGroupLocation_List",
+                "operationId": "Alerts_ListResourceGroupLevelAlertsByRegion",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -547,7 +553,7 @@
                 },
                 "tags": ["Alerts"],
                 "description": "Alerts on security events that happened on the subscription",
-                "operationId": "AlertsSubscriptionLocation_Get",
+                "operationId": "Alerts_GetSubscriptionLevelAlert",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -582,7 +588,7 @@
                 },
                 "tags": ["Alerts"],
                 "description": "Alerts on security events that happened on the subscription",
-                "operationId": "AlertsResourceGroupLocation_Get",
+                "operationId": "Alerts_GetResourceGroupLevelAlerts",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -619,7 +625,7 @@
                 },
                 "tags": ["Alerts"],
                 "description": "Alerts on security events that happened on the subscription",
-                "operationId": "AlertsSubscriptionLocation_Update",
+                "operationId": "Alerts_UpdateSubscriptionLevelAlertState",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -653,7 +659,7 @@
                 },
                 "tags": ["Alerts"],
                 "description": "Alerts on security events that happened on the subscription",
-                "operationId": "AlertsResourceGroupLocation_Update",
+                "operationId": "Alerts_UpdateResourceGroupLevelAlertState",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -689,7 +695,7 @@
                 },
                 "tags": ["DiscoveredSecuritySolutions"],
                 "description": "Gets a list of discovered Security Solutions for the subscription.",
-                "operationId": "DiscoveredSecuritySolutionsSubscription_List",
+                "operationId": "DiscoveredSecuritySolutions_List",
                 "parameters": [{
                         "$ref": "#/parameters/SubscriptionId"
                     },
@@ -710,6 +716,9 @@
                             "$ref": "#/definitions/CloudError"
                         }
                     }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
                 }
             }
         },
@@ -722,7 +731,7 @@
                 },
                 "tags": ["DiscoveredSecuritySolutions"],
                 "description": "Gets a list of discovered Security Solutions for the subscription and location.",
-                "operationId": "DiscoveredSecuritySolutionsSubscriptionLocation_List",
+                "operationId": "DiscoveredSecuritySolutions_ListByHomeRegion",
                 "parameters": [{
                         "$ref": "#/parameters/SubscriptionId"
                     },
@@ -746,6 +755,9 @@
                             "$ref": "#/definitions/CloudError"
                         }
                     }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
                 }
             }
         },
@@ -758,7 +770,7 @@
                 },
                 "tags": ["DiscoveredSecuritySolutions"],
                 "description": "Gets a specific discovered Security Solution.",
-                "operationId": "DiscoveredSecuritySolutionsSubscriptionLocation_Get",
+                "operationId": "DiscoveredSecuritySolutions_Get",
                 "parameters": [{
                         "$ref": "#/parameters/SubscriptionId"
                     },
@@ -800,7 +812,7 @@
                 },
                 "tags": ["JitNetworkAccessPolicies"],
                 "description": "Policies for protecting resources using Just-in-Time access control.",
-                "operationId": "JitNetworkAccessPoliciesSubscription_List",
+                "operationId": "JitNetworkAccessPolicies_List",
                 "parameters": [{
                         "$ref": "#/parameters/SubscriptionId"
                     },
@@ -821,6 +833,9 @@
                             "$ref": "#/definitions/CloudError"
                         }
                     }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
                 }
             }
         },
@@ -833,7 +848,7 @@
                 },
                 "tags": ["JitNetworkAccessPolicies"],
                 "description": "Policies for protecting resources using Just-in-Time access control for the subscription, location",
-                "operationId": "JitNetworkAccessPoliciesSubscriptionLocation_List",
+                "operationId": "JitNetworkAccessPolicies_ListByHomeRegion",
                 "parameters": [{
                         "$ref": "#/parameters/SubscriptionId"
                     },
@@ -857,6 +872,9 @@
                             "$ref": "#/definitions/CloudError"
                         }
                     }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
                 }
             }
         },
@@ -869,7 +887,7 @@
                 },
                 "tags": ["JitNetworkAccessPolicies"],
                 "description": "Policies for protecting resources using Just-in-Time access control for the subscription, location",
-                "operationId": "JitNetworkAccessPoliciesResourceGroup_List",
+                "operationId": "JitNetworkAccessPolicies_ListByResourceGroup",
                 "parameters": [{
                         "$ref": "#/parameters/SubscriptionId"
                     },
@@ -893,6 +911,9 @@
                             "$ref": "#/definitions/CloudError"
                         }
                     }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
                 }
             }
         },
@@ -905,7 +926,7 @@
                 },
                 "tags": ["JitNetworkAccessPolicies"],
                 "description": "Policies for protecting resources using Just-in-Time access control for the subscription, location",
-                "operationId": "JitNetworkAccessPoliciesResourceGroupLocation_List",
+                "operationId": "JitNetworkAccessPolicies_ListByResourceGroupAndHomeRegion",
                 "produces": [
                     "application/json"
                 ],
@@ -935,6 +956,9 @@
                             "$ref": "#/definitions/CloudError"
                         }
                     }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
                 }
             }
         },
@@ -947,7 +971,7 @@
                 },
                 "tags": ["JitNetworkAccessPolicies"],
                 "description": "Policies for protecting resources using Just-in-Time access control for the subscription, location",
-                "operationId": "JitNetworkAccessPoliciesResourceGroupLocation_Get",
+                "operationId": "JitNetworkAccessPolicies_Get",
                 "parameters": [{
                         "$ref": "#/parameters/SubscriptionId"
                     },
@@ -987,7 +1011,7 @@
                 },
                 "tags": ["JitNetworkAccessPolicies"],
                 "description": "Create a policy for protecting resources using Just-in-Time access control",
-                "operationId": "JitNetworkAccessPoliciesResourceGroupLocation_Create",
+                "operationId": "JitNetworkAccessPolicies_CreateOrUpdate",
                 "parameters": [{
                         "$ref": "#/parameters/SubscriptionId"
                     },
@@ -1030,7 +1054,7 @@
                 },
                 "tags": ["JitNetworkAccessPolicies"],
                 "description": "Delete a Just-in-Time access control policy.",
-                "operationId": "JitNetworkAccessPoliciesResourceGroupLocation_Delete",
+                "operationId": "JitNetworkAccessPolicies_Delete",
                 "parameters": [{
                         "$ref": "#/parameters/SubscriptionId"
                     },
@@ -1069,7 +1093,7 @@
                 },
                 "tags": ["JitNetworkAccessPolicies"],
                 "description": "Perform an action on a specific Just-in-Time policy configuration.",
-                "operationId": "JitNetworkAccessPoliciesResourceGroupLocation_Update",
+                "operationId": "JitNetworkAccessPolicies_Invoke",
                 "parameters": [{
                         "$ref": "#/parameters/SubscriptionId"
                     },
@@ -1093,8 +1117,8 @@
                     }
                 ],
                 "responses": {
-                    "204": {
-                        "description": "No Content"
+                    "202": {
+                        "description": "Accepted"
                     },
                     "default": {
                         "description": "Error response describing why the operation failed.",
@@ -1114,7 +1138,7 @@
                 },
                 "description": "Gets a list of external security solutions for the subscription.",
                 "tags": ["ExternalSecuritySolutions"],
-                "operationId": "ExternalSecuritySolutionsSubscription_List",
+                "operationId": "ExternalSecuritySolutions_List",
                 "parameters": [{
                         "$ref": "#/parameters/ApiVersion"
                     },
@@ -1135,6 +1159,9 @@
                             "$ref": "#/definitions/CloudError"
                         }
                     }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
                 }
             }
         },
@@ -1147,7 +1174,7 @@
                 },
                 "description": "Gets a list of external Security Solutions for the subscription and location.",
                 "tags": ["ExternalSecuritySolutions"],
-                "operationId": "ExternalSecuritySolutionsSubscriptionLocation_List",
+                "operationId": "ExternalSecuritySolutions_ListByHomeRegion",
                 "parameters": [{
                         "$ref": "#/parameters/SubscriptionId"
                     },
@@ -1171,6 +1198,9 @@
                             "$ref": "#/definitions/CloudError"
                         }
                     }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
                 }
             }
         },
@@ -1183,7 +1213,7 @@
                 },
                 "description": "Gets a specific external Security Solution.",
                 "tags": ["ExternalSecuritySolutions"],
-                "operationId": "ExternalSecuritySolutionsSubscriptionLocation_Get",
+                "operationId": "ExternalSecuritySolutions_Get",
                 "parameters": [{
                         "$ref": "#/parameters/SubscriptionId"
                     },
@@ -1301,6 +1331,11 @@
                     "items": {
                         "$ref": "#/definitions/Operation"
                     }
+                },
+                "nextLink": {
+                    "readOnly": true,
+                    "type": "string",
+                    "description": "The URI to fetch the next page."
                 }
             }
         },
@@ -1349,7 +1384,7 @@
                 }
             }
         },
-        "TaskList": {
+        "SecurityTaskList": {
             "type": "object",
             "description": "List of security task recommendations",
             "properties": {
@@ -1357,7 +1392,7 @@
                     "readOnly": true,
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/Task"
+                        "$ref": "#/definitions/SecurityTask"
                     }
                 },
                 "nextLink": {
@@ -1367,20 +1402,20 @@
                 }
             }
         },
-        "Task": {
+        "SecurityTask": {
             "type": "object",
             "description": "Security task that we recommend to do in order to strengthen security",
             "properties": {
                 "properties": {
                     "x-ms-client-flatten": true,
-                    "$ref": "#/definitions/TaskProperties"
+                    "$ref": "#/definitions/SecurityTaskProperties"
                 }
             },
             "allOf": [{
                 "$ref": "#/definitions/Resource"
             }]
         },
-        "TaskProperties": {
+        "SecurityTaskProperties": {
             "type": "object",
             "description": "Describes properties of a task.",
             "properties": {
@@ -1435,6 +1470,11 @@
                     "items": {
                         "$ref": "#/definitions/AscLocation"
                     }
+                },
+                "nextLink": {
+                    "readOnly": true,
+                    "type": "string",
+                    "description": "The URI to fetch the next page."
                 }
             }
         },
@@ -1648,6 +1688,11 @@
                     "items": {
                         "$ref": "#/definitions/DiscoveredSecuritySolution"
                     }
+                },
+                "nextLink": {
+                    "readOnly": true,
+                    "type": "string",
+                    "description": "The URI to fetch the next page."
                 }
             }
         },
@@ -1728,6 +1773,11 @@
                     "items": {
                         "$ref": "#/definitions/JitNetworkAccessPolicy"
                     }
+                },
+                "nextLink": {
+                    "readOnly": true,
+                    "type": "string",
+                    "description": "The URI to fetch the next page."
                 }
             }
         },
@@ -2028,6 +2078,11 @@
                     "items": {
                         "$ref": "#/definitions/ExternalSecuritySolution"
                     }
+                },
+                "nextLink": {
+                    "readOnly": true,
+                    "type": "string",
+                    "description": "The URI to fetch the next page."
                 }
             }
         },
@@ -2036,7 +2091,7 @@
             "description": "Represents a security solution external to Azure Security Center which sends information to an OMS workspace and whos data is displayed by Azure Security Center.",
             "discriminator": "kind",
             "properties": {
-                "properties": {
+                "properties":{
                     "additionalProperties": {
                         "type": "object"
                     }
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/CreateSecurityContact_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/CreateSecurityContact_example.json
index 4040a5959788..9deda54049f1 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/CreateSecurityContact_example.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/CreateSecurityContact_example.json
@@ -2,10 +2,9 @@
     "parameters": {
         "api-version": "2017-08-01-preview",
         "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-        "resourceGroupName": "myRg",
         "securityContactName": "john",
         "securityContact": {
-            "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Security/securityContacts/john",
+            "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/john",
             "name": "john",
             "type": "Microsoft.Security/securityContacts",
             "properties": {
@@ -19,7 +18,7 @@
     "responses": {
         "200": {
             "body": {
-                "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Security/securityContacts/john",
+                "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/john",
                 "name": "john",
                 "type": "Microsoft.Security/securityContacts",
                 "properties": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/DeleteSecurityContact_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/DeleteSecurityContact_example.json
index 0dc8eb234874..ec9ec0952b10 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/DeleteSecurityContact_example.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/DeleteSecurityContact_example.json
@@ -2,7 +2,6 @@
     "parameters": {
         "api-version": "2017-08-01-preview",
         "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-        "resourceGroupName": "myRg",
         "securityContactName": "john"
     },
     "responses": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContact_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContact_example.json
index 09b5ace00d2c..fcc0762de7c6 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContact_example.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContact_example.json
@@ -2,13 +2,12 @@
     "parameters": {
         "api-version": "2017-08-01-preview",
         "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-        "resourceGroupName": "myRg",
         "securityContactName": "john"
     },
     "responses": {
         "200": {
             "body": {
-                "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Security/securityContacts/john",
+                "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/john",
                 "name": "john",
                 "type": "Microsoft.Security/securityContacts",
                 "properties": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsResourceGroup_example.json
deleted file mode 100644
index b4b08a2dbd87..000000000000
--- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsResourceGroup_example.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "parameters": {
-        "api-version": "2017-08-01-preview",
-        "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-        "resourceGroupName": "myRg"
-    },
-    "responses": {
-        "200": {
-            "body": {
-                "value": [{
-                    "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Security/securityContacts/john",
-                    "name": "john",
-                    "type": "Microsoft.Security/securityContacts",
-                    "properties": {
-                        "email": "john@contoso.com",
-                        "phone": "(214)275-4038",
-                        "alertNotifications": "On",
-                        "alertsToAdmins": "On"
-                    }
-                }]
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsSubscription_example.json
index 97098ca347dd..514a72a545d1 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsSubscription_example.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/GetSecurityContactsSubscription_example.json
@@ -7,7 +7,7 @@
         "200": {
             "body": {
                 "value": [{
-                    "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Security/securityContacts/john",
+                    "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/john",
                     "name": "john",
                     "type": "Microsoft.Security/securityContacts",
                     "properties": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/UpdateSecurityContact_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/UpdateSecurityContact_example.json
index 1fa30d30f5c2..1de75b59b395 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/UpdateSecurityContact_example.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/SecurityContacts/UpdateSecurityContact_example.json
@@ -2,10 +2,9 @@
     "parameters": {
         "api-version": "2017-08-01-preview",
         "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-        "resourceGroupName": "myRg",
         "securityContactName": "john",
         "securityContact": {
-            "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Security/securityContacts/john",
+            "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/john",
             "name": "john",
             "type": "Microsoft.Security/securityContacts",
             "properties": {
@@ -17,7 +16,7 @@
     "responses": {
         "200": {
             "body": {
-                "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Security/securityContacts/john",
+                "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securityContacts/john",
                 "name": "john",
                 "type": "Microsoft.Security/securityContacts",
                 "properties": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/CreateWorkspaceSettingResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/CreateWorkspaceSettingResourceGroup_example.json
deleted file mode 100644
index 09a354883ea1..000000000000
--- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/CreateWorkspaceSettingResourceGroup_example.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "parameters": {
-        "api-version": "2017-08-01-preview",
-        "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-        "resourceGroupName": "myRg",
-        "workspaceSettingName": "myRg",
-        "workspaceSetting": {
-            "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Security/workspaceSettings/myRg",
-            "name": "myRg",
-            "type": "Microsoft.Security/workspaceSettings",
-            "properties": {
-                "workspaceId": "/subscriptions/c4930e90-cd72-4aa5-93e9-2d081d129569/resourceGroups/myOtherRg/providers/Microsoft.OperationalInsights/workspaces/myWorkspace",
-                "scope": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg"
-            }
-        }
-    },
-    "responses": {
-        "200": {
-            "body": {
-                "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Security/workspaceSettings/myRg",
-                "name": "myRg",
-                "type": "Microsoft.Security/workspaceSettings",
-                "properties": {
-                    "workspaceId": "/subscriptions/c4930e90-cd72-4aa5-93e9-2d081d129569/resourceGroups/myOtherRg/providers/Microsoft.OperationalInsights/workspaces/myWorkspace",
-                    "scope": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/CreateWorkspaceSettingSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/CreateWorkspaceSetting_example.json
similarity index 100%
rename from specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/CreateWorkspaceSettingSubscription_example.json
rename to specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/CreateWorkspaceSetting_example.json
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/DeleteWorkspaceSettingResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/DeleteWorkspaceSetting_example.json
similarity index 68%
rename from specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/DeleteWorkspaceSettingResourceGroup_example.json
rename to specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/DeleteWorkspaceSetting_example.json
index ffd9f46483be..e1446e820d88 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/DeleteWorkspaceSettingResourceGroup_example.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/DeleteWorkspaceSetting_example.json
@@ -2,8 +2,7 @@
     "parameters": {
         "api-version": "2017-08-01-preview",
         "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-        "resourceGroupName": "myRg",
-        "workspaceSettingName": "myRg"
+        "workspaceSettingName": "default"
     },
     "responses": {
         "204": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/GetWorkspaceSettingResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/GetWorkspaceSettingResourceGroup_example.json
deleted file mode 100644
index 8f5602b67516..000000000000
--- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/GetWorkspaceSettingResourceGroup_example.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "parameters": {
-        "api-version": "2017-08-01-preview",
-        "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-        "resourceGroupName": "myRg",
-        "workspaceSettingName": "myRg"
-    },
-    "responses": {
-        "200": {
-            "body": {
-                "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Security/workspaceSettings/myRg",
-                "name": "myRg",
-                "type": "Microsoft.Security/workspaceSettings",
-                "properties": {
-                    "workspaceId": "/subscriptions/c4930e90-cd72-4aa5-93e9-2d081d129569/resourceGroups/myOtherRg/providers/Microsoft.OperationalInsights/workspaces/myWorkspace",
-                    "scope": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/GetWorkspaceSettingSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/GetWorkspaceSetting_example.json
similarity index 100%
rename from specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/GetWorkspaceSettingSubscription_example.json
rename to specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/GetWorkspaceSetting_example.json
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/GetWorkspaceSettingsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/GetWorkspaceSettingsResourceGroup_example.json
deleted file mode 100644
index ea50f40f77d9..000000000000
--- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/GetWorkspaceSettingsResourceGroup_example.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "parameters": {
-        "api-version": "2017-08-01-preview",
-        "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-        "resourceGroupName": "myRg"
-    },
-    "responses": {
-        "200": {
-            "body": {
-                "value": [{
-                    "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Security/workspaceSettings/myRg",
-                    "name": "myRg",
-                    "type": "Microsoft.Security/workspaceSettings",
-                    "properties": {
-                        "workspaceId": "/subscriptions/c4930e90-cd72-4aa5-93e9-2d081d129569/resourceGroups/myOtherRg/providers/Microsoft.OperationalInsights/workspaces/myWorkspace",
-                        "scope": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg"
-                    }
-                }]
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/GetWorkspaceSettingsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/GetWorkspaceSettings_example.json
similarity index 100%
rename from specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/GetWorkspaceSettingsSubscription_example.json
rename to specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/GetWorkspaceSettings_example.json
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/UpdateWorkspaceSettingResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/UpdateWorkspaceSettingResourceGroup_example.json
deleted file mode 100644
index cb929bdb31cb..000000000000
--- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/UpdateWorkspaceSettingResourceGroup_example.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "parameters": {
-        "api-version": "2017-08-01-preview",
-        "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-        "resourceGroupName": "myRg",
-        "workspaceSettingName": "myRg",
-        "workspaceSetting": {
-            "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Security/workspaceSettings/myRg",
-            "name": "myRg",
-            "type": "Microsoft.Security/workspaceSettings",
-            "properties": {
-                "workspaceId": "/subscriptions/c4930e90-cd72-4aa5-93e9-2d081d129569/resourceGroups/myOtherRg/providers/Microsoft.OperationalInsights/workspaces/myWorkspace"
-            }
-        }
-    },
-    "responses": {
-        "200": {
-            "body": {
-                "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.Security/workspaceSettings/myRg",
-                "name": "myRg",
-                "type": "Microsoft.Security/workspaceSettings",
-                "properties": {
-                    "workspaceId": "/subscriptions/c4930e90-cd72-4aa5-93e9-2d081d129569/resourceGroups/myOtherRg/providers/Microsoft.OperationalInsights/workspaces/myWorkspace",
-                    "scope": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/UpdateWorkspaceSettingSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/UpdateWorkspaceSetting_example.json
similarity index 100%
rename from specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/UpdateWorkspaceSettingSubscription_example.json
rename to specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/examples/WorkspaceSettings/UpdateWorkspaceSetting_example.json
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/security.json b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/security.json
index 1b60e1f12659..dcb88e95c289 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/security.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/security.json
@@ -35,7 +35,7 @@
                 },
                 "tags": ["Pricings"],
                 "description": "Security pricing configurations in the subscription",
-                "operationId": "PricingsSubscription_List",
+                "operationId": "Pricings_List",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -69,7 +69,7 @@
                 },
                 "tags": ["Pricings"],
                 "description": "Security pricing configurations in the resource group",
-                "operationId": "PricingsResourceGroup_List",
+                "operationId": "Pricings_ListByResourceGroup",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -90,6 +90,9 @@
                             "$ref": "#/definitions/CloudError"
                         }
                     }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
                 }
             }
         },
@@ -102,7 +105,7 @@
                 },
                 "tags": ["Pricings"],
                 "description": "Security pricing configuration in the subscriptionSecurity pricing configuration in the subscription",
-                "operationId": "PricingsSubscription_Get",
+                "operationId": "Pricings_GetSubscriptionPricing",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -133,7 +136,7 @@
                 },
                 "tags": ["Pricings"],
                 "description": "Security pricing configuration in the subscription",
-                "operationId": "PricingsSubscription_Create",
+                "operationId": "Pricings_UpdateSubscriptionPricing",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -168,7 +171,7 @@
                 },
                 "tags": ["Pricings"],
                 "description": "Security pricing configuration in the resource group",
-                "operationId": "PricingsResourceGroup_Get",
+                "operationId": "Pricings_GetResourceGroupPricing",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -201,7 +204,7 @@
                 },
                 "tags": ["Pricings"],
                 "description": "Security pricing configuration in the resource group",
-                "operationId": "PricingsResourceGroup_Create",
+                "operationId": "Pricings_CreateOrUpdateResourceGroupPricing",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -238,7 +241,7 @@
                 },
                 "tags": ["Security Contacts"],
                 "description": "Security contact configurations for the subscription",
-                "operationId": "SecurityContactSubscription_List",
+                "operationId": "SecurityContacts_List",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -257,43 +260,13 @@
                             "$ref": "#/definitions/CloudError"
                         }
                     }
-                }
-            }
-        },
-        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityContacts": {
-            "get": {
-                "x-ms-examples": {
-                    "Update security contact data": {
-                        "$ref": "./examples/SecurityContacts/GetSecurityContactsResourceGroup_example.json"
-                    }
                 },
-                "tags": ["Security Contacts"],
-                "description": "Security contact configurations for the subscription",
-                "operationId": "SecurityContactResourceGroup_List",
-                "parameters": [{
-                    "$ref": "#/parameters/ApiVersion"
-                }, {
-                    "$ref": "#/parameters/SubscriptionId"
-                }, {
-                    "$ref": "#/parameters/ResourceGroupName"
-                }],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/SecurityContactList"
-                        }
-                    },
-                    "default": {
-                        "description": "Error response describing why the operation failed.",
-                        "schema": {
-                            "$ref": "#/definitions/CloudError"
-                        }
-                    }
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
                 }
             }
         },
-        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityContacts/{securityContactName}": {
+        "/subscriptions/{subscriptionId}/providers/Microsoft.Security/securityContacts/{securityContactName}": {
             "get": {
                 "x-ms-examples": {
                     "Get security contact data": {
@@ -302,15 +275,13 @@
                 },
                 "tags": ["Security Contacts"],
                 "description": "Security contact configurations for the subscription",
-                "operationId": "SecurityContactResourceGroup_Get",
+                "operationId": "SecurityContacts_Get",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
                     "$ref": "#/parameters/SubscriptionId"
                 }, {
                     "$ref": "#/parameters/SecurityContactName"
-                }, {
-                    "$ref": "#/parameters/ResourceGroupName"
                 }],
                 "responses": {
                     "200": {
@@ -335,7 +306,7 @@
                 },
                 "tags": ["Security Contacts"],
                 "description": "Security contact configurations for the subscription",
-                "operationId": "SecurityContactResourceGroup_Create",
+                "operationId": "SecurityContacts_Crete",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -344,8 +315,6 @@
                     "$ref": "#/parameters/SecurityContactName"
                 }, {
                     "$ref": "#/parameters/SecurityContact"
-                }, {
-                    "$ref": "#/parameters/ResourceGroupName"
                 }],
                 "responses": {
                     "200": {
@@ -370,15 +339,13 @@
                 },
                 "tags": ["Security Contacts"],
                 "description": "Security contact configurations for the subscription",
-                "operationId": "SecurityContactResourceGroup_Delete",
+                "operationId": "SecurityContacts_Delete",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
                     "$ref": "#/parameters/SubscriptionId"
                 }, {
                     "$ref": "#/parameters/SecurityContactName"
-                }, {
-                    "$ref": "#/parameters/ResourceGroupName"
                 }],
                 "responses": {
                     "200": {
@@ -400,7 +367,7 @@
                 },
                 "tags": ["Security Contacts"],
                 "description": "Security contact configurations for the subscription",
-                "operationId": "SecurityContactResourceGroup_Update",
+                "operationId": "SecurityContacts_Update",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -409,8 +376,6 @@
                     "$ref": "#/parameters/SecurityContactName"
                 }, {
                     "$ref": "#/parameters/SecurityContact"
-                }, {
-                    "$ref": "#/parameters/ResourceGroupName"
                 }],
                 "responses": {
                     "200": {
@@ -432,12 +397,12 @@
             "get": {
                 "x-ms-examples": {
                     "Get workspace settings on subscription": {
-                        "$ref": "./examples/WorkspaceSettings/GetWorkspaceSettingsSubscription_example.json"
+                        "$ref": "./examples/WorkspaceSettings/GetWorkspaceSettings_example.json"
                     }
                 },
                 "tags": ["Workspace Settings"],
                 "description": "Settings about where we should store your security data and logs",
-                "operationId": "WorkspaceSettingsSubscription_List",
+                "operationId": "WorkspaceSettings_List",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -466,12 +431,12 @@
             "get": {
                 "x-ms-examples": {
                     "Get a workspace setting on subscription": {
-                        "$ref": "./examples/WorkspaceSettings/GetWorkspaceSettingSubscription_example.json"
+                        "$ref": "./examples/WorkspaceSettings/GetWorkspaceSetting_example.json"
                     }
                 },
                 "tags": ["Workspace Settings"],
                 "description": "Settings about where we should store your security data and logs",
-                "operationId": "WorkspaceSettingsSubscription_Get",
+                "operationId": "WorkspaceSettings_Get",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -497,12 +462,12 @@
             "put": {
                 "x-ms-examples": {
                     "Create a workspace setting data for subscription": {
-                        "$ref": "./examples/WorkspaceSettings/CreateWorkspaceSettingSubscription_example.json"
+                        "$ref": "./examples/WorkspaceSettings/CreateWorkspaceSetting_example.json"
                     }
                 },
                 "tags": ["Workspace Settings"],
-                "description": "Settings about where we should store your security data and logs",
-                "operationId": "WorkspaceSettingsSubscription_Create",
+                "description": "creating settings about where we should store your security data and logs",
+                "operationId": "WorkspaceSettings_Create",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -530,116 +495,12 @@
             "patch": {
                 "x-ms-examples": {
                     "Update a workspace setting data for subscription": {
-                        "$ref": "./examples/WorkspaceSettings/UpdateWorkspaceSettingSubscription_example.json"
-                    }
-                },
-                "tags": ["Workspace Settings"],
-                "description": "Settings about where we should store your security data and logs",
-                "operationId": "WorkspaceSettingsSubscription_Update",
-                "parameters": [{
-                    "$ref": "#/parameters/ApiVersion"
-                }, {
-                    "$ref": "#/parameters/SubscriptionId"
-                }, {
-                    "$ref": "#/parameters/WorkspaceSettingName"
-                }, {
-                    "$ref": "#/parameters/WorkspaceSetting"
-                }],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/WorkspaceSetting"
-                        }
-                    },
-                    "default": {
-                        "description": "Error response describing why the operation failed.",
-                        "schema": {
-                            "$ref": "#/definitions/CloudError"
-                        }
-                    }
-                }
-            }
-        },
-        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/workspaceSettings": {
-            "get": {
-                "x-ms-examples": {
-                    "Get workspace settings data for resource group": {
-                        "$ref": "./examples/WorkspaceSettings/GetWorkspaceSettingsResourceGroup_example.json"
-                    }
-                },
-                "tags": ["Workspace Settings"],
-                "description": "Settings about where we should store your security data and logs",
-                "operationId": "WorkspaceSettingsResourceGroups_List",
-                "parameters": [{
-                    "$ref": "#/parameters/ApiVersion"
-                }, {
-                    "$ref": "#/parameters/SubscriptionId"
-                }, {
-                    "$ref": "#/parameters/ResourceGroupName"
-                }],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/WorkspaceSettingList"
-                        }
-                    },
-                    "default": {
-                        "description": "Error response describing why the operation failed.",
-                        "schema": {
-                            "$ref": "#/definitions/CloudError"
-                        }
-                    }
-                },
-                "x-ms-pageable": {
-                    "nextLinkName": "nextLink"
-                }
-            }
-        },
-        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/workspaceSettings/{workspaceSettingName}": {
-            "get": {
-                "x-ms-examples": {
-                    "Get a workspace setting data for resource group": {
-                        "$ref": "./examples/WorkspaceSettings/GetWorkspaceSettingResourceGroup_example.json"
+                        "$ref": "./examples/WorkspaceSettings/UpdateWorkspaceSetting_example.json"
                     }
                 },
                 "tags": ["Workspace Settings"],
                 "description": "Settings about where we should store your security data and logs",
-                "operationId": "WorkspaceSettingsResourceGroups_Get",
-                "parameters": [{
-                    "$ref": "#/parameters/ApiVersion"
-                }, {
-                    "$ref": "#/parameters/SubscriptionId"
-                }, {
-                    "$ref": "#/parameters/WorkspaceSettingName"
-                }, {
-                    "$ref": "#/parameters/ResourceGroupName"
-                }],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/WorkspaceSetting"
-                        }
-                    },
-                    "default": {
-                        "description": "Error response describing why the operation failed.",
-                        "schema": {
-                            "$ref": "#/definitions/CloudError"
-                        }
-                    }
-                }
-            },
-            "put": {
-                "x-ms-examples": {
-                    "Create a workspace setting data for resource group": {
-                        "$ref": "./examples/WorkspaceSettings/CreateWorkspaceSettingResourceGroup_example.json"
-                    }
-                },
-                "tags": ["Workspace Settings"],
-                "description": "Settings about where we should store your security data and logs",
-                "operationId": "WorkspaceSettingsResourceGroups_Create",
+                "operationId": "WorkspaceSettings_Update",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
@@ -648,8 +509,6 @@
                     "$ref": "#/parameters/WorkspaceSettingName"
                 }, {
                     "$ref": "#/parameters/WorkspaceSetting"
-                }, {
-                    "$ref": "#/parameters/ResourceGroupName"
                 }],
                 "responses": {
                     "200": {
@@ -669,20 +528,18 @@
             "delete": {
                 "x-ms-examples": {
                     "Delete a workspace setting data for resource group": {
-                        "$ref": "./examples/WorkspaceSettings/DeleteWorkspaceSettingResourceGroup_example.json"
+                        "$ref": "./examples/WorkspaceSettings/DeleteWorkspaceSetting_example.json"
                     }
                 },
                 "tags": ["Workspace Settings"],
-                "description": "Settings about where we should store your security data and logs",
-                "operationId": "WorkspaceSettingsResourceGroups_Delete",
+                "description": "Deletes the custom workspace settings for this subscription. new VMs will report to the default workspace",
+                "operationId": "WorkspaceSettings_Delete",
                 "parameters": [{
                     "$ref": "#/parameters/ApiVersion"
                 }, {
                     "$ref": "#/parameters/SubscriptionId"
                 }, {
                     "$ref": "#/parameters/WorkspaceSettingName"
-                }, {
-                    "$ref": "#/parameters/ResourceGroupName"
                 }],
                 "responses": {
                     "204": {
@@ -695,41 +552,6 @@
                         }
                     }
                 }
-            },
-            "patch": {
-                "x-ms-examples": {
-                    "Update a workspace setting data for resource group": {
-                        "$ref": "./examples/WorkspaceSettings/UpdateWorkspaceSettingResourceGroup_example.json"
-                    }
-                },
-                "tags": ["Workspace Settings"],
-                "description": "Settings about where we should store your security data and logs",
-                "operationId": "WorkspaceSettingsResourceGroups_Update",
-                "parameters": [{
-                    "$ref": "#/parameters/ApiVersion"
-                }, {
-                    "$ref": "#/parameters/SubscriptionId"
-                }, {
-                    "$ref": "#/parameters/WorkspaceSettingName"
-                }, {
-                    "$ref": "#/parameters/WorkspaceSetting"
-                }, {
-                    "$ref": "#/parameters/ResourceGroupName"
-                }],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/WorkspaceSetting"
-                        }
-                    },
-                    "default": {
-                        "description": "Error response describing why the operation failed.",
-                        "schema": {
-                            "$ref": "#/definitions/CloudError"
-                        }
-                    }
-                }
             }
         },
         "/subscriptions/{subscriptionId}/providers/Microsoft.Security/autoProvisioningSettings": {
@@ -762,6 +584,9 @@
                             "$ref": "#/definitions/CloudError"
                         }
                     }
+                },
+                "x-ms-pageable": {
+                    "nextLinkName": "nextLink"
                 }
             }
         },
@@ -967,6 +792,11 @@
                     "items": {
                         "$ref": "#/definitions/SecurityContact"
                     }
+                },
+                "nextLink": {
+                    "readOnly": true,
+                    "type": "string",
+                    "description": "The URI to fetch the next page."
                 }
             }
         },
@@ -1164,6 +994,11 @@
                     "items": {
                         "$ref": "#/definitions/AutoProvisioningSetting"
                     }
+                },
+                "nextLink": {
+                    "readOnly": true,
+                    "type": "string",
+                    "description": "The URI to fetch the next page."
                 }
             }
         },