diff --git a/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/CreateDedicatedCloudNode.json b/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/CreateDedicatedCloudNode.json
index 46f16322e94e..d9ae39c90d82 100644
--- a/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/CreateDedicatedCloudNode.json
+++ b/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/CreateDedicatedCloudNode.json
@@ -12,8 +12,8 @@
           "id": "general",
           "name": "CS28-Node"
         },
-        "placementGroupId": "n1",
-        "availabilityZoneId": "az1",
+        "dedicatedPlacementGroupId": "n1",
+        "dedicatedAvailabilityZoneId": "az1",
         "nodesCount": 1,
         "purchaseId": "56acbd46-3d36-4bbf-9b08-57c30fdf6932"
       },
@@ -28,9 +28,9 @@
       "location": "westus",
       "name": "myNode",
       "properties": {
-        "availabilityZoneId": "az1",
+        "dedicatedAvailabilityZoneId": "az1",
         "created": "2019-05-21T13:43:26.441Z",
-        "placementGroupId": "n1",
+        "dedicatedPlacementGroupId": "n1",
         "provisioningState": "Accepted",
         "purchaseId": "56acbd46-3d36-4bbf-9b08-57c30fdf6932",
         "skuDescription": {
diff --git a/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/CreateDedicatedCloudService.json b/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/CreateDedicatedCloudService.json
index ec6466d149b3..e6cd5983737c 100644
--- a/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/CreateDedicatedCloudService.json
+++ b/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/CreateDedicatedCloudService.json
@@ -19,7 +19,7 @@
       "name": "myService",
       "properties": {
         "gatewaySubnet": "10.0.10.0/28",
-        "isAccountOnboarded": "notOnBoarded"
+        "accountOnboardingState": "notOnBoarded"
       },
       "type": "Microsoft.VMwareCloudSimple/dedicatedCloudServices"
     }
diff --git a/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/GetPrivateCloud.json b/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/GetPrivateCloud.json
index 22c2f7cc19d1..dabc7bf5668e 100644
--- a/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/GetPrivateCloud.json
+++ b/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/GetPrivateCloud.json
@@ -11,8 +11,8 @@
       "location": "westus2",
       "name": "myPrivateCloud",
       "properties": {
-        "availabilityZoneId": "az1",
-        "availabilityZoneName": "Availability Zone 1",
+        "dedicatedAvailabilityZoneId": "az1",
+        "dedicatedAvailabilityZoneName": "Availability Zone 1",
         "clustersNumber": 1,
         "createdBy": "john.doe@cloudsimple.com",
         "createdOn": "2019-05-22T09:55:36.627Z",
@@ -22,8 +22,8 @@
         ],
         "expires": "n/a",
         "nsxType": "Advanced",
-        "placementGroupId": "n1",
-        "placementGroupName": "Placement Group 1",
+        "dedicatedPlacementGroupId": "n1",
+        "dedicatedPlacementGroupName": "Placement Group 1",
         "privateCloudId": "{pc-id}",
         "resourcePools": [
           {
diff --git a/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/ListPrivateCloudInLocation.json b/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/ListPrivateCloudInLocation.json
index 6aa9ed249884..45d83c3b9a63 100644
--- a/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/ListPrivateCloudInLocation.json
+++ b/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/examples/ListPrivateCloudInLocation.json
@@ -12,8 +12,8 @@
           "location": "eastus",
           "name": "myPrivateCloud",
           "properties": {
-            "availabilityZoneId": "az1",
-            "availabilityZoneName": "Availability Zone 1",
+            "dedicatedAvailabilityZoneId": "az1",
+            "dedicatedAvailabilityZoneName": "Availability Zone 1",
             "clustersNumber": 1,
             "createdBy": "john.doe@cloudsimple.com",
             "createdOn": "2019-05-21T07:32:59.491Z",
@@ -23,8 +23,8 @@
             ],
             "expires": "n/a",
             "nsxType": "Advanced",
-            "placementGroupId": "n2",
-            "placementGroupName": "Placement Group 2",
+            "dedicatedPlacementGroupId": "n2",
+            "dedicatedPlacementGroupName": "Placement Group 2",
             "privateCloudId": "private-cloud-id",
             "state": "operational",
             "totalCpuCores": 84,
diff --git a/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/vmwarecloudsimple.json b/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/vmwarecloudsimple.json
index 28b13c457e1d..ba6932d166b9 100644
--- a/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/vmwarecloudsimple.json
+++ b/specification/vmwarecloudsimple/resource-manager/Microsoft.VMwareCloudSimple/stable/2019-04-01/vmwarecloudsimple.json
@@ -2222,21 +2222,12 @@
     "DedicatedCloudNodeProperties": {
       "description": "Properties of dedicated cloud node",
       "required": [
-        "placementGroupId",
-        "availabilityZoneId",
+        "dedicatedPlacementGroupId",
+        "dedicatedAvailabilityZoneId",
         "purchaseId",
         "nodesCount"
       ],
       "properties": {
-        "availabilityZoneId": {
-          "description": "Availability Zone id, e.g. \"az1\"",
-          "type": "string"
-        },
-        "availabilityZoneName": {
-          "description": "Availability Zone name, e.g. \"Availability Zone 1\"",
-          "type": "string",
-          "readOnly": true
-        },
         "cloudRackName": {
           "description": "VMWare Cloud Rack Name",
           "type": "string",
@@ -2247,19 +2238,28 @@
           "format": "date-time",
           "readOnly": true
         },
-        "nodesCount": {
-          "description": "count of nodes to create",
-          "type": "integer"
+        "dedicatedAvailabilityZoneId": {
+          "description": "CloudSimple Availability Zone id, e.g. \"az1\"",
+          "type": "string"
         },
-        "placementGroupId": {
-          "description": "Placement Group id, e.g. \"n1\"",
+        "dedicatedAvailabilityZoneName": {
+          "description": "CloudSimple Availability Zone name, e.g. \"Availability Zone 1\"",
+          "type": "string",
+          "readOnly": true
+        },
+        "dedicatedPlacementGroupId": {
+          "description": "CloudSimple Placement Group id, e.g. \"n1\"",
           "type": "string"
         },
-        "placementGroupName": {
-          "description": "Placement Name, e.g. \"Placement Group 1\"",
+        "dedicatedPlacementGroupName": {
+          "description": "CloudSimple Placement Name, e.g. \"Placement Group 1\"",
           "type": "string",
           "readOnly": true
         },
+        "nodesCount": {
+          "description": "count of nodes to create",
+          "type": "integer"
+        },
         "privateCloudId": {
           "description": "Private Cloud Id",
           "type": "string",
@@ -2369,11 +2369,7 @@
         "gatewaySubnet"
       ],
       "properties": {
-        "gatewaySubnet": {
-          "description": "gateway Subnet for the account. It will collect the subnet address and always treat it as /28",
-          "type": "string"
-        },
-        "isAccountOnboarded": {
+        "accountOnboardingState": {
           "description": "indicates whether account onboarded or not in a given region",
           "type": "string",
           "enum": [
@@ -2388,6 +2384,10 @@
           },
           "readOnly": true
         },
+        "gatewaySubnet": {
+          "description": "gateway Subnet for the account. It will collect the subnet address and always treat it as /28",
+          "type": "string"
+        },
         "nodes": {
           "description": "total nodes purchased",
           "type": "integer"
@@ -2508,14 +2508,6 @@
     "PrivateCloudProperties": {
       "description": "Properties of private",
       "properties": {
-        "availabilityZoneId": {
-          "description": "Availability Zone id, e.g. \"az1\"",
-          "type": "string"
-        },
-        "availabilityZoneName": {
-          "description": "Availability Zone name, e.g. \"Availability Zone 1\"",
-          "type": "string"
-        },
         "clustersNumber": {
           "description": "Number of clusters",
           "type": "integer"
@@ -2529,6 +2521,22 @@
           "type": "string",
           "format": "date-time"
         },
+        "dedicatedAvailabilityZoneId": {
+          "description": "CloudSimple Availability Zone id, e.g. \"az1\"",
+          "type": "string"
+        },
+        "dedicatedAvailabilityZoneName": {
+          "description": "CloudSimple Availability Zone name, e.g. \"Availability Zone 1\"",
+          "type": "string"
+        },
+        "dedicatedPlacementGroupId": {
+          "description": "CloudSimple Placement Group id, e.g. \"n1\"",
+          "type": "string"
+        },
+        "dedicatedPlacementGroupName": {
+          "description": "CloudSimple Placement Group name",
+          "type": "string"
+        },
         "dnsServers": {
           "description": "Array of DNS servers",
           "type": "array",
@@ -2544,14 +2552,6 @@
           "description": "Nsx Type, e.g. \"Advanced\"",
           "type": "string"
         },
-        "placementGroupId": {
-          "description": "Placement Group id, e.g. \"n1\"",
-          "type": "string"
-        },
-        "placementGroupName": {
-          "description": "Placement Group name",
-          "type": "string"
-        },
         "privateCloudId": {
           "description": "Id of a private cloud",
           "type": "string",