diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachine.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachine.java
index c356b5c81ee4..259954b05cfa 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachine.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachine.java
@@ -19,7 +19,7 @@
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.compute.v2017_12_01.implementation.ComputeManager;
 import com.microsoft.azure.SubResource;
-import com.microsoft.azure.management.compute.v2017_12_01.implementation.VirtualMachineScaleSetVMInstanceViewInner;
+import com.microsoft.azure.management.compute.v2017_12_01.implementation.VirtualMachineInstanceViewInner;
 import java.util.List;
 import com.microsoft.azure.management.compute.v2017_12_01.implementation.VirtualMachineInner;
 
@@ -50,7 +50,7 @@ public interface VirtualMachine extends HasInner<VirtualMachineInner>, Resource,
     /**
      * @return the instanceView value.
      */
-    VirtualMachineScaleSetVMInstanceView instanceView();
+    VirtualMachineInstanceView instanceView();
 
     /**
      * @return the licenseType value.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVM.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVM.java
index 54fae114dfa8..6782fb01d8c4 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVM.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVM.java
@@ -52,7 +52,7 @@ public interface VirtualMachineScaleSetVM extends HasInner<VirtualMachineScaleSe
     /**
      * @return the instanceView value.
      */
-    VirtualMachineInstanceView instanceView();
+    VirtualMachineScaleSetVMInstanceView instanceView();
 
     /**
      * @return the latestModelApplied value.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineUpdate.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineUpdate.java
index e34ca353e78f..23c42f82fdf9 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineUpdate.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineUpdate.java
@@ -9,7 +9,7 @@
 package com.microsoft.azure.management.compute.v2017_12_01;
 
 import com.microsoft.azure.SubResource;
-import com.microsoft.azure.management.compute.v2017_12_01.implementation.VirtualMachineScaleSetVMInstanceViewInner;
+import com.microsoft.azure.management.compute.v2017_12_01.implementation.VirtualMachineInstanceViewInner;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
@@ -89,7 +89,7 @@ public class VirtualMachineUpdate extends UpdateResource {
      * The virtual machine instance view.
      */
     @JsonProperty(value = "properties.instanceView", access = JsonProperty.Access.WRITE_ONLY)
-    private VirtualMachineScaleSetVMInstanceViewInner instanceView;
+    private VirtualMachineInstanceViewInner instanceView;
 
     /**
      * Specifies that the image or disk that is being used was licensed
@@ -280,7 +280,7 @@ public String provisioningState() {
      *
      * @return the instanceView value
      */
-    public VirtualMachineScaleSetVMInstanceViewInner instanceView() {
+    public VirtualMachineInstanceViewInner instanceView() {
         return this.instanceView;
     }
 
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImpl.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImpl.java
index 11530ec228f6..ed1c149f6270 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImpl.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImpl.java
@@ -21,7 +21,7 @@
 import com.microsoft.azure.management.compute.v2017_12_01.NetworkProfile;
 import com.microsoft.azure.management.compute.v2017_12_01.DiagnosticsProfile;
 import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineIdentity;
-import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineScaleSetVMInstanceView;
+import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineInstanceView;
 import java.util.ArrayList;
 import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineExtension;
 import rx.functions.Func1;
@@ -97,10 +97,10 @@ public VirtualMachineIdentity identity() {
     }
 
     @Override
-    public VirtualMachineScaleSetVMInstanceView instanceView() {
-        VirtualMachineScaleSetVMInstanceViewInner inner = this.inner().instanceView();
+    public VirtualMachineInstanceView instanceView() {
+        VirtualMachineInstanceViewInner inner = this.inner().instanceView();
         if (inner != null) {
-            return  new VirtualMachineScaleSetVMInstanceViewImpl(inner, manager());
+            return  new VirtualMachineInstanceViewImpl(inner, manager());
         } else {
             return null;
         }
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineInner.java
index a96ffa47dcf3..a6f556a714e1 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineInner.java
@@ -96,7 +96,7 @@ public class VirtualMachineInner extends Resource {
      * The virtual machine instance view.
      */
     @JsonProperty(value = "properties.instanceView", access = JsonProperty.Access.WRITE_ONLY)
-    private VirtualMachineScaleSetVMInstanceViewInner instanceView;
+    private VirtualMachineInstanceViewInner instanceView;
 
     /**
      * Specifies that the image or disk that is being used was licensed
@@ -293,7 +293,7 @@ public String provisioningState() {
      *
      * @return the instanceView value
      */
-    public VirtualMachineScaleSetVMInstanceViewInner instanceView() {
+    public VirtualMachineInstanceViewInner instanceView() {
         return this.instanceView;
     }
 
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMImpl.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMImpl.java
index 4d074eeefb9b..37eb2282fafb 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMImpl.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMImpl.java
@@ -21,7 +21,7 @@
 import com.microsoft.azure.SubResource;
 import com.microsoft.azure.management.compute.v2017_12_01.Plan;
 import java.util.List;
-import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineInstanceView;
+import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineScaleSetVMInstanceView;
 import java.util.ArrayList;
 import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineExtension;
 
@@ -107,10 +107,10 @@ public String instanceId() {
     }
 
     @Override
-    public VirtualMachineInstanceView instanceView() {
-        VirtualMachineInstanceViewInner inner = this.inner().instanceView();
+    public VirtualMachineScaleSetVMInstanceView instanceView() {
+        VirtualMachineScaleSetVMInstanceViewInner inner = this.inner().instanceView();
         if (inner != null) {
-            return  new VirtualMachineInstanceViewImpl(inner, manager());
+            return  new VirtualMachineScaleSetVMInstanceViewImpl(inner, manager());
         } else {
             return null;
         }
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMInner.java
index 6eda16cb0111..f6a8ffa23a73 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMInner.java
@@ -55,7 +55,7 @@ public class VirtualMachineScaleSetVMInner extends Resource {
      * The virtual machine instance view.
      */
     @JsonProperty(value = "properties.instanceView", access = JsonProperty.Access.WRITE_ONLY)
-    private VirtualMachineInstanceViewInner instanceView;
+    private VirtualMachineScaleSetVMInstanceViewInner instanceView;
 
     /**
      * Specifies the hardware settings for the virtual machine.
@@ -185,7 +185,7 @@ public String vmId() {
      *
      * @return the instanceView value
      */
-    public VirtualMachineInstanceViewInner instanceView() {
+    public VirtualMachineScaleSetVMInstanceViewInner instanceView() {
         return this.instanceView;
     }
 
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/AccessUriInner.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/AccessUriInner.java
index 95c1a0e87f02..6c4de56561a0 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/AccessUriInner.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/AccessUriInner.java
@@ -9,17 +9,15 @@
 package com.microsoft.azure.management.compute.v2018_04_01.implementation;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.microsoft.rest.serializer.JsonFlatten;
 
 /**
  * A disk access SAS uri.
  */
-@JsonFlatten
 public class AccessUriInner {
     /**
      * A SAS uri for accessing a disk.
      */
-    @JsonProperty(value = "properties.output.accessSAS", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "accessSAS", access = JsonProperty.Access.WRITE_ONLY)
     private String accessSAS;
 
     /**