diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/desktopvirtualization.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/desktopvirtualization.json
index 799f9a28c92a..b2407fd88ccb 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/desktopvirtualization.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/desktopvirtualization.json
@@ -4099,7 +4099,7 @@
           "type": "string",
           "description": "Starting time for ramp up period."
         },
-        "rampUpAlgorithm": {
+        "rampUpLoadBalancingAlgorithm": {
           "enum": [
             "BreadthFirst",
             "DepthFirst"
@@ -4111,7 +4111,7 @@
           "type": "string",
           "description": "Load balancing algorithm for ramp up period."
         },
-        "rampUpMinimumHostPct": {
+        "rampUpMinimumHostsPct": {
           "type": "integer",
           "format": "int32",
           "minimum": 0,
@@ -4189,7 +4189,7 @@
           "type": "string",
           "description": "Specifies when to stop hosts during ramp down period."
         },
-        "rampDownNotificationMinutes": {
+        "rampDownWaitTimeMinutes": {
           "type": "integer",
           "format": "int32",
           "description": "Number of minutes to wait to stop hosts during ramp down period."
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Create.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Create.json
index 097475928e4d..aac1169bfe67 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Create.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Create.json
@@ -27,8 +27,8 @@
               "Friday"
             ],
             "rampUpStartTime": "2020-11-10T06:00:00.000Z",
-            "rampUpAlgorithm": "DepthFirst",
-            "rampUpMinimumHostPct": 20,
+            "rampUpLoadBalancingAlgorithm": "DepthFirst",
+            "rampUpMinimumHostsPct": 20,
             "rampUpCapacityThresholdPct": 80,
             "peakStartTime": "2020-11-10T08:00:00.000Z",
             "peakLoadBalancingAlgorithm": "BreadthFirst",
@@ -37,7 +37,7 @@
             "rampDownMinimumHostsPct": 20,
             "rampDownCapacityThresholdPct": 50,
             "rampDownForceLogoffUsers": true,
-            "rampDownNotificationMinutes": 30,
+            "rampDownWaitTimeMinutes": 30,
             "rampDownNotificationMessage": "message",
             "offPeakStartTime": "2020-11-10T20:00:00.000Z",
             "offPeakLoadBalancingAlgorithm": "DepthFirst"
@@ -80,8 +80,8 @@
                 "Friday"
               ],
               "rampUpStartTime": "2020-11-10T06:00:00.000+00:00",
-              "rampUpAlgorithm": "DepthFirst",
-              "rampUpMinimumHostPct": 20,
+              "rampUpLoadBalancingAlgorithm": "DepthFirst",
+              "rampUpMinimumHostsPct": 20,
               "rampUpCapacityThresholdPct": 80,
               "peakStartTime": "2020-11-10T08:00:00.000+00:00",
               "peakLoadBalancingAlgorithm": "BreadthFirst",
@@ -90,7 +90,7 @@
               "rampDownMinimumHostsPct": 20,
               "rampDownCapacityThresholdPct": 50,
               "rampDownForceLogoffUsers": true,
-              "rampDownNotificationMinutes": 30,
+              "rampDownWaitTimeMinutes": 30,
               "rampDownNotificationMessage": "message",
               "offPeakStartTime": "2020-11-10T20:00:00.000+00:00",
               "offPeakLoadBalancingAlgorithm": "DepthFirst"
@@ -132,8 +132,8 @@
                 "Friday"
               ],
               "rampUpStartTime": "2020-11-10T06:00:00.000+00:00",
-              "rampUpAlgorithm": "DepthFirst",
-              "rampUpMinimumHostPct": 20,
+              "rampUpLoadBalancingAlgorithm": "DepthFirst",
+              "rampUpMinimumHostsPct": 20,
               "rampUpCapacityThresholdPct": 80,
               "peakStartTime": "2020-11-10T08:00:00.000+00:00",
               "peakLoadBalancingAlgorithm": "BreadthFirst",
@@ -142,7 +142,7 @@
               "rampDownMinimumHostsPct": 20,
               "rampDownCapacityThresholdPct": 50,
               "rampDownForceLogoffUsers": true,
-              "rampDownNotificationMinutes": 30,
+              "rampDownWaitTimeMinutes": 30,
               "rampDownNotificationMessage": "message",
               "offPeakStartTime": "2020-11-10T20:00:00.000+00:00",
               "offPeakLoadBalancingAlgorithm": "DepthFirst"
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Delete.json
index b98aa24704ac..5e0dfa1973ec 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Delete.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Delete.json
@@ -32,8 +32,8 @@
               "Friday"
             ],
             "rampUpStartTime": "2020-11-10T06:00:00.000+00:00",
-            "rampUpAlgorithm": "DepthFirst",
-            "rampUpMinimumHostPct": 20,
+            "rampUpLoadBalancingAlgorithm": "DepthFirst",
+            "rampUpMinimumHostsPct": 20,
             "rampUpCapacityThresholdPct": 80,
             "peakStartTime": "2020-11-10T08:00:00.000+00:00",
             "peakLoadBalancingAlgorithm": "BreadthFirst",
@@ -42,7 +42,7 @@
             "rampDownMinimumHostsPct": 20,
             "rampDownCapacityThresholdPct": 50,
             "rampDownForceLogoffUsers": true,
-            "rampDownNotificationMinutes": 30,
+            "rampDownWaitTimeMinutes": 30,
             "rampDownNotificationMessage": "message",
             "offPeakStartTime": "2020-11-10T20:00:00.000+00:00",
             "offPeakLoadBalancingAlgorithm": "DepthFirst"
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Get.json
index 9d4c249d7945..b85f44ebee49 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Get.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Get.json
@@ -33,8 +33,8 @@
                 "Friday"
               ],
               "rampUpStartTime": "2020-11-10T06:00:00.000+00:00",
