diff --git a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/stable/2020-08-02/HybridCompute.json b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/stable/2020-08-02/HybridCompute.json
index 3b8a59c50a8a..131d618243b2 100644
--- a/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/stable/2020-08-02/HybridCompute.json
+++ b/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/stable/2020-08-02/HybridCompute.json
@@ -336,7 +336,7 @@
           }
         },
         "x-ms-examples": {
-          "List Machines by resource group": {
+          "List Machines by subscription": {
             "$ref": "./examples/Machines_ListBySubscription.json"
           }
         },
@@ -402,7 +402,7 @@
           }
         },
         "x-ms-examples": {
-          "Create or Update a Machine Extension": {
+          "Create or Update a Machine Extension (PUT)": {
             "$ref": "./examples/PUTExtension.json"
           }
         },
@@ -464,7 +464,7 @@
           }
         },
         "x-ms-examples": {
-          "Create or Update a Machine Extension": {
+          "Create or Update a Machine Extension (PATCH)": {
             "$ref": "./examples/UpdateExtension.json"
           }
         },
diff --git a/specification/hybridcompute/resource-manager/readme.az.md b/specification/hybridcompute/resource-manager/readme.az.md
index fe93ce29dfae..e2c732668307 100644
--- a/specification/hybridcompute/resource-manager/readme.az.md
+++ b/specification/hybridcompute/resource-manager/readme.az.md
@@ -20,4 +20,17 @@ directive:
       parameter-name: extension-name
     set:
       parameter-name: name
+  - where:
+      subject: MachineExtension
+      parameter-name: type-properties-type
+    set:
+      parameter-name: type
+  - where:
+      group: connectedmachine machine$
+    set:
+      group: connectedmachine
+  - where:
+      group: connectedmachine machine-extension$
+    set:
+      group: connectedmachine extension
 ```
diff --git a/specification/hybridcompute/resource-manager/readme.cli.md b/specification/hybridcompute/resource-manager/readme.cli.md
index 5a59b0080270..22ae9244bdc1 100644
--- a/specification/hybridcompute/resource-manager/readme.cli.md
+++ b/specification/hybridcompute/resource-manager/readme.cli.md
@@ -7,25 +7,25 @@ This directory contains the Cli common model for the Hybrid Compute service.
 title: 'ConnectedMachine'
 
 cli:
-    cli-directive:
-      - select: 'operationGroup'
-        where:
-            operationGroup: 'operations'
-        hidden: true
-      - select: 'operation'
-        where:
-            operationGroup: 'machines'
-            operation: '(reconnect|createOrUpdate|update)'
-        removed: true
-      - where:
-            param: 'autoUpgradeMinorVersion'
-        alias:
-            - auto_upgrade_minor
-      - where:
-            operationGroup: 'machineExtensions'
-            param: 'extensionName'
-        alias:
-            - n
-            - extension_name
-            - name
+  cli-directive:
+    - select: 'operationGroup'
+      where:
+          operationGroup: 'operations'
+      hidden: true
+    - select: 'operation'
+      where:
+          operationGroup: 'machines'
+          operation: '(reconnect|createOrUpdate|update)'
+      removed: true
+    - where:
+          param: 'autoUpgradeMinorVersion'
+      alias:
+          - auto_upgrade_minor
+    - where:
+          operationGroup: 'machineExtensions'
+          param: 'extensionName'
+      alias:
+          - n
+          - extension_name
+          - name
 ```