diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/desktopvirtualization.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/desktopvirtualization.json
index 3af397de4739..621a229ef503 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/desktopvirtualization.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/desktopvirtualization.json
@@ -2398,6 +2398,11 @@
       "description": "Represents a RegistrationInfo definition.",
       "type": "object",
       "properties": {
+        "expirationTime": {
+          "format": "date-time",
+          "type": "string",
+          "description": "Expiration time of registration token."
+        },
         "registrationTokenOperation": {
           "enum": [
             "Delete",
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/HostPool_Create.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/HostPool_Create.json
index 7ea677d137e4..66b79818e853 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/HostPool_Create.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/HostPool_Create.json
@@ -19,7 +19,7 @@
         "maxSessionLimit": 999999,
         "loadBalancerType": "BreadthFirst",
         "registrationInfo": {
-          "expirationTime": "2008-09-22T14:01:54.9571247Z",
+          "expirationTime": "2020-10-01T14:01:54.9571247Z",
           "registrationTokenOperation": "Update"
         },
         "ssoContext": "KeyVaultPath"
@@ -48,7 +48,7 @@
           "validationEnvironment": null,
           "ring": null,
           "registrationInfo": {
-            "expirationTime": "2008-09-22T14:01:54.9571247Z",
+            "expirationTime": "2020-10-01T14:01:54.9571247Z",
             "token": "token",
             "registrationTokenOperation": "Update"
           },
@@ -77,7 +77,7 @@
           "validationEnvironment": null,
           "ring": null,
           "registrationInfo": {
-            "expirationTime": "2008-09-22T14:01:54.9571247Z",
+            "expirationTime": "2020-10-01T14:01:54.9571247Z",
             "token": "token",
             "registrationTokenOperation": "Update"
           },
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/HostPool_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/HostPool_Update.json
index 6eb8e05ee4ce..0993e2d985a4 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/HostPool_Update.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/HostPool_Update.json
@@ -17,6 +17,7 @@
         "loadBalancerType": "BreadthFirst",
         "personalDesktopAssignmentType": "Automatic",
         "registrationInfo": {
+          "expirationTime": "2020-10-01T15:01:54.9571247Z",
           "registrationTokenOperation": "Update"
         },
         "ssoContext": "KeyVaultPath"
diff --git a/specification/desktopvirtualization/resource-manager/readme.az.md b/specification/desktopvirtualization/resource-manager/readme.az.md
index 59b298c1cc19..c4e10f818618 100644
--- a/specification/desktopvirtualization/resource-manager/readme.az.md
+++ b/specification/desktopvirtualization/resource-manager/readme.az.md
@@ -9,4 +9,14 @@ az:
   namespace: azure.mgmt.desktopvirtualization
 az-output-folder: $(azure-cli-extension-folder)/src/desktopvirtualization
 python-sdk-output-folder: "$(az-output-folder)/azext_desktopvirtualization/vendored_sdks/desktopvirtualization"
+
+directive:
+  - where:
+      group: desktopvirtualization host-pool
+    set:
+      group: desktopvirtualization hostpool
+  - where:
+      group: desktopvirtualization application-group
+    set:
+      group: desktopvirtualization applicationgroup
 ```
diff --git a/specification/desktopvirtualization/resource-manager/readme.cli.md b/specification/desktopvirtualization/resource-manager/readme.cli.md
index 3add0b924943..1f10535c86f8 100644
--- a/specification/desktopvirtualization/resource-manager/readme.cli.md
+++ b/specification/desktopvirtualization/resource-manager/readme.cli.md
@@ -5,4 +5,13 @@ These settings don't need to apply `--cli` on the command line.
 ``` yaml $(cli)
 cli:
   cli-name: desktopvirtualization
+  cli-directive:
+    - where:
+        group: (ActiveApplications|Applications|ApplicationgroupAssignments|Desktops|SessionHosts|StartMenuItems|UserSessions)
+      hidden: true
+    # - where:
+    #     group: ApplicationGroups
+    #     op: ListByResourceGroup
+    #     param: \$filter
+    #   name: list-filter
 ```
diff --git a/specification/desktopvirtualization/resource-manager/readme.md b/specification/desktopvirtualization/resource-manager/readme.md
index f925aac285c5..9a9b9ebd94d0 100644
--- a/specification/desktopvirtualization/resource-manager/readme.md
+++ b/specification/desktopvirtualization/resource-manager/readme.md
@@ -74,6 +74,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-ruby
     after_scripts:
       - bundle install && rake arm:regen_all_profiles['azure_mgmt_desktop_virtualization']
+  - repo: azure-cli-extensions
 ```
 
 ## C#
@@ -110,16 +111,16 @@ AutoRest V3 generators require the use of `--tag=all-api-versions` to select api
 
 This block is updated by an automatic script. Edits may be lost!
 
-``` yaml $(tag) == 'all-api-versions' /* autogenerated */
-# include the azure profile definitions from the standard location
-require: $(this-folder)/../../../profiles/readme.md
-
-# all the input files across all versions
-input-file:
-  - $(this-folder)/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/desktopvirtualization.json
-  - $(this-folder)/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/desktopvirtualization.json
-  - $(this-folder)/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/desktopvirtualization.json
-
+``` yaml $(tag) == 'all-api-versions' /* autogenerated */
+# include the azure profile definitions from the standard location
+require: $(this-folder)/../../../profiles/readme.md
+
+# all the input files across all versions
+input-file:
+  - $(this-folder)/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/desktopvirtualization.json
+  - $(this-folder)/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/desktopvirtualization.json
+  - $(this-folder)/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/desktopvirtualization.json
+
 ```
 
 If there are files that should not be in the `all-api-versions` set, 
diff --git a/specification/desktopvirtualization/resource-manager/readme.python.md b/specification/desktopvirtualization/resource-manager/readme.python.md
index 9714d4109d0b..454b0737ac27 100644
--- a/specification/desktopvirtualization/resource-manager/readme.python.md
+++ b/specification/desktopvirtualization/resource-manager/readme.python.md
@@ -10,18 +10,18 @@ python:
   azure-arm: true
   license-header: MICROSOFT_MIT_NO_VERSION
   payload-flattening-threshold: 2
-  namespace: azure.mgmt.DesktopVirtualization
-  package-name: azure-mgmt-DesktopVirtualization
+  namespace: azure.mgmt.desktopvirtualization
+  package-name: azure-mgmt-desktopvirtualization
   package-version: 0.2.0
   clear-output-folder: true
 ```
 ``` yaml $(python) && $(python-mode) == 'update'
 python:
   no-namespace-folders: true
-  output-folder: $(python-sdks-folder)/azure-mgmt-DesktopVirtualization/azure/mgmt/DesktopVirtualization
+  output-folder: $(python-sdks-folder)/azure-mgmt-desktopvirtualization/azure/mgmt/desktopvirtualization
 ```
 ``` yaml $(python) && $(python-mode) == 'create'
 python:
   basic-setup-py: true
-  output-folder: $(python-sdks-folder)/azure-mgmt-DesktopVirtualization
+  output-folder: $(python-sdks-folder)/azure-mgmt-desktopvirtualization
 ```