-              "rampUpAlgorithm": "DepthFirst",
-              "rampUpMinimumHostPct": 20,
+              "rampUpLoadBalancingAlgorithm": "DepthFirst",
+              "rampUpMinimumHostsPct": 20,
               "rampUpCapacityThresholdPct": 80,
               "peakStartTime": "2020-11-10T08:00:00.000+00:00",
               "peakLoadBalancingAlgorithm": "BreadthFirst",
@@ -43,7 +43,7 @@
               "rampDownMinimumHostsPct": 20,
               "rampDownCapacityThresholdPct": 50,
               "rampDownForceLogoffUsers": true,
-              "rampDownNotificationMinutes": 30,
+              "rampDownWaitTimeMinutes": 30,
               "rampDownNotificationMessage": "message",
               "offPeakStartTime": "2020-11-10T20:00:00.000+00:00",
               "offPeakLoadBalancingAlgorithm": "DepthFirst"
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_ListByHostPool.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_ListByHostPool.json
index 9c8aa5c28c9f..a520218d9b43 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_ListByHostPool.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_ListByHostPool.json
@@ -35,8 +35,8 @@
                     "Friday"
                   ],
                   "rampUpStartTime": "2020-11-10T06:00:00.000+00:00",
-                  "rampUpAlgorithm": "DepthFirst",
-                  "rampUpMinimumHostPct": 20,
+                  "rampUpLoadBalancingAlgorithm": "DepthFirst",
+                  "rampUpMinimumHostsPct": 20,
                   "rampUpCapacityThresholdPct": 80,
                   "peakStartTime": "2020-11-10T08:00:00.000+00:00",
                   "peakLoadBalancingAlgorithm": "BreadthFirst",
@@ -45,7 +45,7 @@
                   "rampDownMinimumHostsPct": 20,
                   "rampDownCapacityThresholdPct": 50,
                   "rampDownForceLogoffUsers": true,
-                  "rampDownNotificationMinutes": 30,
+                  "rampDownWaitTimeMinutes": 30,
                   "rampDownNotificationMessage": "message",
                   "offPeakStartTime": "2020-11-10T20:00:00.000+00:00",
                   "offPeakLoadBalancingAlgorithm": "DepthFirst"
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_ListByResourceGroup.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_ListByResourceGroup.json
index f05860de87e3..2f5eb1e5e71c 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_ListByResourceGroup.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_ListByResourceGroup.json
@@ -34,8 +34,8 @@
                     "Friday"
                   ],
                   "rampUpStartTime": "2020-11-10T06:00:00.000+00:00",
-                  "rampUpAlgorithm": "DepthFirst",
-                  "rampUpMinimumHostPct": 20,
+                  "rampUpLoadBalancingAlgorithm": "DepthFirst",
+                  "rampUpMinimumHostsPct": 20,
                   "rampUpCapacityThresholdPct": 80,
                   "peakStartTime": "2020-11-10T08:00:00.000+00:00",
                   "peakLoadBalancingAlgorithm": "BreadthFirst",
@@ -44,7 +44,7 @@
                   "rampDownMinimumHostsPct": 20,
                   "rampDownCapacityThresholdPct": 50,
                   "rampDownForceLogoffUsers": true,
-                  "rampDownNotificationMinutes": 30,
+                  "rampDownWaitTimeMinutes": 30,
                   "rampDownNotificationMessage": "message",
                   "offPeakStartTime": "2020-11-10T20:00:00.000+00:00",
                   "offPeakLoadBalancingAlgorithm": "DepthFirst"
