diff --git a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/DedicatedCloudNode.java b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/DedicatedCloudNode.java
index 5a87df1f9cdd..bc7c2aa1b42f 100644
--- a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/DedicatedCloudNode.java
+++ b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/DedicatedCloudNode.java
@@ -26,49 +26,49 @@
  */
 public interface DedicatedCloudNode extends HasInner<DedicatedCloudNodeInner>, Resource, GroupableResourceCore<VMwareCloudSimpleManager, DedicatedCloudNodeInner>, HasResourceGroup, Refreshable<DedicatedCloudNode>, Updatable<DedicatedCloudNode.Update>, HasManager<VMwareCloudSimpleManager> {
     /**
-     * @return the availabilityZoneId value.
+     * @return the cloudRackName value.
      */
-    String availabilityZoneId();
+    String cloudRackName();
 
     /**
-     * @return the availabilityZoneName value.
+     * @return the created value.
      */
-    String availabilityZoneName();
+    Object created();
 
     /**
-     * @return the cloudRackName value.
+     * @return the dedicatedAvailabilityZoneId value.
      */
-    String cloudRackName();
+    String dedicatedAvailabilityZoneId();
 
     /**
-     * @return the created value.
+     * @return the dedicatedAvailabilityZoneName value.
      */
-    Object created();
+    String dedicatedAvailabilityZoneName();
 
     /**
-     * @return the id1 value.
+     * @return the dedicatedPlacementGroupId value.
      */
-    String id1();
+    String dedicatedPlacementGroupId();
 
     /**
-     * @return the name1 value.
+     * @return the dedicatedPlacementGroupName value.
      */
-    String name1();
+    String dedicatedPlacementGroupName();
 
     /**
-     * @return the nodesCount value.
+     * @return the id1 value.
      */
-    int nodesCount();
+    String id1();
 
     /**
-     * @return the placementGroupId value.
+     * @return the name1 value.
      */
-    String placementGroupId();
+    String name1();
 
     /**
-     * @return the placementGroupName value.
+     * @return the nodesCount value.
      */
-    String placementGroupName();
+    int nodesCount();
 
     /**
      * @return the privateCloudId value.
@@ -108,7 +108,7 @@ public interface DedicatedCloudNode extends HasInner<DedicatedCloudNodeInner>, R
     /**
      * The entirety of the DedicatedCloudNode definition.
      */
-    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithAvailabilityZoneId, DefinitionStages.WithId1, DefinitionStages.WithName1, DefinitionStages.WithNodesCount, DefinitionStages.WithPlacementGroupId, DefinitionStages.WithPurchaseId, DefinitionStages.WithCreate {
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithDedicatedAvailabilityZoneId, DefinitionStages.WithDedicatedPlacementGroupId, DefinitionStages.WithId1, DefinitionStages.WithName1, DefinitionStages.WithNodesCount, DefinitionStages.WithPurchaseId, DefinitionStages.WithCreate {
     }
 
     /**
@@ -124,19 +124,31 @@ interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
         /**
          * The stage of the DedicatedCloudNode definition allowing to specify the resource group.
          */
-        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithAvailabilityZoneId> {
+        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithDedicatedAvailabilityZoneId> {
         }
 
         /**
-         * The stage of the dedicatedcloudnode definition allowing to specify AvailabilityZoneId.
+         * The stage of the dedicatedcloudnode definition allowing to specify DedicatedAvailabilityZoneId.
          */
-        interface WithAvailabilityZoneId {
+        interface WithDedicatedAvailabilityZoneId {
            /**
-            * Specifies availabilityZoneId.
-            * @param availabilityZoneId Availability Zone id, e.g. "az1"
+            * Specifies dedicatedAvailabilityZoneId.
+            * @param dedicatedAvailabilityZoneId CloudSimple Availability Zone id, e.g. "az1"
             * @return the next definition stage
 */
-            WithId1 withAvailabilityZoneId(String availabilityZoneId);
+            WithDedicatedPlacementGroupId withDedicatedAvailabilityZoneId(String dedicatedAvailabilityZoneId);
+        }
+
+        /**
+         * The stage of the dedicatedcloudnode definition allowing to specify DedicatedPlacementGroupId.
+         */
+        interface WithDedicatedPlacementGroupId {
+           /**
+            * Specifies dedicatedPlacementGroupId.
+            * @param dedicatedPlacementGroupId CloudSimple Placement Group id, e.g. "n1"
+            * @return the next definition stage
+*/
+            WithId1 withDedicatedPlacementGroupId(String dedicatedPlacementGroupId);
         }
 
         /**
@@ -172,19 +184,7 @@ interface WithNodesCount {
             * @param nodesCount count of nodes to create
             * @return the next definition stage
 */
-            WithPlacementGroupId withNodesCount(int nodesCount);
-        }
-
-        /**
-         * The stage of the dedicatedcloudnode definition allowing to specify PlacementGroupId.
-         */
-        interface WithPlacementGroupId {
-           /**
-            * Specifies placementGroupId.
-            * @param placementGroupId Placement Group id, e.g. "n1"
-            * @return the next definition stage
-*/
-            WithPurchaseId withPlacementGroupId(String placementGroupId);
+            WithPurchaseId withNodesCount(int nodesCount);
         }
 
         /**
diff --git a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/DedicatedCloudService.java b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/DedicatedCloudService.java
index fa455685ccac..7889ecb652d5 100644
--- a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/DedicatedCloudService.java
+++ b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/DedicatedCloudService.java
@@ -25,14 +25,14 @@
  */
 public interface DedicatedCloudService extends HasInner<DedicatedCloudServiceInner>, Resource, GroupableResourceCore<VMwareCloudSimpleManager, DedicatedCloudServiceInner>, HasResourceGroup, Refreshable<DedicatedCloudService>, Updatable<DedicatedCloudService.Update>, HasManager<VMwareCloudSimpleManager> {
     /**
-     * @return the gatewaySubnet value.
+     * @return the accountOnboardingState value.
      */
-    String gatewaySubnet();
+    OnboardingStatus accountOnboardingState();
 
     /**
-     * @return the isAccountOnboarded value.
+     * @return the gatewaySubnet value.
      */
-    OnboardingStatus isAccountOnboarded();
+    String gatewaySubnet();
 
     /**
      * @return the nodes value.
diff --git a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/PrivateCloud.java b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/PrivateCloud.java
index 5b009a4b31a3..e807d8dad02f 100644
--- a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/PrivateCloud.java
+++ b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/PrivateCloud.java
@@ -20,16 +20,6 @@
  * Type representing PrivateCloud.
  */
 public interface PrivateCloud extends HasInner<PrivateCloudInner>, HasManager<VMwareCloudSimpleManager> {
-    /**
-     * @return the availabilityZoneId value.
-     */
-    String availabilityZoneId();
-
-    /**
-     * @return the availabilityZoneName value.
-     */
-    String availabilityZoneName();
-
     /**
      * @return the clustersNumber value.
      */
@@ -45,6 +35,26 @@ public interface PrivateCloud extends HasInner<PrivateCloudInner>, HasManager<VM
      */
     DateTime createdOn();
 
+    /**
+     * @return the dedicatedAvailabilityZoneId value.
+     */
+    String dedicatedAvailabilityZoneId();
+
+    /**
+     * @return the dedicatedAvailabilityZoneName value.
+     */
+    String dedicatedAvailabilityZoneName();
+
+    /**
+     * @return the dedicatedPlacementGroupId value.
+     */
+    String dedicatedPlacementGroupId();
+
+    /**
+     * @return the dedicatedPlacementGroupName value.
+     */
+    String dedicatedPlacementGroupName();
+
     /**
      * @return the dnsServers value.
      */
@@ -75,16 +85,6 @@ public interface PrivateCloud extends HasInner<PrivateCloudInner>, HasManager<VM
      */
     String nsxType();
 
-    /**
-     * @return the placementGroupId value.
-     */
-    String placementGroupId();
-
-    /**
-     * @return the placementGroupName value.
-     */
-    String placementGroupName();
-
     /**
      * @return the privateCloudId value.
      */
diff --git a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudNodeImpl.java b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudNodeImpl.java
index 1149a0cd0293..e3539213bd7c 100644
--- a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudNodeImpl.java
+++ b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudNodeImpl.java
@@ -47,48 +47,48 @@ public boolean isInCreateMode() {
 
 
     @Override
-    public String availabilityZoneId() {
-        return this.inner().availabilityZoneId();
+    public String cloudRackName() {
+        return this.inner().cloudRackName();
     }
 
     @Override
-    public String availabilityZoneName() {
-        return this.inner().availabilityZoneName();
+    public Object created() {
+        return this.inner().created();
     }
 
     @Override
-    public String cloudRackName() {
-        return this.inner().cloudRackName();
+    public String dedicatedAvailabilityZoneId() {
+        return this.inner().dedicatedAvailabilityZoneId();
     }
 
     @Override
-    public Object created() {
-        return this.inner().created();
+    public String dedicatedAvailabilityZoneName() {
+        return this.inner().dedicatedAvailabilityZoneName();
     }
 
     @Override
-    public String id1() {
-        return this.inner().id1();
+    public String dedicatedPlacementGroupId() {
+        return this.inner().dedicatedPlacementGroupId();
     }
 
     @Override
-    public String name1() {
-        return this.inner().name1();
+    public String dedicatedPlacementGroupName() {
+        return this.inner().dedicatedPlacementGroupName();
     }
 
     @Override
-    public int nodesCount() {
-        return this.inner().nodesCount();
+    public String id1() {
+        return this.inner().id1();
     }
 
     @Override
-    public String placementGroupId() {
-        return this.inner().placementGroupId();
+    public String name1() {
+        return this.inner().name1();
     }
 
     @Override
-    public String placementGroupName() {
-        return this.inner().placementGroupName();
+    public int nodesCount() {
+        return this.inner().nodesCount();
     }
 
     @Override
@@ -127,8 +127,14 @@ public String vmwareClusterName() {
     }
 
     @Override
-    public DedicatedCloudNodeImpl withAvailabilityZoneId(String availabilityZoneId) {
-        this.inner().withAvailabilityZoneId(availabilityZoneId);
+    public DedicatedCloudNodeImpl withDedicatedAvailabilityZoneId(String dedicatedAvailabilityZoneId) {
+        this.inner().withDedicatedAvailabilityZoneId(dedicatedAvailabilityZoneId);
+        return this;
+    }
+
+    @Override
+    public DedicatedCloudNodeImpl withDedicatedPlacementGroupId(String dedicatedPlacementGroupId) {
+        this.inner().withDedicatedPlacementGroupId(dedicatedPlacementGroupId);
         return this;
     }
 
@@ -150,12 +156,6 @@ public DedicatedCloudNodeImpl withNodesCount(int nodesCount) {
         return this;
     }
 
-    @Override
-    public DedicatedCloudNodeImpl withPlacementGroupId(String placementGroupId) {
-        this.inner().withPlacementGroupId(placementGroupId);
-        return this;
-    }
-
     @Override
     public DedicatedCloudNodeImpl withPurchaseId(UUID purchaseId) {
         this.inner().withPurchaseId(purchaseId);
diff --git a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudNodeInner.java b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudNodeInner.java
index 77da6a319d67..e9a30a7e45da 100644
--- a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudNodeInner.java
+++ b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudNodeInner.java
@@ -20,18 +20,6 @@
  */
 @JsonFlatten
 public class DedicatedCloudNodeInner extends Resource {
-    /**
-     * Availability Zone id, e.g. "az1".
-     */
-    @JsonProperty(value = "properties.availabilityZoneId", required = true)
-    private String availabilityZoneId;
-
-    /**
-     * Availability Zone name, e.g. "Availability Zone 1".
-     */
-    @JsonProperty(value = "properties.availabilityZoneName", access = JsonProperty.Access.WRITE_ONLY)
-    private String availabilityZoneName;
-
     /**
      * VMWare Cloud Rack Name.
      */
@@ -45,22 +33,34 @@ public class DedicatedCloudNodeInner extends Resource {
     private Object created;
 
     /**
-     * count of nodes to create.
+     * CloudSimple Availability Zone id, e.g. "az1".
      */
-    @JsonProperty(value = "properties.nodesCount", required = true)
-    private int nodesCount;
+    @JsonProperty(value = "properties.dedicatedAvailabilityZoneId", required = true)
+    private String dedicatedAvailabilityZoneId;
+
+    /**
+     * CloudSimple Availability Zone name, e.g. "Availability Zone 1".
+     */
+    @JsonProperty(value = "properties.dedicatedAvailabilityZoneName", access = JsonProperty.Access.WRITE_ONLY)
+    private String dedicatedAvailabilityZoneName;
 
     /**
-     * Placement Group id, e.g. "n1".
+     * CloudSimple Placement Group id, e.g. "n1".
      */
-    @JsonProperty(value = "properties.placementGroupId", required = true)
-    private String placementGroupId;
+    @JsonProperty(value = "properties.dedicatedPlacementGroupId", required = true)
+    private String dedicatedPlacementGroupId;
 
     /**
-     * Placement Name, e.g. "Placement Group 1".
+     * CloudSimple Placement Name, e.g. "Placement Group 1".
      */
-    @JsonProperty(value = "properties.placementGroupName", access = JsonProperty.Access.WRITE_ONLY)
-    private String placementGroupName;
+    @JsonProperty(value = "properties.dedicatedPlacementGroupName", access = JsonProperty.Access.WRITE_ONLY)
+    private String dedicatedPlacementGroupName;
+
+    /**
+     * count of nodes to create.
+     */
+    @JsonProperty(value = "properties.nodesCount", required = true)
+    private int nodesCount;
 
     /**
      * Private Cloud Id.
@@ -118,99 +118,99 @@ public class DedicatedCloudNodeInner extends Resource {
     private Sku sku;
 
     /**
-     * Get availability Zone id, e.g. "az1".
+     * Get vMWare Cloud Rack Name.
      *
-     * @return the availabilityZoneId value
+     * @return the cloudRackName value
      */
-    public String availabilityZoneId() {
-        return this.availabilityZoneId;
+    public String cloudRackName() {
+        return this.cloudRackName;
     }
 
     /**
-     * Set availability Zone id, e.g. "az1".
+     * Get date time the resource was created.
      *
-     * @param availabilityZoneId the availabilityZoneId value to set
-     * @return the DedicatedCloudNodeInner object itself.
+     * @return the created value
      */
-    public DedicatedCloudNodeInner withAvailabilityZoneId(String availabilityZoneId) {
-        this.availabilityZoneId = availabilityZoneId;
-        return this;
+    public Object created() {
+        return this.created;
     }
 
     /**
-     * Get availability Zone name, e.g. "Availability Zone 1".
+     * Get cloudSimple Availability Zone id, e.g. "az1".
      *
-     * @return the availabilityZoneName value
+     * @return the dedicatedAvailabilityZoneId value
      */
-    public String availabilityZoneName() {
-        return this.availabilityZoneName;
+    public String dedicatedAvailabilityZoneId() {
+        return this.dedicatedAvailabilityZoneId;
     }
 
     /**
-     * Get vMWare Cloud Rack Name.
+     * Set cloudSimple Availability Zone id, e.g. "az1".
      *
-     * @return the cloudRackName value
+     * @param dedicatedAvailabilityZoneId the dedicatedAvailabilityZoneId value to set
+     * @return the DedicatedCloudNodeInner object itself.
      */
-    public String cloudRackName() {
-        return this.cloudRackName;
+    public DedicatedCloudNodeInner withDedicatedAvailabilityZoneId(String dedicatedAvailabilityZoneId) {
+        this.dedicatedAvailabilityZoneId = dedicatedAvailabilityZoneId;
+        return this;
     }
 
     /**
-     * Get date time the resource was created.
+     * Get cloudSimple Availability Zone name, e.g. "Availability Zone 1".
      *
-     * @return the created value
+     * @return the dedicatedAvailabilityZoneName value
      */
-    public Object created() {
-        return this.created;
+    public String dedicatedAvailabilityZoneName() {
+        return this.dedicatedAvailabilityZoneName;
     }
 
     /**
-     * Get count of nodes to create.
+     * Get cloudSimple Placement Group id, e.g. "n1".
      *
-     * @return the nodesCount value
+     * @return the dedicatedPlacementGroupId value
      */
-    public int nodesCount() {
-        return this.nodesCount;
+    public String dedicatedPlacementGroupId() {
+        return this.dedicatedPlacementGroupId;
     }
 
     /**
-     * Set count of nodes to create.
+     * Set cloudSimple Placement Group id, e.g. "n1".
      *
-     * @param nodesCount the nodesCount value to set
+     * @param dedicatedPlacementGroupId the dedicatedPlacementGroupId value to set
      * @return the DedicatedCloudNodeInner object itself.
      */
-    public DedicatedCloudNodeInner withNodesCount(int nodesCount) {
-        this.nodesCount = nodesCount;
+    public DedicatedCloudNodeInner withDedicatedPlacementGroupId(String dedicatedPlacementGroupId) {
+        this.dedicatedPlacementGroupId = dedicatedPlacementGroupId;
         return this;
     }
 
     /**
-     * Get placement Group id, e.g. "n1".
+     * Get cloudSimple Placement Name, e.g. "Placement Group 1".
      *
-     * @return the placementGroupId value
+     * @return the dedicatedPlacementGroupName value
      */
-    public String placementGroupId() {
-        return this.placementGroupId;
+    public String dedicatedPlacementGroupName() {
+        return this.dedicatedPlacementGroupName;
     }
 
     /**
-     * Set placement Group id, e.g. "n1".
+     * Get count of nodes to create.
      *
-     * @param placementGroupId the placementGroupId value to set
-     * @return the DedicatedCloudNodeInner object itself.
+     * @return the nodesCount value
      */
-    public DedicatedCloudNodeInner withPlacementGroupId(String placementGroupId) {
-        this.placementGroupId = placementGroupId;
-        return this;
+    public int nodesCount() {
+        return this.nodesCount;
     }
 
     /**
-     * Get placement Name, e.g. "Placement Group 1".
+     * Set count of nodes to create.
      *
-     * @return the placementGroupName value
+     * @param nodesCount the nodesCount value to set
+     * @return the DedicatedCloudNodeInner object itself.
      */
-    public String placementGroupName() {
-        return this.placementGroupName;
+    public DedicatedCloudNodeInner withNodesCount(int nodesCount) {
+        this.nodesCount = nodesCount;
+        return this;
     }
 
     /**
diff --git a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudServiceImpl.java b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudServiceImpl.java
index d270af0f89c4..073271362bb2 100644
--- a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudServiceImpl.java
+++ b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudServiceImpl.java
@@ -45,13 +45,13 @@ public boolean isInCreateMode() {
 
 
     @Override
-    public String gatewaySubnet() {
-        return this.inner().gatewaySubnet();
+    public OnboardingStatus accountOnboardingState() {
+        return this.inner().accountOnboardingState();
     }
 
     @Override
-    public OnboardingStatus isAccountOnboarded() {
-        return this.inner().isAccountOnboarded();
+    public String gatewaySubnet() {
+        return this.inner().gatewaySubnet();
     }
 
     @Override
diff --git a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudServiceInner.java b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudServiceInner.java
index 766894432884..de493d7957b8 100644
--- a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudServiceInner.java
+++ b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/DedicatedCloudServiceInner.java
@@ -18,6 +18,14 @@
  */
 @JsonFlatten
 public class DedicatedCloudServiceInner extends Resource {
+    /**
+     * indicates whether account onboarded or not in a given region. Possible
+     * values include: 'notOnBoarded', 'onBoarded', 'onBoardingFailed',
+     * 'onBoarding'.
+     */
+    @JsonProperty(value = "properties.accountOnboardingState", access = JsonProperty.Access.WRITE_ONLY)
+    private OnboardingStatus accountOnboardingState;
+
     /**
      * gateway Subnet for the account. It will collect the subnet address and
      * always treat it as /28.
@@ -25,14 +33,6 @@ public class DedicatedCloudServiceInner extends Resource {
     @JsonProperty(value = "properties.gatewaySubnet", required = true)
     private String gatewaySubnet;
 
-    /**
-     * indicates whether account onboarded or not in a given region. Possible
-     * values include: 'notOnBoarded', 'onBoarded', 'onBoardingFailed',
-     * 'onBoarding'.
-     */
-    @JsonProperty(value = "properties.isAccountOnboarded", access = JsonProperty.Access.WRITE_ONLY)
-    private OnboardingStatus isAccountOnboarded;
-
     /**
      * total nodes purchased.
      */
@@ -45,6 +45,15 @@ public class DedicatedCloudServiceInner extends Resource {
     @JsonProperty(value = "properties.serviceURL")
     private String serviceURL;
 
+    /**
+     * Get indicates whether account onboarded or not in a given region. Possible values include: 'notOnBoarded', 'onBoarded', 'onBoardingFailed', 'onBoarding'.
+     *
+     * @return the accountOnboardingState value
+     */
+    public OnboardingStatus accountOnboardingState() {
+        return this.accountOnboardingState;
+    }
+
     /**
      * Get gateway Subnet for the account. It will collect the subnet address and always treat it as /28.
      *
@@ -65,15 +74,6 @@ public DedicatedCloudServiceInner withGatewaySubnet(String gatewaySubnet) {
         return this;
     }
 
-    /**
-     * Get indicates whether account onboarded or not in a given region. Possible values include: 'notOnBoarded', 'onBoarded', 'onBoardingFailed', 'onBoarding'.
-     *
-     * @return the isAccountOnboarded value
-     */
-    public OnboardingStatus isAccountOnboarded() {
-        return this.isAccountOnboarded;
-    }
-
     /**
      * Get total nodes purchased.
      *
diff --git a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/PrivateCloudImpl.java b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/PrivateCloudImpl.java
index 16cbf85d47c8..ca006107434b 100644
--- a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/PrivateCloudImpl.java
+++ b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/PrivateCloudImpl.java
@@ -35,16 +35,6 @@ public VMwareCloudSimpleManager manager() {
 
 
 
-    @Override
-    public String availabilityZoneId() {
-        return this.inner().availabilityZoneId();
-    }
-
-    @Override
-    public String availabilityZoneName() {
-        return this.inner().availabilityZoneName();
-    }
-
     @Override
     public Integer clustersNumber() {
         return this.inner().clustersNumber();
@@ -60,6 +50,26 @@ public DateTime createdOn() {
         return this.inner().createdOn();
     }
 
+    @Override
+    public String dedicatedAvailabilityZoneId() {
+        return this.inner().dedicatedAvailabilityZoneId();
+    }
+
+    @Override
+    public String dedicatedAvailabilityZoneName() {
+        return this.inner().dedicatedAvailabilityZoneName();
+    }
+
+    @Override
+    public String dedicatedPlacementGroupId() {
+        return this.inner().dedicatedPlacementGroupId();
+    }
+
+    @Override
+    public String dedicatedPlacementGroupName() {
+        return this.inner().dedicatedPlacementGroupName();
+    }
+
     @Override
     public List<String> dnsServers() {
         return this.inner().dnsServers();
@@ -90,16 +100,6 @@ public String nsxType() {
         return this.inner().nsxType();
     }
 
-    @Override
-    public String placementGroupId() {
-        return this.inner().placementGroupId();
-    }
-
-    @Override
-    public String placementGroupName() {
-        return this.inner().placementGroupName();
-    }
-
     @Override
     public UUID privateCloudId() {
         return this.inner().privateCloudId();
diff --git a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/PrivateCloudInner.java b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/PrivateCloudInner.java
index ed574b987048..b2f85bf5e924 100644
--- a/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/PrivateCloudInner.java
+++ b/vmwarecloudsimple/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/vmwarecloudsimple/v2019_04_01/implementation/PrivateCloudInner.java
@@ -39,18 +39,6 @@ public class PrivateCloudInner {
     @JsonProperty(value = "name")
     private String name;
 
-    /**
-     * Availability Zone id, e.g. "az1".
-     */
-    @JsonProperty(value = "properties.availabilityZoneId")
-    private String availabilityZoneId;
-
-    /**
-     * Availability Zone name, e.g. "Availability Zone 1".
-     */
-    @JsonProperty(value = "properties.availabilityZoneName")
-    private String availabilityZoneName;
-
     /**
      * Number of clusters.
      */
@@ -69,6 +57,30 @@ public class PrivateCloudInner {
     @JsonProperty(value = "properties.createdOn")
     private DateTime createdOn;
 
+    /**
+     * CloudSimple Availability Zone id, e.g. "az1".
+     */
+    @JsonProperty(value = "properties.dedicatedAvailabilityZoneId")
+    private String dedicatedAvailabilityZoneId;
+
+    /**
+     * CloudSimple Availability Zone name, e.g. "Availability Zone 1".
+     */
+    @JsonProperty(value = "properties.dedicatedAvailabilityZoneName")
+    private String dedicatedAvailabilityZoneName;
+
+    /**
+     * CloudSimple Placement Group id, e.g. "n1".
+     */
+    @JsonProperty(value = "properties.dedicatedPlacementGroupId")
+    private String dedicatedPlacementGroupId;
+
+    /**
+     * CloudSimple Placement Group name.
+     */
+    @JsonProperty(value = "properties.dedicatedPlacementGroupName")
+    private String dedicatedPlacementGroupName;
+
     /**
      * Array of DNS servers.
      */
@@ -87,18 +99,6 @@ public class PrivateCloudInner {
     @JsonProperty(value = "properties.nsxType")
     private String nsxType;
 
-    /**
-     * Placement Group id, e.g. "n1".
-     */
-    @JsonProperty(value = "properties.placementGroupId")
-    private String placementGroupId;
-
-    /**
-     * Placement Group name.
-     */
-    @JsonProperty(value = "properties.placementGroupName")
-    private String placementGroupName;
-
     /**
      * Id of a private cloud.
      */
@@ -250,46 +250,6 @@ public PrivateCloudInner withName(String name) {
         return this;
     }
 
-    /**
-     * Get availability Zone id, e.g. "az1".
-     *
-     * @return the availabilityZoneId value
-     */
-    public String availabilityZoneId() {
-        return this.availabilityZoneId;
-    }
-
-    /**
-     * Set availability Zone id, e.g. "az1".
-     *
-     * @param availabilityZoneId the availabilityZoneId value to set
-     * @return the PrivateCloudInner object itself.
-     */
-    public PrivateCloudInner withAvailabilityZoneId(String availabilityZoneId) {
-        this.availabilityZoneId = availabilityZoneId;
-        return this;
-    }
-
-    /**
-     * Get availability Zone name, e.g. "Availability Zone 1".
-     *
-     * @return the availabilityZoneName value
-     */
-    public String availabilityZoneName() {
-        return this.availabilityZoneName;
-    }
-
-    /**
-     * Set availability Zone name, e.g. "Availability Zone 1".
-     *
-     * @param availabilityZoneName the availabilityZoneName value to set
-     * @return the PrivateCloudInner object itself.
-     */
-    public PrivateCloudInner withAvailabilityZoneName(String availabilityZoneName) {
-        this.availabilityZoneName = availabilityZoneName;
-        return this;
-    }
-
     /**
      * Get number of clusters.
      *
@@ -351,102 +311,142 @@ public PrivateCloudInner withCreatedOn(DateTime createdOn) {
     }
 
     /**
-     * Get array of DNS servers.
+     * Get cloudSimple Availability Zone id, e.g. "az1".
      *
-     * @return the dnsServers value
+     * @return the dedicatedAvailabilityZoneId value
      */
-    public List<String> dnsServers() {
-        return this.dnsServers;
+    public String dedicatedAvailabilityZoneId() {
+        return this.dedicatedAvailabilityZoneId;
     }
 
     /**
-     * Set array of DNS servers.
+     * Set cloudSimple Availability Zone id, e.g. "az1".
      *
-     * @param dnsServers the dnsServers value to set
+     * @param dedicatedAvailabilityZoneId the dedicatedAvailabilityZoneId value to set
      * @return the PrivateCloudInner object itself.
      */
-    public PrivateCloudInner withDnsServers(List<String> dnsServers) {
-        this.dnsServers = dnsServers;
+    public PrivateCloudInner withDedicatedAvailabilityZoneId(String dedicatedAvailabilityZoneId) {
+        this.dedicatedAvailabilityZoneId = dedicatedAvailabilityZoneId;
         return this;
     }
 
     /**
-     * Get expiration date of PC.
+     * Get cloudSimple Availability Zone name, e.g. "Availability Zone 1".
      *
-     * @return the expires value
+     * @return the dedicatedAvailabilityZoneName value
      */
-    public String expires() {
-        return this.expires;
+    public String dedicatedAvailabilityZoneName() {
+        return this.dedicatedAvailabilityZoneName;
     }
 
     /**
-     * Set expiration date of PC.
+     * Set cloudSimple Availability Zone name, e.g. "Availability Zone 1".
      *
-     * @param expires the expires value to set
+     * @param dedicatedAvailabilityZoneName the dedicatedAvailabilityZoneName value to set
      * @return the PrivateCloudInner object itself.
      */
-    public PrivateCloudInner withExpires(String expires) {
-        this.expires = expires;
+    public PrivateCloudInner withDedicatedAvailabilityZoneName(String dedicatedAvailabilityZoneName) {
+        this.dedicatedAvailabilityZoneName = dedicatedAvailabilityZoneName;
         return this;
     }
 
     /**
-     * Get nsx Type, e.g. "Advanced".
+     * Get cloudSimple Placement Group id, e.g. "n1".
      *
-     * @return the nsxType value
+     * @return the dedicatedPlacementGroupId value
      */
-    public String nsxType() {
-        return this.nsxType;
+    public String dedicatedPlacementGroupId() {
+        return this.dedicatedPlacementGroupId;
     }
 
     /**
-     * Set nsx Type, e.g. "Advanced".
+     * Set cloudSimple Placement Group id, e.g. "n1".
      *
-     * @param nsxType the nsxType value to set
+     * @param dedicatedPlacementGroupId the dedicatedPlacementGroupId value to set
      * @return the PrivateCloudInner object itself.
      */
-    public PrivateCloudInner withNsxType(String nsxType) {
-        this.nsxType = nsxType;
+    public PrivateCloudInner withDedicatedPlacementGroupId(String dedicatedPlacementGroupId) {
+        this.dedicatedPlacementGroupId = dedicatedPlacementGroupId;
+        return this;
+    }
+
+    /**
+     * Get cloudSimple Placement Group name.
+     *
+     * @return the dedicatedPlacementGroupName value
+     */
+    public String dedicatedPlacementGroupName() {
+        return this.dedicatedPlacementGroupName;
+    }
+
+    /**
+     * Set cloudSimple Placement Group name.
+     *
+     * @param dedicatedPlacementGroupName the dedicatedPlacementGroupName value to set
+     * @return the PrivateCloudInner object itself.
+     */
+    public PrivateCloudInner withDedicatedPlacementGroupName(String dedicatedPlacementGroupName) {
+        this.dedicatedPlacementGroupName = dedicatedPlacementGroupName;
+        return this;
+    }
+
+    /**
+     * Get array of DNS servers.
+     *
+     * @return the dnsServers value
+     */
+    public List<String> dnsServers() {
+        return this.dnsServers;
+    }
+
+    /**
+     * Set array of DNS servers.
+     *
+     * @param dnsServers the dnsServers value to set
+     * @return the PrivateCloudInner object itself.
+     */
+    public PrivateCloudInner withDnsServers(List<String> dnsServers) {
+        this.dnsServers = dnsServers;
         return this;
     }
 
     /**
-     * Get placement Group id, e.g. "n1".
+     * Get expiration date of PC.
      *
-     * @return the placementGroupId value
+     * @return the expires value
      */
-    public String placementGroupId() {
-        return this.placementGroupId;
+    public String expires() {
+        return this.expires;
     }
 
     /**
-     * Set placement Group id, e.g. "n1".
+     * Set expiration date of PC.
      *
-     * @param placementGroupId the placementGroupId value to set
+     * @param expires the expires value to set
      * @return the PrivateCloudInner object itself.
      */
-    public PrivateCloudInner withPlacementGroupId(String placementGroupId) {
-        this.placementGroupId = placementGroupId;
+    public PrivateCloudInner withExpires(String expires) {
+        this.expires = expires;
         return this;
     }
 
     /**
-     * Get placement Group name.
+     * Get nsx Type, e.g. "Advanced".
      *
-     * @return the placementGroupName value
+     * @return the nsxType value
      */
-    public String placementGroupName() {
-        return this.placementGroupName;
+    public String nsxType() {
+        return this.nsxType;
     }
 
     /**
-     * Set placement Group name.
+     * Set nsx Type, e.g. "Advanced".
      *
-     * @param placementGroupName the placementGroupName value to set
+     * @param nsxType the nsxType value to set
      * @return the PrivateCloudInner object itself.
      */
-    public PrivateCloudInner withPlacementGroupName(String placementGroupName) {
-        this.placementGroupName = placementGroupName;
+    public PrivateCloudInner withNsxType(String nsxType) {
+        this.nsxType = nsxType;
         return this;
     }