@@ -84,8 +84,8 @@
                     "Friday"
                   ],
                   "rampUpStartTime": "2020-11-10T06:00:00.000+00:00",
-                  "rampUpAlgorithm": "DepthFirst",
-                  "rampUpMinimumHostPct": 20,
+                  "rampUpLoadBalancingAlgorithm": "DepthFirst",
+                  "rampUpMinimumHostsPct": 20,
                   "rampUpCapacityThresholdPct": 80,
                   "peakStartTime": "2020-11-10T08:00:00.000+00:00",
                   "peakLoadBalancingAlgorithm": "BreadthFirst",
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_ListBySubscription.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_ListBySubscription.json
index bd17981ebe8c..4421d36e2eef 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_ListBySubscription.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_ListBySubscription.json
@@ -33,8 +33,8 @@
                     "Friday"
                   ],
                   "rampUpStartTime": "2020-11-10T06:00:00.000+00:00",
-                  "rampUpAlgorithm": "DepthFirst",
-                  "rampUpMinimumHostPct": 20,
+                  "rampUpLoadBalancingAlgorithm": "DepthFirst",
+                  "rampUpMinimumHostsPct": 20,
                   "rampUpCapacityThresholdPct": 80,
                   "peakStartTime": "2020-11-10T08:00:00.000+00:00",
                   "peakLoadBalancingAlgorithm": "BreadthFirst",
@@ -43,7 +43,7 @@
                   "rampDownMinimumHostsPct": 20,
                   "rampDownCapacityThresholdPct": 50,
                   "rampDownForceLogoffUsers": true,
-                  "rampDownNotificationMinutes": 30,
+                  "rampDownWaitTimeMinutes": 30,
                   "rampDownNotificationMessage": "message",
                   "offPeakStartTime": "2020-11-10T20:00:00.000+00:00",
                   "offPeakLoadBalancingAlgorithm": "DepthFirst"
@@ -83,8 +83,8 @@
                     "Friday"
                   ],
                   "rampUpStartTime": "2020-11-10T06:00:00.000+00:00",
-                  "rampUpAlgorithm": "DepthFirst",
-                  "rampUpMinimumHostPct": 20,
+                  "rampUpLoadBalancingAlgorithm": "DepthFirst",
+                  "rampUpMinimumHostsPct": 20,
                   "rampUpCapacityThresholdPct": 80,
                   "peakStartTime": "2020-11-10T08:00:00.000+00:00",
                   "peakLoadBalancingAlgorithm": "BreadthFirst",
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Update.json
index e5d446032bc8..e73f4f6f13d3 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Update.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/ScalingPlan_Update.json
@@ -26,8 +26,8 @@
               "Friday"
             ],
             "rampUpStartTime": "2020-11-10T06:00:00.000Z",
-            "rampUpAlgorithm": "DepthFirst",
-            "rampUpMinimumHostPct": 20,
+            "rampUpLoadBalancingAlgorithm": "DepthFirst",
+            "rampUpMinimumHostsPct": 20,
             "rampUpCapacityThresholdPct": 80,
             "peakStartTime": "2020-11-10T08:00:00.000Z",
             "peakLoadBalancingAlgorithm": "BreadthFirst",
@@ -36,7 +36,7 @@
             "rampDownMinimumHostsPct": 20,
             "rampDownCapacityThresholdPct": 50,
             "rampDownForceLogoffUsers": true,
-            "rampDownNotificationMinutes": 30,
+            "rampDownWaitTimeMinutes": 30,
             "rampDownNotificationMessage": "message",
             "offPeakStartTime": "2020-11-10T20:00:00.000Z",
             "offPeakLoadBalancingAlgorithm": "DepthFirst"
@@ -79,8 +79,8 @@
                 "Friday"
               ],
               "rampUpStartTime": "2020-11-10T06:00:00.000+00:00",
-              "rampUpAlgorithm": "DepthFirst",
-              "rampUpMinimumHostPct": 20,
+              "rampUpLoadBalancingAlgorithm": "DepthFirst",
+              "rampUpMinimumHostsPct": 20,
               "rampUpCapacityThresholdPct": 80,
               "peakStartTime": "2020-11-10T08:00:00.000+00:00",
               "peakLoadBalancingAlgorithm": "BreadthFirst",
@@ -89,7 +89,7 @@
               "rampDownMinimumHostsPct": 20,
               "rampDownCapacityThresholdPct": 50,
               "rampDownForceLogoffUsers": true,
-              "rampDownNotificationMinutes": 30,
+              "rampDownWaitTimeMinutes": 30,
               "rampDownNotificationMessage": "message",
               "offPeakStartTime": "2020-11-10T20:00:00.000+00:00",
               "offPeakLoadBalancingAlgorithm": "DepthFirst"