diff --git a/docs/mgmt/polishing.md b/docs/mgmt/polishing.md
index a0057cdcbc8..f4aa9ad46be 100644
--- a/docs/mgmt/polishing.md
+++ b/docs/mgmt/polishing.md
@@ -112,7 +112,7 @@ To rename a type (models and enumerations included), you could just use this syn
 rename-mapping:
   OriginalName: NewName
 ```
-where the `OriginalName` is the original name of this model in the swagger. **Please be sure the name is its original swagger name**, because our generator will dynamically change names of some models from their context and roles inside the SDK.
+where the `OriginalName` is the original name of this model in the swagger. **Please be sure the name is its original swagger name**, because our generator will dynamically change names of some models from their context and roles inside the SDK. About how to get their original name of a model, please refer to [`How to get original name` section](#how-to-get-original-name).
 
 After applying this configuration, you will see the following changes:
 ```diff
@@ -130,7 +130,7 @@ To rename a property in a class, you could just use this syntax:
 rename-mapping:
   Model.oldProperty: NewProperty
 ```
-where the `Model` is the original name of this model in the **swagger**, and the `oldProperty` is its original name of this property in the **swagger**.
+where the `Model` is the original name of this model in the **swagger**, and the `oldProperty` is its original name of this property in the **swagger**. About how to get their original name of a property in model, please refer to [`How to get original name` section](#how-to-get-original-name).
 
 After applying this configuration, you will see the following changes:
 ```diff
@@ -145,51 +145,6 @@ public partial class Model
 }
 ```
 
-It is special that some properties might be "flattened" from another model into this property. When this happens, you will have to include a full path of the property to make sure that the generator could precisely locate the property. For instance, we might have this inside our swagger:
-```json
-"definitions": {
-    "Model": {
-        "type": "object",
-        "properties": {
-            "properties": {
-                "$ref": "#definitions/ModelProperties",
-                "x-ms-client-flatten": true
-            }
-        }
-    },
-    "ModelProperties": {
-        "type": "object",
-        "properties": {
-            "flattenedProperty": {
-                "type": "string"
-            }
-        }
-    }
-}
-```
-This piece of swagger will generate into the following code:
-```csharp
-public partial class Model
-{
-    /* constructors */
-    public string FlattenedProperty { get; set; }
-}
-```
-The model `ModelProperties` will disappear in our generated code, and the properties inside `ModelProperties` will be promoted into the owner class. In case the name of this property needs to be changed, you will have to use the following configuration:
-```yaml
-rename-mapping:
-  Model.properties.flattenedProperty: NewFlattenedProperty
-```
-After applying this configuration, you will see the following changes:
-```diff
-public partial class Model
-{
-    /* constructors */
--   public string FlattenedProperty { get; set; }
-+   public string NewFlattenedProperty { get; set; }
-}
-```
-
 ### Change the format of a property
 
 To assign a new format to a property, you could use this syntax:
@@ -217,6 +172,8 @@ rename-mapping:
 ```
 Please note that the dash and slash `-|` here are mandatory as a placeholder for the property name. The generator uses this symbol to separate the part for property name and its format.
 
+About how to get their original name of a property in model, please refer to [`How to get original name` section](#how-to-get-original-name).
+
 ### Rename an enumeration value in an enumeration type
 
 The generator regards the enumeration values as static properties, therefore you could use basically the same syntax as renaming a property to rename an enumeration value:
@@ -224,7 +181,62 @@ The generator regards the enumeration values as static properties, therefore you
 rename-mapping:
   EnumType.enum_value: NewValue
 ```
-where the `EnumType` is the original name of the enumeration type in the **swagger**, and `enum_value` is the original name of the enumeration value in the **swagger**. In case we have spaces or other special character, you might need to use quotes to enclosing the key in this mapping to ensure everything is good without compile errors.
+where the `EnumType` is the original name of the enumeration type in the **swagger**, and `enum_value` is the original name of the enumeration value in the **swagger**. In case we have spaces or other special character, you might need to use quotes to enclosing the key in this mapping to ensure everything is good without compile errors. About how to get their original name of enum classes or enum values, please refer to [`How to get original name` section](#how-to-get-original-name).
+
+### How to get original name
+
+The `rename-mapping` configuration requires an "original name" as its key to rename an element (model name, property name, enum name, enum value name or format of a property) in the generated SDK. We have a debug flag to show the original names of those elements that support to rename.
+
+Add the following configuration to your `autorest.md` and regenerate the SDK:
+```yaml
+mgmt-debug:
+  show-serialized-names: true
+```
+You will see changes like this:
+```diff
+    /// <summary>
+    /// A class representing the Image data model.
+    /// The source user image virtual hard disk. The virtual hard disk will be copied before being attached to the virtual machine. If SourceImage is provided, the destination virtual hard drive must not exist.
++   /// Serialized Name: Image
+    /// </summary>
+    public partial class ImageData : TrackedResourceData
+```
+or on a property:
+```diff
+    /// <summary>
+    /// Specifies the storage settings for the virtual machine disks.
++   /// Serialized Name: Image.properties.storageProfile
+    /// </summary>
+    public ImageStorageProfile StorageProfile { get; set; }
+```
+or on an enum and its values:
+```diff
+    /// <summary>
+    /// Specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**
++   /// Serialized Name: CachingTypes
+    /// </summary>
+    public enum CachingType
+    {
+        /// <summary>
+        /// None
++       /// Serialized Name: CachingTypes.None
+        /// </summary>
+        None,
+        /// <summary>
+        /// ReadOnly
++       /// Serialized Name: CachingTypes.ReadOnly
+        /// </summary>
+        ReadOnly,
+        /// <summary>
+        /// ReadWrite
++       /// Serialized Name: CachingTypes.ReadWrite
+        /// </summary>
+        ReadWrite
+    }
+```
+The content after `Serialized Name:` is the "original name" you would like to use as keys in `rename-mapping`.
+
+Because this configuration adds quite a few extra content to the xml documents, it is not recommended to have this flag on an official SDK, be sure to remove the configuration and regenerate the SDK after all the rename work is done.
 
 ## Rename a parameter in an operation
 
diff --git a/samples/Azure.Management.Storage/Generated/BlobContainerData.cs b/samples/Azure.Management.Storage/Generated/BlobContainerData.cs
index 69f2672270b..b695d236ded 100644
--- a/samples/Azure.Management.Storage/Generated/BlobContainerData.cs
+++ b/samples/Azure.Management.Storage/Generated/BlobContainerData.cs
@@ -14,7 +14,10 @@
 
 namespace Azure.Management.Storage
 {
-    /// <summary> A class representing the BlobContainer data model. </summary>
+    /// <summary>
+    /// A class representing the BlobContainer data model.
+    /// Properties of the blob container, including Id, resource name, resource type, Etag.
+    /// </summary>
     public partial class BlobContainerData : ResourceData
     {
         /// <summary> Initializes a new instance of BlobContainerData. </summary>
diff --git a/samples/Azure.Management.Storage/Generated/BlobInventoryPolicyData.cs b/samples/Azure.Management.Storage/Generated/BlobInventoryPolicyData.cs
index f39ce60e326..d41fe8b53e6 100644
--- a/samples/Azure.Management.Storage/Generated/BlobInventoryPolicyData.cs
+++ b/samples/Azure.Management.Storage/Generated/BlobInventoryPolicyData.cs
@@ -12,7 +12,10 @@
 
 namespace Azure.Management.Storage
 {
-    /// <summary> A class representing the BlobInventoryPolicy data model. </summary>
+    /// <summary>
+    /// A class representing the BlobInventoryPolicy data model.
+    /// The storage account blob inventory policy.
+    /// </summary>
     public partial class BlobInventoryPolicyData : ResourceData
     {
         /// <summary> Initializes a new instance of BlobInventoryPolicyData. </summary>
diff --git a/samples/Azure.Management.Storage/Generated/BlobServiceData.cs b/samples/Azure.Management.Storage/Generated/BlobServiceData.cs
index 8a14b4fc1fd..c5cc5eade27 100644
--- a/samples/Azure.Management.Storage/Generated/BlobServiceData.cs
+++ b/samples/Azure.Management.Storage/Generated/BlobServiceData.cs
@@ -12,7 +12,10 @@
 
 namespace Azure.Management.Storage
 {
-    /// <summary> A class representing the BlobService data model. </summary>
+    /// <summary>
+    /// A class representing the BlobService data model.
+    /// The properties of a storage account’s Blob service.
+    /// </summary>
     public partial class BlobServiceData : ResourceData
     {
         /// <summary> Initializes a new instance of BlobServiceData. </summary>
diff --git a/samples/Azure.Management.Storage/Generated/DeletedAccountData.cs b/samples/Azure.Management.Storage/Generated/DeletedAccountData.cs
index 73094508860..e91944f82a5 100644
--- a/samples/Azure.Management.Storage/Generated/DeletedAccountData.cs
+++ b/samples/Azure.Management.Storage/Generated/DeletedAccountData.cs
@@ -10,7 +10,10 @@
 
 namespace Azure.Management.Storage
 {
-    /// <summary> A class representing the DeletedAccount data model. </summary>
+    /// <summary>
+    /// A class representing the DeletedAccount data model.
+    /// Deleted storage account
+    /// </summary>
     public partial class DeletedAccountData : ResourceData
     {
         /// <summary> Initializes a new instance of DeletedAccountData. </summary>
diff --git a/samples/Azure.Management.Storage/Generated/EncryptionScopeData.cs b/samples/Azure.Management.Storage/Generated/EncryptionScopeData.cs
index d386eb35f51..0d9924deded 100644
--- a/samples/Azure.Management.Storage/Generated/EncryptionScopeData.cs
+++ b/samples/Azure.Management.Storage/Generated/EncryptionScopeData.cs
@@ -12,7 +12,10 @@
 
 namespace Azure.Management.Storage
 {
-    /// <summary> A class representing the EncryptionScope data model. </summary>
+    /// <summary>
+    /// A class representing the EncryptionScope data model.
+    /// The Encryption Scope resource.
+    /// </summary>
     public partial class EncryptionScopeData : ResourceData
     {
         /// <summary> Initializes a new instance of EncryptionScopeData. </summary>
diff --git a/samples/Azure.Management.Storage/Generated/FileServiceData.cs b/samples/Azure.Management.Storage/Generated/FileServiceData.cs
index cf0e522f540..ec9dd292283 100644
--- a/samples/Azure.Management.Storage/Generated/FileServiceData.cs
+++ b/samples/Azure.Management.Storage/Generated/FileServiceData.cs
@@ -12,7 +12,10 @@
 
 namespace Azure.Management.Storage
 {
-    /// <summary> A class representing the FileService data model. </summary>
+    /// <summary>
+    /// A class representing the FileService data model.
+    /// The properties of File services in storage account.
+    /// </summary>
     public partial class FileServiceData : ResourceData
     {
         /// <summary> Initializes a new instance of FileServiceData. </summary>
diff --git a/samples/Azure.Management.Storage/Generated/FileShareData.cs b/samples/Azure.Management.Storage/Generated/FileShareData.cs
index 615a88e1b71..09afd084cde 100644
--- a/samples/Azure.Management.Storage/Generated/FileShareData.cs
+++ b/samples/Azure.Management.Storage/Generated/FileShareData.cs
@@ -14,7 +14,10 @@
 
 namespace Azure.Management.Storage
 {
-    /// <summary> A class representing the FileShare data model. </summary>
+    /// <summary>
+    /// A class representing the FileShare data model.
+    /// Properties of the file share, including Id, resource name, resource type, Etag.
+    /// </summary>
     public partial class FileShareData : ResourceData
     {
         /// <summary> Initializes a new instance of FileShareData. </summary>
diff --git a/samples/Azure.Management.Storage/Generated/ImmutabilityPolicyData.cs b/samples/Azure.Management.Storage/Generated/ImmutabilityPolicyData.cs
index 3fc4b209b1c..e4d621f4dd3 100644
--- a/samples/Azure.Management.Storage/Generated/ImmutabilityPolicyData.cs
+++ b/samples/Azure.Management.Storage/Generated/ImmutabilityPolicyData.cs
@@ -12,7 +12,10 @@
 
 namespace Azure.Management.Storage
 {
-    /// <summary> A class representing the ImmutabilityPolicy data model. </summary>
+    /// <summary>
+    /// A class representing the ImmutabilityPolicy data model.
+    /// The ImmutabilityPolicy property of a blob container, including Id, resource name, resource type, Etag.
+    /// </summary>
     public partial class ImmutabilityPolicyData : ResourceData
     {
         /// <summary> Initializes a new instance of ImmutabilityPolicyData. </summary>
diff --git a/samples/Azure.Management.Storage/Generated/ManagementPolicyData.cs b/samples/Azure.Management.Storage/Generated/ManagementPolicyData.cs
index 145cd268b8f..c6be0811af3 100644
--- a/samples/Azure.Management.Storage/Generated/ManagementPolicyData.cs
+++ b/samples/Azure.Management.Storage/Generated/ManagementPolicyData.cs
@@ -13,7 +13,10 @@
 
 namespace Azure.Management.Storage
 {
-    /// <summary> A class representing the ManagementPolicy data model. </summary>
+    /// <summary>
+    /// A class representing the ManagementPolicy data model.
+    /// The Get Storage Account ManagementPolicies operation response.
+    /// </summary>
     public partial class ManagementPolicyData : ResourceData
     {
         /// <summary> Initializes a new instance of ManagementPolicyData. </summary>
diff --git a/samples/Azure.Management.Storage/Generated/ObjectReplicationPolicyData.cs b/samples/Azure.Management.Storage/Generated/ObjectReplicationPolicyData.cs
index b5dd8c9be6b..d8624490f71 100644
--- a/samples/Azure.Management.Storage/Generated/ObjectReplicationPolicyData.cs
+++ b/samples/Azure.Management.Storage/Generated/ObjectReplicationPolicyData.cs
@@ -13,7 +13,10 @@
 
 namespace Azure.Management.Storage
 {
-    /// <summary> A class representing the ObjectReplicationPolicy data model. </summary>
+    /// <summary>
+    /// A class representing the ObjectReplicationPolicy data model.
+    /// The replication policy between two storage accounts. Multiple rules can be defined in one policy.
+    /// </summary>
     public partial class ObjectReplicationPolicyData : ResourceData
     {
         /// <summary> Initializes a new instance of ObjectReplicationPolicyData. </summary>
diff --git a/samples/Azure.Management.Storage/Generated/StorageAccountData.cs b/samples/Azure.Management.Storage/Generated/StorageAccountData.cs
index 44255f8ed74..4625e3f6ead 100644
--- a/samples/Azure.Management.Storage/Generated/StorageAccountData.cs
+++ b/samples/Azure.Management.Storage/Generated/StorageAccountData.cs
@@ -14,7 +14,10 @@
 
 namespace Azure.Management.Storage
 {
-    /// <summary> A class representing the StorageAccount data model. </summary>
+    /// <summary>
+    /// A class representing the StorageAccount data model.
+    /// The storage account.
+    /// </summary>
     public partial class StorageAccountData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of StorageAccountData. </summary>
diff --git a/samples/Azure.Management.Storage/Generated/StoragePrivateEndpointConnectionData.cs b/samples/Azure.Management.Storage/Generated/StoragePrivateEndpointConnectionData.cs
index e8b1a653afd..ee7c17042a5 100644
--- a/samples/Azure.Management.Storage/Generated/StoragePrivateEndpointConnectionData.cs
+++ b/samples/Azure.Management.Storage/Generated/StoragePrivateEndpointConnectionData.cs
@@ -12,7 +12,10 @@
 
 namespace Azure.Management.Storage
 {
-    /// <summary> A class representing the StoragePrivateEndpointConnection data model. </summary>
+    /// <summary>
+    /// A class representing the StoragePrivateEndpointConnection data model.
+    /// The Private Endpoint Connection resource.
+    /// </summary>
     public partial class StoragePrivateEndpointConnectionData : ResourceData
     {
         /// <summary> Initializes a new instance of StoragePrivateEndpointConnectionData. </summary>
diff --git a/samples/Azure.ResourceManager.Sample/Generated/AvailabilitySetData.cs b/samples/Azure.ResourceManager.Sample/Generated/AvailabilitySetData.cs
index c0fa9d553ba..25f9259aff7 100644
--- a/samples/Azure.ResourceManager.Sample/Generated/AvailabilitySetData.cs
+++ b/samples/Azure.ResourceManager.Sample/Generated/AvailabilitySetData.cs
@@ -13,7 +13,11 @@
 
 namespace Azure.ResourceManager.Sample
 {
-    /// <summary> A class representing the AvailabilitySet data model. </summary>
+    /// <summary>
+    /// A class representing the AvailabilitySet data model.
+    /// Specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
+    /// Serialized Name: AvailabilitySet
+    /// </summary>
     public partial class AvailabilitySetData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of AvailabilitySetData. </summary>
diff --git a/samples/Azure.ResourceManager.Sample/Generated/DedicatedHostData.cs b/samples/Azure.ResourceManager.Sample/Generated/DedicatedHostData.cs
index c8cfdcfe05a..781db6a25fb 100644
--- a/samples/Azure.ResourceManager.Sample/Generated/DedicatedHostData.cs
+++ b/samples/Azure.ResourceManager.Sample/Generated/DedicatedHostData.cs
@@ -14,7 +14,11 @@
 
 namespace Azure.ResourceManager.Sample
 {
-    /// <summary> A class representing the DedicatedHost data model. </summary>
+    /// <summary>
+    /// A class representing the DedicatedHost data model.
+    /// Specifies information about the Dedicated host.
+    /// Serialized Name: DedicatedHost
+    /// </summary>
     public partial class DedicatedHostData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of DedicatedHostData. </summary>
diff --git a/samples/Azure.ResourceManager.Sample/Generated/DedicatedHostGroupData.cs b/samples/Azure.ResourceManager.Sample/Generated/DedicatedHostGroupData.cs
index 426c57a4551..bfb07cd4b75 100644
--- a/samples/Azure.ResourceManager.Sample/Generated/DedicatedHostGroupData.cs
+++ b/samples/Azure.ResourceManager.Sample/Generated/DedicatedHostGroupData.cs
@@ -14,7 +14,11 @@
 
 namespace Azure.ResourceManager.Sample
 {
-    /// <summary> A class representing the DedicatedHostGroup data model. </summary>
+    /// <summary>
+    /// A class representing the DedicatedHostGroup data model.
+    /// Specifies information about the dedicated host group that the dedicated hosts should be assigned to. &lt;br&gt;&lt;br&gt; Currently, a dedicated host can only be added to a dedicated host group at creation time. An existing dedicated host cannot be added to another dedicated host group.
+    /// Serialized Name: DedicatedHostGroup
+    /// </summary>
     public partial class DedicatedHostGroupData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of DedicatedHostGroupData. </summary>
diff --git a/samples/Azure.ResourceManager.Sample/Generated/ImageData.cs b/samples/Azure.ResourceManager.Sample/Generated/ImageData.cs
index a6ddf4bb56a..f1464a8b443 100644
--- a/samples/Azure.ResourceManager.Sample/Generated/ImageData.cs
+++ b/samples/Azure.ResourceManager.Sample/Generated/ImageData.cs
@@ -13,7 +13,11 @@
 
 namespace Azure.ResourceManager.Sample
 {
-    /// <summary> A class representing the Image data model. </summary>
+    /// <summary>
+    /// A class representing the Image data model.
+    /// The source user image virtual hard disk. The virtual hard disk will be copied before being attached to the virtual machine. If SourceImage is provided, the destination virtual hard drive must not exist.
+    /// Serialized Name: Image
+    /// </summary>
     public partial class ImageData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of ImageData. </summary>
diff --git a/samples/Azure.ResourceManager.Sample/Generated/ProximityPlacementGroupData.cs b/samples/Azure.ResourceManager.Sample/Generated/ProximityPlacementGroupData.cs
index f989d3640d7..34b20f37935 100644
--- a/samples/Azure.ResourceManager.Sample/Generated/ProximityPlacementGroupData.cs
+++ b/samples/Azure.ResourceManager.Sample/Generated/ProximityPlacementGroupData.cs
@@ -13,7 +13,11 @@
 
 namespace Azure.ResourceManager.Sample
 {
-    /// <summary> A class representing the ProximityPlacementGroup data model. </summary>
+    /// <summary>
+    /// A class representing the ProximityPlacementGroup data model.
+    /// Specifies information about the proximity placement group.
+    /// Serialized Name: ProximityPlacementGroup
+    /// </summary>
     public partial class ProximityPlacementGroupData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of ProximityPlacementGroupData. </summary>
diff --git a/samples/Azure.ResourceManager.Sample/Generated/SshPublicKeyData.cs b/samples/Azure.ResourceManager.Sample/Generated/SshPublicKeyData.cs
index 63c4626f41d..223b32934d6 100644
--- a/samples/Azure.ResourceManager.Sample/Generated/SshPublicKeyData.cs
+++ b/samples/Azure.ResourceManager.Sample/Generated/SshPublicKeyData.cs
@@ -11,7 +11,11 @@
 
 namespace Azure.ResourceManager.Sample
 {
-    /// <summary> A class representing the SshPublicKey data model. </summary>
+    /// <summary>
+    /// A class representing the SshPublicKey data model.
+    /// Specifies information about the SSH public key.
+    /// Serialized Name: SshPublicKeyResource
+    /// </summary>
     public partial class SshPublicKeyData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of SshPublicKeyData. </summary>
diff --git a/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineData.cs b/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineData.cs
index 0657639bf8c..2cb1a743971 100644
--- a/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineData.cs
+++ b/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineData.cs
@@ -13,7 +13,11 @@
 
 namespace Azure.ResourceManager.Sample
 {
-    /// <summary> A class representing the VirtualMachine data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachine data model.
+    /// Describes a Virtual Machine.
+    /// Serialized Name: VirtualMachine
+    /// </summary>
     public partial class VirtualMachineData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineData. </summary>
diff --git a/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineExtensionData.cs b/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineExtensionData.cs
index 1b6779c396c..4d159bdb495 100644
--- a/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineExtensionData.cs
+++ b/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineExtensionData.cs
@@ -13,7 +13,11 @@
 
 namespace Azure.ResourceManager.Sample
 {
-    /// <summary> A class representing the VirtualMachineExtension data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachineExtension data model.
+    /// Describes a Virtual Machine Extension.
+    /// Serialized Name: VirtualMachineExtension
+    /// </summary>
     public partial class VirtualMachineExtensionData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineExtensionData. </summary>
diff --git a/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineExtensionImageData.cs b/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineExtensionImageData.cs
index b76d7089700..c66aea0cbd2 100644
--- a/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineExtensionImageData.cs
+++ b/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineExtensionImageData.cs
@@ -11,7 +11,11 @@
 
 namespace Azure.ResourceManager.Sample
 {
-    /// <summary> A class representing the VirtualMachineExtensionImage data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachineExtensionImage data model.
+    /// Describes a Virtual Machine Extension Image.
+    /// Serialized Name: VirtualMachineExtensionImage
+    /// </summary>
     public partial class VirtualMachineExtensionImageData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineExtensionImageData. </summary>
diff --git a/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetData.cs b/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetData.cs
index 8d7bcfc929e..396f478b8be 100644
--- a/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetData.cs
+++ b/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetData.cs
@@ -13,7 +13,11 @@
 
 namespace Azure.ResourceManager.Sample
 {
-    /// <summary> A class representing the VirtualMachineScaleSet data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachineScaleSet data model.
+    /// Describes a Virtual Machine Scale Set.
+    /// Serialized Name: VirtualMachineScaleSet
+    /// </summary>
     public partial class VirtualMachineScaleSetData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineScaleSetData. </summary>
diff --git a/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetExtensionData.cs b/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetExtensionData.cs
index 2abe16f129a..de5a26a063d 100644
--- a/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetExtensionData.cs
+++ b/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetExtensionData.cs
@@ -12,7 +12,11 @@
 
 namespace Azure.ResourceManager.Sample
 {
-    /// <summary> A class representing the VirtualMachineScaleSetExtension data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachineScaleSetExtension data model.
+    /// Describes a Virtual Machine Scale Set Extension.
+    /// Serialized Name: VirtualMachineScaleSetExtension
+    /// </summary>
     public partial class VirtualMachineScaleSetExtensionData : SubResourceReadOnly
     {
         /// <summary> Initializes a new instance of VirtualMachineScaleSetExtensionData. </summary>
diff --git a/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetRollingUpgradeData.cs b/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetRollingUpgradeData.cs
index a08072ad2c2..af6ceac0ae2 100644
--- a/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetRollingUpgradeData.cs
+++ b/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetRollingUpgradeData.cs
@@ -12,7 +12,11 @@
 
 namespace Azure.ResourceManager.Sample
 {
-    /// <summary> A class representing the VirtualMachineScaleSetRollingUpgrade data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachineScaleSetRollingUpgrade data model.
+    /// The status of the latest virtual machine scale set rolling upgrade.
+    /// Serialized Name: RollingUpgradeStatusInfo
+    /// </summary>
     public partial class VirtualMachineScaleSetRollingUpgradeData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineScaleSetRollingUpgradeData. </summary>
diff --git a/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetVMData.cs b/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetVMData.cs
index 91be22c232e..31b0325edcb 100644
--- a/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetVMData.cs
+++ b/samples/Azure.ResourceManager.Sample/Generated/VirtualMachineScaleSetVMData.cs
@@ -13,7 +13,11 @@
 
 namespace Azure.ResourceManager.Sample
 {
-    /// <summary> A class representing the VirtualMachineScaleSetVM data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachineScaleSetVM data model.
+    /// Describes a virtual machine scale set virtual machine.
+    /// Serialized Name: VirtualMachineScaleSetVM
+    /// </summary>
     public partial class VirtualMachineScaleSetVMData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineScaleSetVMData. </summary>
diff --git a/src/AutoRest.CSharp/Mgmt/Output/ResourceData.cs b/src/AutoRest.CSharp/Mgmt/Output/ResourceData.cs
index 36649a0747d..d4651ea16b1 100644
--- a/src/AutoRest.CSharp/Mgmt/Output/ResourceData.cs
+++ b/src/AutoRest.CSharp/Mgmt/Output/ResourceData.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using System;
 using System.Linq;
 using AutoRest.CSharp.Generation.Types;
 using AutoRest.CSharp.Input;
@@ -26,7 +27,9 @@ public ResourceData(ObjectSchema schema, string? name = default, string? nameSpa
 
         protected override string CreateDescription()
         {
-            return BuilderHelpers.EscapeXmlDescription($"A class representing the {_clientPrefix} data model.");
+            return BuilderHelpers.EscapeXmlDescription($"A class representing the {_clientPrefix} data model.") + (string.IsNullOrWhiteSpace(ObjectSchema.Language.Default.Description) ?
+                string.Empty :
+                $"{Environment.NewLine}{BuilderHelpers.EscapeXmlDescription(ObjectSchema.Language.Default.Description)}");
         }
 
         private string _clientPrefix;
diff --git a/src/assets/Azure.Core.Shared/DiagnosticScope.cs b/src/assets/Azure.Core.Shared/DiagnosticScope.cs
index 05ad78b318f..a6de3249f2d 100644
--- a/src/assets/Azure.Core.Shared/DiagnosticScope.cs
+++ b/src/assets/Azure.Core.Shared/DiagnosticScope.cs
@@ -107,7 +107,7 @@ public void AddAttribute<T>(string name, T value, Func<T, string> format)
         /// <param name="traceparent">The traceparent for the link.</param>
         /// <param name="tracestate">The tracestate for the link.</param>
         /// <param name="attributes">Optional attributes to associate with the link.</param>
-        public void AddLink(string traceparent, string tracestate, IDictionary<string, string>? attributes = null)
+        public void AddLink(string traceparent, string? tracestate, IDictionary<string, string>? attributes = null)
         {
             _activityAdapter?.AddLink(traceparent, tracestate, attributes);
         }
@@ -124,12 +124,13 @@ public void SetStartTime(DateTime dateTime)
         }
 
         /// <summary>
-        /// Sets the trace parent for the current scope.
+        /// Sets the trace context for the current scope.
         /// </summary>
         /// <param name="traceparent">The trace parent to set for the current scope.</param>
-        public void SetTraceparent(string traceparent)
+        /// <param name="tracestate">The trace state to set for the current scope.</param>
+        public void SetTraceContext(string traceparent, string? tracestate = default)
         {
-            _activityAdapter?.SetTraceparent(traceparent);
+            _activityAdapter?.SetTraceContext(traceparent, tracestate);
         }
 
         public void Dispose()
@@ -199,6 +200,7 @@ private class ActivityAdapter : IDisposable
             private DateTimeOffset _startTime;
             private List<Activity>? _links;
             private string? _traceparent;
+            private string? _tracestate;
 
             public ActivityAdapter(object? activitySource, DiagnosticSource diagnosticSource, string activityName, ActivityKind kind, object? diagnosticSourceArgs)
             {
@@ -258,7 +260,7 @@ public void AddTag(string name, object value)
                 return linkCollection;
             }
 
-            public void AddLink(string traceparent, string tracestate, IDictionary<string, string>? attributes)
+            public void AddLink(string traceparent, string? tracestate, IDictionary<string, string>? attributes)
             {
                 var linkedActivity = new Activity("LinkedActivity");
                 linkedActivity.SetW3CFormat();
@@ -334,6 +336,11 @@ public void AddLink(string traceparent, string tracestate, IDictionary<string, s
                         _currentActivity.SetParentId(_traceparent);
                     }
 
+                    if (_tracestate != null)
+                    {
+                        _currentActivity.SetTraceState(_tracestate);
+                    }
+
                     _currentActivity.Start();
                 }
 
@@ -351,7 +358,8 @@ public void AddLink(string traceparent, string tracestate, IDictionary<string, s
                     startTime: _startTime,
                     tags: _tagCollection,
                     links: GetActivitySourceLinkCollection(),
-                    parentId: _traceparent);
+                    traceparent: _traceparent,
+                    tracestate: _tracestate);
             }
 
             public void SetStartTime(DateTime startTime)
@@ -365,13 +373,14 @@ public void MarkFailed(Exception exception)
                 _diagnosticSource?.Write(_activityName + ".Exception", exception);
             }
 
-            public void SetTraceparent(string traceparent)
+            public void SetTraceContext(string traceparent, string? tracestate)
             {
                 if (_currentActivity != null)
                 {
                     throw new InvalidOperationException("Traceparent can not be set after the activity is started.");
                 }
                 _traceparent = traceparent;
+                _tracestate = tracestate;
             }
 
             public void Dispose()
@@ -418,13 +427,14 @@ static ActivityExtensions()
         private static Action<Activity, string?>? SetTraceStateStringMethod;
         private static Func<Activity, int>? GetIdFormatMethod;
         private static Action<Activity, string, object?>? ActivityAddTagMethod;
-        private static Func<object, string, int, string?, ICollection<KeyValuePair<string, object>>?, IList?, DateTimeOffset, Activity?>? ActivitySourceStartActivityMethod;
+        private static Func<object, string, int, object?, ICollection<KeyValuePair<string, object>>?, IList?, DateTimeOffset, Activity?>? ActivitySourceStartActivityMethod;
         private static Func<object, bool>? ActivitySourceHasListenersMethod;
         private static Func<string, string?, ICollection<KeyValuePair<string, object>>?, object?>? CreateActivityLinkMethod;
         private static Func<ICollection<KeyValuePair<string,object>>?>? CreateTagsCollectionMethod;
         private static Func<Activity, string, object?>? GetCustomPropertyMethod;
         private static Action<Activity, string, object>? SetCustomPropertyMethod;
         private static readonly ParameterExpression ActivityParameter = Expression.Parameter(typeof(Activity));
+        private static MethodInfo? ParseActivityContextMethod;
 
         public static object? GetCustomProperty(this Activity activity, string propertyName)
         {
@@ -687,13 +697,23 @@ public static bool ActivitySourceHasListeners(object? activitySource)
             return ActivitySourceHasListenersMethod.Invoke(activitySource);
         }
 
-        public static Activity? ActivitySourceStartActivity(object? activitySource, string activityName, int kind, DateTimeOffset startTime, ICollection<KeyValuePair<string, object>>? tags, IList? links, string? parentId)
+        public static Activity? ActivitySourceStartActivity(
+            object? activitySource,
+            string activityName,
+            int kind,
+            DateTimeOffset startTime,
+            ICollection<KeyValuePair<string, object>>? tags,
+            IList? links,
+            string? traceparent,
+            string? tracestate)
         {
             if (activitySource == null)
             {
                 return null;
             }
 
+            object? activityContext = default;
+
             if (ActivitySourceStartActivityMethod == null)
             {
                 if (ActivityLinkType == null ||
@@ -709,7 +729,7 @@ public static bool ActivitySourceHasListeners(object? activitySource)
                     {
                         typeof(string),
                         ActivityKindType,
-                        typeof(string),
+                        ActivityContextType,
                         typeof(IEnumerable<KeyValuePair<string, object>>),
                         typeof(IEnumerable<>).MakeGenericType(ActivityLinkType),
                         typeof(DateTimeOffset)
@@ -724,27 +744,38 @@ public static bool ActivitySourceHasListeners(object? activitySource)
                         var sourceParameter = Expression.Parameter(typeof(object));
                         var nameParameter = Expression.Parameter(typeof(string));
                         var kindParameter = Expression.Parameter(typeof(int));
-                        var parentIdParameter = Expression.Parameter(typeof(string));
+                        var contextParameter = Expression.Parameter(typeof(object));
                         var startTimeParameter = Expression.Parameter(typeof(DateTimeOffset));
                         var tagsParameter = Expression.Parameter(typeof(ICollection<KeyValuePair<string, object>>));
                         var linksParameter = Expression.Parameter(typeof(IList));
                         var methodParameter = method.GetParameters();
-                        ActivitySourceStartActivityMethod = Expression.Lambda<Func<object, string, int, string?, ICollection<KeyValuePair<string, object>>?, IList?, DateTimeOffset, Activity?>>(
+                        ParseActivityContextMethod = ActivityContextType.GetMethod("Parse", BindingFlags.Static | BindingFlags.Public);
+
+                        ActivitySourceStartActivityMethod = Expression.Lambda<Func<object, string, int, object?, ICollection<KeyValuePair<string, object>>?, IList?, DateTimeOffset, Activity?>>(
                             Expression.Call(
                                 Expression.Convert(sourceParameter, method.DeclaringType!),
                                 method,
                                 nameParameter,
                                 Expression.Convert(kindParameter,  methodParameter[1].ParameterType),
-                                Expression.Convert(parentIdParameter, methodParameter[2].ParameterType),
+                                Expression.Convert(contextParameter, methodParameter[2].ParameterType),
                                 Expression.Convert(tagsParameter,  methodParameter[3].ParameterType),
                                 Expression.Convert(linksParameter,  methodParameter[4].ParameterType),
                                 Expression.Convert(startTimeParameter,  methodParameter[5].ParameterType)),
-                            sourceParameter, nameParameter, kindParameter, parentIdParameter, tagsParameter, linksParameter, startTimeParameter).Compile();
+                            sourceParameter, nameParameter, kindParameter, contextParameter, tagsParameter, linksParameter, startTimeParameter).Compile();
                     }
                 }
             }
 
-            return ActivitySourceStartActivityMethod.Invoke(activitySource, activityName, kind, parentId, tags, links, startTime);
+            if (ActivityContextType != null && ParseActivityContextMethod != null)
+            {
+                if (traceparent != null)
+                    activityContext = ParseActivityContextMethod.Invoke(null, new[] {traceparent, tracestate})!;
+                else
+                    // because ActivityContext is a struct, we need to create a default instance rather than allowing the argument to be null
+                    activityContext = Activator.CreateInstance(ActivityContextType);
+            }
+
+            return ActivitySourceStartActivityMethod.Invoke(activitySource, activityName, kind, activityContext, tags, links, startTime);
         }
 
         public static object? CreateActivitySource(string name)
diff --git a/test/TestProjects/ExactMatchFlattenInheritance/Generated/AzureResourceFlattenModel1Data.cs b/test/TestProjects/ExactMatchFlattenInheritance/Generated/AzureResourceFlattenModel1Data.cs
index 4bdcea3911a..2e5d6d4ecca 100644
--- a/test/TestProjects/ExactMatchFlattenInheritance/Generated/AzureResourceFlattenModel1Data.cs
+++ b/test/TestProjects/ExactMatchFlattenInheritance/Generated/AzureResourceFlattenModel1Data.cs
@@ -11,7 +11,10 @@
 
 namespace ExactMatchFlattenInheritance
 {
-    /// <summary> A class representing the AzureResourceFlattenModel1 data model. </summary>
+    /// <summary>
+    /// A class representing the AzureResourceFlattenModel1 data model.
+    /// This model is x-ms-azure-resource, has flatten properties, and it contains all reference type properties.
+    /// </summary>
     public partial class AzureResourceFlattenModel1Data : TrackedResourceData
     {
         /// <summary> Initializes a new instance of AzureResourceFlattenModel1Data. </summary>
diff --git a/test/TestProjects/ExactMatchFlattenInheritance/Generated/CustomModel2Data.cs b/test/TestProjects/ExactMatchFlattenInheritance/Generated/CustomModel2Data.cs
index 32a78648a0b..1171485ab89 100644
--- a/test/TestProjects/ExactMatchFlattenInheritance/Generated/CustomModel2Data.cs
+++ b/test/TestProjects/ExactMatchFlattenInheritance/Generated/CustomModel2Data.cs
@@ -10,7 +10,10 @@
 
 namespace ExactMatchFlattenInheritance
 {
-    /// <summary> A class representing the CustomModel2 data model. </summary>
+    /// <summary>
+    /// A class representing the CustomModel2 data model.
+    /// Pure custom model, the purpose is to pull in a SubResource model so that it can be generated.
+    /// </summary>
     public partial class CustomModel2Data : ResourceData
     {
         /// <summary> Initializes a new instance of CustomModel2Data. </summary>
diff --git a/test/TestProjects/ExactMatchFlattenInheritance/Generated/CustomModel3Data.cs b/test/TestProjects/ExactMatchFlattenInheritance/Generated/CustomModel3Data.cs
index 8ced9490837..4ba4880a703 100644
--- a/test/TestProjects/ExactMatchFlattenInheritance/Generated/CustomModel3Data.cs
+++ b/test/TestProjects/ExactMatchFlattenInheritance/Generated/CustomModel3Data.cs
@@ -9,7 +9,10 @@
 
 namespace ExactMatchFlattenInheritance
 {
-    /// <summary> A class representing the CustomModel3 data model. </summary>
+    /// <summary>
+    /// A class representing the CustomModel3 data model.
+    /// Pure custom model, the purpose is to pull in a WritableSubResource model so that it can be generated.
+    /// </summary>
     public partial class CustomModel3Data : AzureResourceFlattenModel7
     {
         /// <summary> Initializes a new instance of CustomModel3Data. </summary>
diff --git a/test/TestProjects/MgmtCollectionParent/Generated/OrderResourceData.cs b/test/TestProjects/MgmtCollectionParent/Generated/OrderResourceData.cs
index 78196d16bb9..08ead16c7c1 100644
--- a/test/TestProjects/MgmtCollectionParent/Generated/OrderResourceData.cs
+++ b/test/TestProjects/MgmtCollectionParent/Generated/OrderResourceData.cs
@@ -12,7 +12,10 @@
 
 namespace MgmtCollectionParent
 {
-    /// <summary> A class representing the OrderResource data model. </summary>
+    /// <summary>
+    /// A class representing the OrderResource data model.
+    /// Specifies the properties or parameters for an order. Order is a grouping of one or more order items.
+    /// </summary>
     public partial class OrderResourceData : ResourceData
     {
         /// <summary> Initializes a new instance of OrderResourceData. </summary>
diff --git a/test/TestProjects/MgmtDiscriminator/Generated/DeliveryRuleData.cs b/test/TestProjects/MgmtDiscriminator/Generated/DeliveryRuleData.cs
index f651efc2edf..9e2011c4a5c 100644
--- a/test/TestProjects/MgmtDiscriminator/Generated/DeliveryRuleData.cs
+++ b/test/TestProjects/MgmtDiscriminator/Generated/DeliveryRuleData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtDiscriminator
 {
-    /// <summary> A class representing the DeliveryRule data model. </summary>
+    /// <summary>
+    /// A class representing the DeliveryRule data model.
+    /// A rule that specifies a set of actions and conditions
+    /// </summary>
     public partial class DeliveryRuleData : ResourceData
     {
         /// <summary> Initializes a new instance of DeliveryRuleData. </summary>
diff --git a/test/TestProjects/MgmtExpandResourceTypes/Generated/RecordSetData.cs b/test/TestProjects/MgmtExpandResourceTypes/Generated/RecordSetData.cs
index 63da97d5be3..f2dc54af8bf 100644
--- a/test/TestProjects/MgmtExpandResourceTypes/Generated/RecordSetData.cs
+++ b/test/TestProjects/MgmtExpandResourceTypes/Generated/RecordSetData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtExpandResourceTypes
 {
-    /// <summary> A class representing the RecordSet data model. </summary>
+    /// <summary>
+    /// A class representing the RecordSet data model.
+    /// Describes a DNS record set (a collection of DNS records with the same name and type).
+    /// </summary>
     public partial class RecordSetData : ResourceData
     {
         /// <summary> Initializes a new instance of RecordSetData. </summary>
diff --git a/test/TestProjects/MgmtExpandResourceTypes/Generated/ZoneData.cs b/test/TestProjects/MgmtExpandResourceTypes/Generated/ZoneData.cs
index d71340e5135..6ab547d5ae7 100644
--- a/test/TestProjects/MgmtExpandResourceTypes/Generated/ZoneData.cs
+++ b/test/TestProjects/MgmtExpandResourceTypes/Generated/ZoneData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtExpandResourceTypes
 {
-    /// <summary> A class representing the Zone data model. </summary>
+    /// <summary>
+    /// A class representing the Zone data model.
+    /// Describes a DNS zone.
+    /// </summary>
     public partial class ZoneData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of ZoneData. </summary>
diff --git a/test/TestProjects/MgmtExtensionCommonRestOperation/Generated/TypeOneData.cs b/test/TestProjects/MgmtExtensionCommonRestOperation/Generated/TypeOneData.cs
index ebb61463f54..fe430701a34 100644
--- a/test/TestProjects/MgmtExtensionCommonRestOperation/Generated/TypeOneData.cs
+++ b/test/TestProjects/MgmtExtensionCommonRestOperation/Generated/TypeOneData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtExtensionCommonRestOperation
 {
-    /// <summary> A class representing the TypeOne data model. </summary>
+    /// <summary>
+    /// A class representing the TypeOne data model.
+    /// The TypeOne.
+    /// </summary>
     public partial class TypeOneData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of TypeOneData. </summary>
diff --git a/test/TestProjects/MgmtExtensionCommonRestOperation/Generated/TypeTwoData.cs b/test/TestProjects/MgmtExtensionCommonRestOperation/Generated/TypeTwoData.cs
index 6ed22f364f0..964c5dd7f39 100644
--- a/test/TestProjects/MgmtExtensionCommonRestOperation/Generated/TypeTwoData.cs
+++ b/test/TestProjects/MgmtExtensionCommonRestOperation/Generated/TypeTwoData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtExtensionCommonRestOperation
 {
-    /// <summary> A class representing the TypeTwo data model. </summary>
+    /// <summary>
+    /// A class representing the TypeTwo data model.
+    /// The TypeTwo.
+    /// </summary>
     public partial class TypeTwoData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of TypeTwoData. </summary>
diff --git a/test/TestProjects/MgmtExtensionResource/Generated/PolicyDefinitionData.cs b/test/TestProjects/MgmtExtensionResource/Generated/PolicyDefinitionData.cs
index 4c830562f2b..840bec1b322 100644
--- a/test/TestProjects/MgmtExtensionResource/Generated/PolicyDefinitionData.cs
+++ b/test/TestProjects/MgmtExtensionResource/Generated/PolicyDefinitionData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtExtensionResource
 {
-    /// <summary> A class representing the PolicyDefinition data model. </summary>
+    /// <summary>
+    /// A class representing the PolicyDefinition data model.
+    /// The policy definition.
+    /// </summary>
     public partial class PolicyDefinitionData : ResourceData
     {
         /// <summary> Initializes a new instance of PolicyDefinitionData. </summary>
diff --git a/test/TestProjects/MgmtExtensionResource/Generated/SubSingletonData.cs b/test/TestProjects/MgmtExtensionResource/Generated/SubSingletonData.cs
index a86819ee239..d7271657a93 100644
--- a/test/TestProjects/MgmtExtensionResource/Generated/SubSingletonData.cs
+++ b/test/TestProjects/MgmtExtensionResource/Generated/SubSingletonData.cs
@@ -10,7 +10,10 @@
 
 namespace MgmtExtensionResource
 {
-    /// <summary> A class representing the SubSingleton data model. </summary>
+    /// <summary>
+    /// A class representing the SubSingleton data model.
+    /// SubSingleton object.
+    /// </summary>
     public partial class SubSingletonData : ResourceData
     {
         /// <summary> Initializes a new instance of SubSingletonData. </summary>
diff --git a/test/TestProjects/MgmtHierarchicalNonResource/Generated/SharedGalleryData.cs b/test/TestProjects/MgmtHierarchicalNonResource/Generated/SharedGalleryData.cs
index 36445662e9e..336df88dccb 100644
--- a/test/TestProjects/MgmtHierarchicalNonResource/Generated/SharedGalleryData.cs
+++ b/test/TestProjects/MgmtHierarchicalNonResource/Generated/SharedGalleryData.cs
@@ -10,7 +10,10 @@
 
 namespace MgmtHierarchicalNonResource
 {
-    /// <summary> A class representing the SharedGallery data model. </summary>
+    /// <summary>
+    /// A class representing the SharedGallery data model.
+    /// Specifies information about the Shared Gallery that you want to create or update.
+    /// </summary>
     public partial class SharedGalleryData : PirSharedGalleryResource
     {
         /// <summary> Initializes a new instance of SharedGalleryData. </summary>
diff --git a/test/TestProjects/MgmtLRO/Generated/BarData.cs b/test/TestProjects/MgmtLRO/Generated/BarData.cs
index 62b221a0c36..27aa57e42a7 100644
--- a/test/TestProjects/MgmtLRO/Generated/BarData.cs
+++ b/test/TestProjects/MgmtLRO/Generated/BarData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtLRO
 {
-    /// <summary> A class representing the Bar data model. </summary>
+    /// <summary>
+    /// A class representing the Bar data model.
+    /// Specifies information about the fake that the virtual machine should be assigned to. Virtual machines specified in the same fake are allocated to different nodes to maximize availability. For more information about fakes, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to fake at creation time. An existing VM cannot be added to an fake.
+    /// </summary>
     public partial class BarData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of BarData. </summary>
diff --git a/test/TestProjects/MgmtLRO/Generated/FakeData.cs b/test/TestProjects/MgmtLRO/Generated/FakeData.cs
index be822ad3b98..6f320b2d03c 100644
--- a/test/TestProjects/MgmtLRO/Generated/FakeData.cs
+++ b/test/TestProjects/MgmtLRO/Generated/FakeData.cs
@@ -12,7 +12,10 @@
 
 namespace MgmtLRO
 {
-    /// <summary> A class representing the Fake data model. </summary>
+    /// <summary>
+    /// A class representing the Fake data model.
+    /// Specifies information about the fake that the virtual machine should be assigned to. Virtual machines specified in the same fake are allocated to different nodes to maximize availability. For more information about fakes, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to fake at creation time. An existing VM cannot be added to an fake.
+    /// </summary>
     public partial class FakeData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of FakeData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/FakeConfigurationData.cs b/test/TestProjects/MgmtListMethods/Generated/FakeConfigurationData.cs
index 572ee354ac9..8c74aeefaf7 100644
--- a/test/TestProjects/MgmtListMethods/Generated/FakeConfigurationData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/FakeConfigurationData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the FakeConfiguration data model. </summary>
+    /// <summary>
+    /// A class representing the FakeConfiguration data model.
+    /// Describes the properties of a Fake Configuration.
+    /// </summary>
     public partial class FakeConfigurationData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of FakeConfigurationData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/FakeData.cs b/test/TestProjects/MgmtListMethods/Generated/FakeData.cs
index 91b4b27fcef..e1e14219afb 100644
--- a/test/TestProjects/MgmtListMethods/Generated/FakeData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/FakeData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the Fake data model. </summary>
+    /// <summary>
+    /// A class representing the Fake data model.
+    /// Specifies information about the fake that the virtual machine should be assigned to. Virtual machines specified in the same fake are allocated to different nodes to maximize availability. For more information about fakes, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to fake at creation time. An existing VM cannot be added to an fake.
+    /// </summary>
     public partial class FakeData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of FakeData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/FakeParentData.cs b/test/TestProjects/MgmtListMethods/Generated/FakeParentData.cs
index 54825d9f786..2d31cb811ca 100644
--- a/test/TestProjects/MgmtListMethods/Generated/FakeParentData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/FakeParentData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the FakeParent data model. </summary>
+    /// <summary>
+    /// A class representing the FakeParent data model.
+    /// Specifies information.
+    /// </summary>
     public partial class FakeParentData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of FakeParentData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorData.cs b/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorData.cs
index 0cd5ab23da1..ace7441496d 100644
--- a/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the FakeParentWithAncestor data model. </summary>
+    /// <summary>
+    /// A class representing the FakeParentWithAncestor data model.
+    /// Specifies information.
+    /// </summary>
     public partial class FakeParentWithAncestorData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of FakeParentWithAncestorData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorWithLocData.cs b/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorWithLocData.cs
index f9551ad22a4..929bca571f9 100644
--- a/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorWithLocData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorWithLocData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the FakeParentWithAncestorWithLoc data model. </summary>
+    /// <summary>
+    /// A class representing the FakeParentWithAncestorWithLoc data model.
+    /// Specifies information.
+    /// </summary>
     public partial class FakeParentWithAncestorWithLocData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of FakeParentWithAncestorWithLocData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorWithNonResChData.cs b/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorWithNonResChData.cs
index 06c114f473e..2337754756a 100644
--- a/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorWithNonResChData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorWithNonResChData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the FakeParentWithAncestorWithNonResCh data model. </summary>
+    /// <summary>
+    /// A class representing the FakeParentWithAncestorWithNonResCh data model.
+    /// Specifies information.
+    /// </summary>
     public partial class FakeParentWithAncestorWithNonResChData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of FakeParentWithAncestorWithNonResChData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorWithNonResChWithLocData.cs b/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorWithNonResChWithLocData.cs
index 505b1d6455a..c84cff23d15 100644
--- a/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorWithNonResChWithLocData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/FakeParentWithAncestorWithNonResChWithLocData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the FakeParentWithAncestorWithNonResChWithLoc data model. </summary>
+    /// <summary>
+    /// A class representing the FakeParentWithAncestorWithNonResChWithLoc data model.
+    /// Specifies information.
+    /// </summary>
     public partial class FakeParentWithAncestorWithNonResChWithLocData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of FakeParentWithAncestorWithNonResChWithLocData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/FakeParentWithNonResChData.cs b/test/TestProjects/MgmtListMethods/Generated/FakeParentWithNonResChData.cs
index ac3341c0e1e..bfabba20508 100644
--- a/test/TestProjects/MgmtListMethods/Generated/FakeParentWithNonResChData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/FakeParentWithNonResChData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the FakeParentWithNonResCh data model. </summary>
+    /// <summary>
+    /// A class representing the FakeParentWithNonResCh data model.
+    /// Specifies information.
+    /// </summary>
     public partial class FakeParentWithNonResChData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of FakeParentWithNonResChData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/MgmtGroupParentData.cs b/test/TestProjects/MgmtListMethods/Generated/MgmtGroupParentData.cs
index 5d82f838d4c..f210d0a0bee 100644
--- a/test/TestProjects/MgmtListMethods/Generated/MgmtGroupParentData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/MgmtGroupParentData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the MgmtGroupParent data model. </summary>
+    /// <summary>
+    /// A class representing the MgmtGroupParent data model.
+    /// Specifies information.
+    /// </summary>
     public partial class MgmtGroupParentData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of MgmtGroupParentData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/MgmtGrpParentWithLocData.cs b/test/TestProjects/MgmtListMethods/Generated/MgmtGrpParentWithLocData.cs
index 588eb40958f..a3b07815e43 100644
--- a/test/TestProjects/MgmtListMethods/Generated/MgmtGrpParentWithLocData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/MgmtGrpParentWithLocData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the MgmtGrpParentWithLoc data model. </summary>
+    /// <summary>
+    /// A class representing the MgmtGrpParentWithLoc data model.
+    /// Specifies information.
+    /// </summary>
     public partial class MgmtGrpParentWithLocData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of MgmtGrpParentWithLocData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/MgmtGrpParentWithNonResChData.cs b/test/TestProjects/MgmtListMethods/Generated/MgmtGrpParentWithNonResChData.cs
index 3ca4f51d123..211580841a5 100644
--- a/test/TestProjects/MgmtListMethods/Generated/MgmtGrpParentWithNonResChData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/MgmtGrpParentWithNonResChData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the MgmtGrpParentWithNonResCh data model. </summary>
+    /// <summary>
+    /// A class representing the MgmtGrpParentWithNonResCh data model.
+    /// Specifies information.
+    /// </summary>
     public partial class MgmtGrpParentWithNonResChData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of MgmtGrpParentWithNonResChData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/MgmtGrpParentWithNonResChWithLocData.cs b/test/TestProjects/MgmtListMethods/Generated/MgmtGrpParentWithNonResChWithLocData.cs
index 681a21d3b15..9c66c06adf7 100644
--- a/test/TestProjects/MgmtListMethods/Generated/MgmtGrpParentWithNonResChWithLocData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/MgmtGrpParentWithNonResChWithLocData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the MgmtGrpParentWithNonResChWithLoc data model. </summary>
+    /// <summary>
+    /// A class representing the MgmtGrpParentWithNonResChWithLoc data model.
+    /// Specifies information.
+    /// </summary>
     public partial class MgmtGrpParentWithNonResChWithLocData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of MgmtGrpParentWithNonResChWithLocData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/ResGrpParentData.cs b/test/TestProjects/MgmtListMethods/Generated/ResGrpParentData.cs
index c136cd0825d..962b4ea8dc6 100644
--- a/test/TestProjects/MgmtListMethods/Generated/ResGrpParentData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/ResGrpParentData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the ResGrpParent data model. </summary>
+    /// <summary>
+    /// A class representing the ResGrpParent data model.
+    /// Specifies information.
+    /// </summary>
     public partial class ResGrpParentData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of ResGrpParentData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorData.cs b/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorData.cs
index d3fb08ee8d0..57a445146ff 100644
--- a/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the ResGrpParentWithAncestor data model. </summary>
+    /// <summary>
+    /// A class representing the ResGrpParentWithAncestor data model.
+    /// Specifies information.
+    /// </summary>
     public partial class ResGrpParentWithAncestorData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of ResGrpParentWithAncestorData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorWithLocData.cs b/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorWithLocData.cs
index 4163dccfb4d..4e348f55989 100644
--- a/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorWithLocData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorWithLocData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the ResGrpParentWithAncestorWithLoc data model. </summary>
+    /// <summary>
+    /// A class representing the ResGrpParentWithAncestorWithLoc data model.
+    /// Specifies information.
+    /// </summary>
     public partial class ResGrpParentWithAncestorWithLocData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of ResGrpParentWithAncestorWithLocData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorWithNonResChData.cs b/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorWithNonResChData.cs
index 583c51c5630..e4a81e8af79 100644
--- a/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorWithNonResChData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorWithNonResChData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the ResGrpParentWithAncestorWithNonResCh data model. </summary>
+    /// <summary>
+    /// A class representing the ResGrpParentWithAncestorWithNonResCh data model.
+    /// Specifies information.
+    /// </summary>
     public partial class ResGrpParentWithAncestorWithNonResChData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of ResGrpParentWithAncestorWithNonResChData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorWithNonResChWithLocData.cs b/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorWithNonResChWithLocData.cs
index 1ac13735c31..bb4f24972b2 100644
--- a/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorWithNonResChWithLocData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithAncestorWithNonResChWithLocData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the ResGrpParentWithAncestorWithNonResChWithLoc data model. </summary>
+    /// <summary>
+    /// A class representing the ResGrpParentWithAncestorWithNonResChWithLoc data model.
+    /// Specifies information.
+    /// </summary>
     public partial class ResGrpParentWithAncestorWithNonResChWithLocData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of ResGrpParentWithAncestorWithNonResChWithLocData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithNonResChData.cs b/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithNonResChData.cs
index aa92c3612d7..d595e57feea 100644
--- a/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithNonResChData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/ResGrpParentWithNonResChData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the ResGrpParentWithNonResCh data model. </summary>
+    /// <summary>
+    /// A class representing the ResGrpParentWithNonResCh data model.
+    /// Specifies information.
+    /// </summary>
     public partial class ResGrpParentWithNonResChData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of ResGrpParentWithNonResChData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/SubParentData.cs b/test/TestProjects/MgmtListMethods/Generated/SubParentData.cs
index bf44a636b9a..26d9fefaabc 100644
--- a/test/TestProjects/MgmtListMethods/Generated/SubParentData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/SubParentData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the SubParent data model. </summary>
+    /// <summary>
+    /// A class representing the SubParent data model.
+    /// Specifies information.
+    /// </summary>
     public partial class SubParentData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of SubParentData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/SubParentWithLocData.cs b/test/TestProjects/MgmtListMethods/Generated/SubParentWithLocData.cs
index 3bd45973c41..90f9c33d6f4 100644
--- a/test/TestProjects/MgmtListMethods/Generated/SubParentWithLocData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/SubParentWithLocData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the SubParentWithLoc data model. </summary>
+    /// <summary>
+    /// A class representing the SubParentWithLoc data model.
+    /// Specifies information.
+    /// </summary>
     public partial class SubParentWithLocData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of SubParentWithLocData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/SubParentWithNonResChData.cs b/test/TestProjects/MgmtListMethods/Generated/SubParentWithNonResChData.cs
index 8fa157d4042..6b1b6eccb2d 100644
--- a/test/TestProjects/MgmtListMethods/Generated/SubParentWithNonResChData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/SubParentWithNonResChData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the SubParentWithNonResCh data model. </summary>
+    /// <summary>
+    /// A class representing the SubParentWithNonResCh data model.
+    /// Specifies information.
+    /// </summary>
     public partial class SubParentWithNonResChData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of SubParentWithNonResChData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/SubParentWithNonResChWithLocData.cs b/test/TestProjects/MgmtListMethods/Generated/SubParentWithNonResChWithLocData.cs
index 9c533bec9e5..9d8a27788da 100644
--- a/test/TestProjects/MgmtListMethods/Generated/SubParentWithNonResChWithLocData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/SubParentWithNonResChWithLocData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the SubParentWithNonResChWithLoc data model. </summary>
+    /// <summary>
+    /// A class representing the SubParentWithNonResChWithLoc data model.
+    /// Specifies information.
+    /// </summary>
     public partial class SubParentWithNonResChWithLocData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of SubParentWithNonResChWithLocData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/TenantParentData.cs b/test/TestProjects/MgmtListMethods/Generated/TenantParentData.cs
index 5df9f514cd7..6658a24354a 100644
--- a/test/TestProjects/MgmtListMethods/Generated/TenantParentData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/TenantParentData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the TenantParent data model. </summary>
+    /// <summary>
+    /// A class representing the TenantParent data model.
+    /// Specifies information about the fake that the virtual machine should be assigned to. Virtual machines specified in the same fake are allocated to different nodes to maximize availability. For more information about fakes, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to fake at creation time. An existing VM cannot be added to an fake.
+    /// </summary>
     public partial class TenantParentData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of TenantParentData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/TenantParentWithLocData.cs b/test/TestProjects/MgmtListMethods/Generated/TenantParentWithLocData.cs
index 392218a2f0b..b155bf950b9 100644
--- a/test/TestProjects/MgmtListMethods/Generated/TenantParentWithLocData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/TenantParentWithLocData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the TenantParentWithLoc data model. </summary>
+    /// <summary>
+    /// A class representing the TenantParentWithLoc data model.
+    /// Specifies information about the fake that the virtual machine should be assigned to. Virtual machines specified in the same fake are allocated to different nodes to maximize availability. For more information about fakes, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to fake at creation time. An existing VM cannot be added to an fake.
+    /// </summary>
     public partial class TenantParentWithLocData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of TenantParentWithLocData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/TenantParentWithNonResChData.cs b/test/TestProjects/MgmtListMethods/Generated/TenantParentWithNonResChData.cs
index 9e46f250c92..226cb59db9c 100644
--- a/test/TestProjects/MgmtListMethods/Generated/TenantParentWithNonResChData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/TenantParentWithNonResChData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the TenantParentWithNonResCh data model. </summary>
+    /// <summary>
+    /// A class representing the TenantParentWithNonResCh data model.
+    /// Specifies information about the fake that the virtual machine should be assigned to. Virtual machines specified in the same fake are allocated to different nodes to maximize availability. For more information about fakes, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to fake at creation time. An existing VM cannot be added to an fake.
+    /// </summary>
     public partial class TenantParentWithNonResChData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of TenantParentWithNonResChData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/TenantParentWithNonResChWithLocData.cs b/test/TestProjects/MgmtListMethods/Generated/TenantParentWithNonResChWithLocData.cs
index f6f632f6735..fa38e4e94f5 100644
--- a/test/TestProjects/MgmtListMethods/Generated/TenantParentWithNonResChWithLocData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/TenantParentWithNonResChWithLocData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the TenantParentWithNonResChWithLoc data model. </summary>
+    /// <summary>
+    /// A class representing the TenantParentWithNonResChWithLoc data model.
+    /// Specifies information about the fake that the virtual machine should be assigned to. Virtual machines specified in the same fake are allocated to different nodes to maximize availability. For more information about fakes, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to fake at creation time. An existing VM cannot be added to an fake.
+    /// </summary>
     public partial class TenantParentWithNonResChWithLocData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of TenantParentWithNonResChWithLocData. </summary>
diff --git a/test/TestProjects/MgmtListMethods/Generated/TenantTestData.cs b/test/TestProjects/MgmtListMethods/Generated/TenantTestData.cs
index 26f046be0a1..2ef8106bc6c 100644
--- a/test/TestProjects/MgmtListMethods/Generated/TenantTestData.cs
+++ b/test/TestProjects/MgmtListMethods/Generated/TenantTestData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtListMethods
 {
-    /// <summary> A class representing the TenantTest data model. </summary>
+    /// <summary>
+    /// A class representing the TenantTest data model.
+    /// Specifies information about the fake that the virtual machine should be assigned to. Virtual machines specified in the same fake are allocated to different nodes to maximize availability. For more information about fakes, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to fake at creation time. An existing VM cannot be added to an fake.
+    /// </summary>
     public partial class TenantTestData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of TenantTestData. </summary>
diff --git a/test/TestProjects/MgmtMockAndSample/src/Generated/DeletedVaultData.cs b/test/TestProjects/MgmtMockAndSample/src/Generated/DeletedVaultData.cs
index 326cd38771c..35059394a99 100644
--- a/test/TestProjects/MgmtMockAndSample/src/Generated/DeletedVaultData.cs
+++ b/test/TestProjects/MgmtMockAndSample/src/Generated/DeletedVaultData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtMockAndSample
 {
-    /// <summary> A class representing the DeletedVault data model. </summary>
+    /// <summary>
+    /// A class representing the DeletedVault data model.
+    /// Deleted vault information with extended details.
+    /// </summary>
     public partial class DeletedVaultData : ResourceData
     {
         /// <summary> Initializes a new instance of DeletedVaultData. </summary>
diff --git a/test/TestProjects/MgmtMockAndSample/src/Generated/DiskEncryptionSetData.cs b/test/TestProjects/MgmtMockAndSample/src/Generated/DiskEncryptionSetData.cs
index a6691015cd9..9d15777f9d2 100644
--- a/test/TestProjects/MgmtMockAndSample/src/Generated/DiskEncryptionSetData.cs
+++ b/test/TestProjects/MgmtMockAndSample/src/Generated/DiskEncryptionSetData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtMockAndSample
 {
-    /// <summary> A class representing the DiskEncryptionSet data model. </summary>
+    /// <summary>
+    /// A class representing the DiskEncryptionSet data model.
+    /// disk encryption set resource.
+    /// </summary>
     public partial class DiskEncryptionSetData : ResourceData
     {
         /// <summary> Initializes a new instance of DiskEncryptionSetData. </summary>
diff --git a/test/TestProjects/MgmtMockAndSample/src/Generated/FirewallPolicyData.cs b/test/TestProjects/MgmtMockAndSample/src/Generated/FirewallPolicyData.cs
index 02a885021d8..62e618c34e0 100644
--- a/test/TestProjects/MgmtMockAndSample/src/Generated/FirewallPolicyData.cs
+++ b/test/TestProjects/MgmtMockAndSample/src/Generated/FirewallPolicyData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtMockAndSample
 {
-    /// <summary> A class representing the FirewallPolicy data model. </summary>
+    /// <summary>
+    /// A class representing the FirewallPolicy data model.
+    /// FirewallPolicy Resource.
+    /// </summary>
     public partial class FirewallPolicyData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of FirewallPolicyData. </summary>
diff --git a/test/TestProjects/MgmtMockAndSample/src/Generated/FirewallPolicyRuleCollectionGroupData.cs b/test/TestProjects/MgmtMockAndSample/src/Generated/FirewallPolicyRuleCollectionGroupData.cs
index d1fd5cdab5e..8eb7f8b0a29 100644
--- a/test/TestProjects/MgmtMockAndSample/src/Generated/FirewallPolicyRuleCollectionGroupData.cs
+++ b/test/TestProjects/MgmtMockAndSample/src/Generated/FirewallPolicyRuleCollectionGroupData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtMockAndSample
 {
-    /// <summary> A class representing the FirewallPolicyRuleCollectionGroup data model. </summary>
+    /// <summary>
+    /// A class representing the FirewallPolicyRuleCollectionGroup data model.
+    /// Rule Collection Group resource.
+    /// </summary>
     public partial class FirewallPolicyRuleCollectionGroupData : SubResource
     {
         /// <summary> Initializes a new instance of FirewallPolicyRuleCollectionGroupData. </summary>
diff --git a/test/TestProjects/MgmtMockAndSample/src/Generated/GuestConfigurationAssignmentData.cs b/test/TestProjects/MgmtMockAndSample/src/Generated/GuestConfigurationAssignmentData.cs
index 5bc68efc8cd..cddc33308c9 100644
--- a/test/TestProjects/MgmtMockAndSample/src/Generated/GuestConfigurationAssignmentData.cs
+++ b/test/TestProjects/MgmtMockAndSample/src/Generated/GuestConfigurationAssignmentData.cs
@@ -10,7 +10,10 @@
 
 namespace MgmtMockAndSample
 {
-    /// <summary> A class representing the GuestConfigurationAssignment data model. </summary>
+    /// <summary>
+    /// A class representing the GuestConfigurationAssignment data model.
+    /// Guest configuration assignment is an association between a machine and guest configuration.
+    /// </summary>
     public partial class GuestConfigurationAssignmentData : GuestConfigurationBaseResource
     {
         /// <summary> Initializes a new instance of GuestConfigurationAssignmentData. </summary>
diff --git a/test/TestProjects/MgmtMockAndSample/src/Generated/ManagedHsmData.cs b/test/TestProjects/MgmtMockAndSample/src/Generated/ManagedHsmData.cs
index ea58bf639c6..31c624269e8 100644
--- a/test/TestProjects/MgmtMockAndSample/src/Generated/ManagedHsmData.cs
+++ b/test/TestProjects/MgmtMockAndSample/src/Generated/ManagedHsmData.cs
@@ -12,7 +12,10 @@
 
 namespace MgmtMockAndSample
 {
-    /// <summary> A class representing the ManagedHsm data model. </summary>
+    /// <summary>
+    /// A class representing the ManagedHsm data model.
+    /// Resource information with extended details.
+    /// </summary>
     public partial class ManagedHsmData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of ManagedHsmData. </summary>
diff --git a/test/TestProjects/MgmtMockAndSample/src/Generated/MgmtMockAndSamplePrivateEndpointConnectionData.cs b/test/TestProjects/MgmtMockAndSample/src/Generated/MgmtMockAndSamplePrivateEndpointConnectionData.cs
index 398ee196ca2..3841a19fd57 100644
--- a/test/TestProjects/MgmtMockAndSample/src/Generated/MgmtMockAndSamplePrivateEndpointConnectionData.cs
+++ b/test/TestProjects/MgmtMockAndSample/src/Generated/MgmtMockAndSamplePrivateEndpointConnectionData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtMockAndSample
 {
-    /// <summary> A class representing the MgmtMockAndSamplePrivateEndpointConnection data model. </summary>
+    /// <summary>
+    /// A class representing the MgmtMockAndSamplePrivateEndpointConnection data model.
+    /// Private endpoint connection resource.
+    /// </summary>
     public partial class MgmtMockAndSamplePrivateEndpointConnectionData : ResourceData
     {
         /// <summary> Initializes a new instance of MgmtMockAndSamplePrivateEndpointConnectionData. </summary>
diff --git a/test/TestProjects/MgmtMockAndSample/src/Generated/MhsmPrivateEndpointConnectionData.cs b/test/TestProjects/MgmtMockAndSample/src/Generated/MhsmPrivateEndpointConnectionData.cs
index fe401d15410..1aef4c1b746 100644
--- a/test/TestProjects/MgmtMockAndSample/src/Generated/MhsmPrivateEndpointConnectionData.cs
+++ b/test/TestProjects/MgmtMockAndSample/src/Generated/MhsmPrivateEndpointConnectionData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtMockAndSample
 {
-    /// <summary> A class representing the MhsmPrivateEndpointConnection data model. </summary>
+    /// <summary>
+    /// A class representing the MhsmPrivateEndpointConnection data model.
+    /// Private endpoint connection resource.
+    /// </summary>
     public partial class MhsmPrivateEndpointConnectionData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of MhsmPrivateEndpointConnectionData. </summary>
diff --git a/test/TestProjects/MgmtMockAndSample/src/Generated/RoleAssignmentData.cs b/test/TestProjects/MgmtMockAndSample/src/Generated/RoleAssignmentData.cs
index 14b6ed8bcf4..04d59d3e529 100644
--- a/test/TestProjects/MgmtMockAndSample/src/Generated/RoleAssignmentData.cs
+++ b/test/TestProjects/MgmtMockAndSample/src/Generated/RoleAssignmentData.cs
@@ -10,7 +10,10 @@
 
 namespace MgmtMockAndSample
 {
-    /// <summary> A class representing the RoleAssignment data model. </summary>
+    /// <summary>
+    /// A class representing the RoleAssignment data model.
+    /// Role Assignments
+    /// </summary>
     public partial class RoleAssignmentData : ResourceData
     {
         /// <summary> Initializes a new instance of RoleAssignmentData. </summary>
diff --git a/test/TestProjects/MgmtMockAndSample/src/Generated/VaultData.cs b/test/TestProjects/MgmtMockAndSample/src/Generated/VaultData.cs
index 096acb6f627..2949911186a 100644
--- a/test/TestProjects/MgmtMockAndSample/src/Generated/VaultData.cs
+++ b/test/TestProjects/MgmtMockAndSample/src/Generated/VaultData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtMockAndSample
 {
-    /// <summary> A class representing the Vault data model. </summary>
+    /// <summary>
+    /// A class representing the Vault data model.
+    /// Resource information with extended details.
+    /// </summary>
     public partial class VaultData : ResourceData
     {
         /// <summary> Initializes a new instance of VaultData. </summary>
diff --git a/test/TestProjects/MgmtMockAndSample/src/Generated/VirtualMachineExtensionImageData.cs b/test/TestProjects/MgmtMockAndSample/src/Generated/VirtualMachineExtensionImageData.cs
index cb086dcea0b..89644b93203 100644
--- a/test/TestProjects/MgmtMockAndSample/src/Generated/VirtualMachineExtensionImageData.cs
+++ b/test/TestProjects/MgmtMockAndSample/src/Generated/VirtualMachineExtensionImageData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtMockAndSample
 {
-    /// <summary> A class representing the VirtualMachineExtensionImage data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachineExtensionImage data model.
+    /// Describes a Virtual Machine Extension Image.
+    /// </summary>
     public partial class VirtualMachineExtensionImageData : ResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineExtensionImageData. </summary>
diff --git a/test/TestProjects/MgmtMultipleParentResource/Generated/AnotherParentData.cs b/test/TestProjects/MgmtMultipleParentResource/Generated/AnotherParentData.cs
index ef62540d90d..b384610afe9 100644
--- a/test/TestProjects/MgmtMultipleParentResource/Generated/AnotherParentData.cs
+++ b/test/TestProjects/MgmtMultipleParentResource/Generated/AnotherParentData.cs
@@ -12,7 +12,10 @@
 
 namespace MgmtMultipleParentResource
 {
-    /// <summary> A class representing the AnotherParent data model. </summary>
+    /// <summary>
+    /// A class representing the AnotherParent data model.
+    /// Describes a Virtual Machine run command.
+    /// </summary>
     public partial class AnotherParentData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of AnotherParentData. </summary>
diff --git a/test/TestProjects/MgmtMultipleParentResource/Generated/ChildBodyData.cs b/test/TestProjects/MgmtMultipleParentResource/Generated/ChildBodyData.cs
index 72e2cc26a43..5e17e70745b 100644
--- a/test/TestProjects/MgmtMultipleParentResource/Generated/ChildBodyData.cs
+++ b/test/TestProjects/MgmtMultipleParentResource/Generated/ChildBodyData.cs
@@ -12,7 +12,10 @@
 
 namespace MgmtMultipleParentResource
 {
-    /// <summary> A class representing the ChildBody data model. </summary>
+    /// <summary>
+    /// A class representing the ChildBody data model.
+    /// Describes a Virtual Machine run command.
+    /// </summary>
     public partial class ChildBodyData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of ChildBodyData. </summary>
diff --git a/test/TestProjects/MgmtMultipleParentResource/Generated/SubParentData.cs b/test/TestProjects/MgmtMultipleParentResource/Generated/SubParentData.cs
index 8a819cdd4d0..4d0228a227b 100644
--- a/test/TestProjects/MgmtMultipleParentResource/Generated/SubParentData.cs
+++ b/test/TestProjects/MgmtMultipleParentResource/Generated/SubParentData.cs
@@ -12,7 +12,10 @@
 
 namespace MgmtMultipleParentResource
 {
-    /// <summary> A class representing the SubParent data model. </summary>
+    /// <summary>
+    /// A class representing the SubParent data model.
+    /// Describes a Virtual Machine run command.
+    /// </summary>
     public partial class SubParentData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of SubParentData. </summary>
diff --git a/test/TestProjects/MgmtMultipleParentResource/Generated/TheParentData.cs b/test/TestProjects/MgmtMultipleParentResource/Generated/TheParentData.cs
index bd2749476bb..3bcd5543f8b 100644
--- a/test/TestProjects/MgmtMultipleParentResource/Generated/TheParentData.cs
+++ b/test/TestProjects/MgmtMultipleParentResource/Generated/TheParentData.cs
@@ -12,7 +12,10 @@
 
 namespace MgmtMultipleParentResource
 {
-    /// <summary> A class representing the TheParent data model. </summary>
+    /// <summary>
+    /// A class representing the TheParent data model.
+    /// Describes a Virtual Machine run command.
+    /// </summary>
     public partial class TheParentData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of TheParentData. </summary>
diff --git a/test/TestProjects/MgmtNonStringPathVariable/Generated/BarData.cs b/test/TestProjects/MgmtNonStringPathVariable/Generated/BarData.cs
index 742d99728ab..d12fcdbe26a 100644
--- a/test/TestProjects/MgmtNonStringPathVariable/Generated/BarData.cs
+++ b/test/TestProjects/MgmtNonStringPathVariable/Generated/BarData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtNonStringPathVariable
 {
-    /// <summary> A class representing the Bar data model. </summary>
+    /// <summary>
+    /// A class representing the Bar data model.
+    /// Specifies information about the fake that the virtual machine should be assigned to. Virtual machines specified in the same fake are allocated to different nodes to maximize availability. For more information about fakes, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to fake at creation time. An existing VM cannot be added to an fake.
+    /// </summary>
     public partial class BarData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of BarData. </summary>
diff --git a/test/TestProjects/MgmtNonStringPathVariable/Generated/FakeData.cs b/test/TestProjects/MgmtNonStringPathVariable/Generated/FakeData.cs
index 0e7a88a542f..bdf82c98a30 100644
--- a/test/TestProjects/MgmtNonStringPathVariable/Generated/FakeData.cs
+++ b/test/TestProjects/MgmtNonStringPathVariable/Generated/FakeData.cs
@@ -12,7 +12,10 @@
 
 namespace MgmtNonStringPathVariable
 {
-    /// <summary> A class representing the Fake data model. </summary>
+    /// <summary>
+    /// A class representing the Fake data model.
+    /// Specifies information about the fake that the virtual machine should be assigned to. Virtual machines specified in the same fake are allocated to different nodes to maximize availability. For more information about fakes, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to fake at creation time. An existing VM cannot be added to an fake.
+    /// </summary>
     public partial class FakeData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of FakeData. </summary>
diff --git a/test/TestProjects/MgmtOperations/Generated/AvailabilitySetChildData.cs b/test/TestProjects/MgmtOperations/Generated/AvailabilitySetChildData.cs
index 32cbfcc0266..51022038b41 100644
--- a/test/TestProjects/MgmtOperations/Generated/AvailabilitySetChildData.cs
+++ b/test/TestProjects/MgmtOperations/Generated/AvailabilitySetChildData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtOperations
 {
-    /// <summary> A class representing the AvailabilitySetChild data model. </summary>
+    /// <summary>
+    /// A class representing the AvailabilitySetChild data model.
+    /// Specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
+    /// </summary>
     public partial class AvailabilitySetChildData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of AvailabilitySetChildData. </summary>
diff --git a/test/TestProjects/MgmtOperations/Generated/AvailabilitySetData.cs b/test/TestProjects/MgmtOperations/Generated/AvailabilitySetData.cs
index 3ab1b3494e8..017cec32aae 100644
--- a/test/TestProjects/MgmtOperations/Generated/AvailabilitySetData.cs
+++ b/test/TestProjects/MgmtOperations/Generated/AvailabilitySetData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtOperations
 {
-    /// <summary> A class representing the AvailabilitySet data model. </summary>
+    /// <summary>
+    /// A class representing the AvailabilitySet data model.
+    /// Specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
+    /// </summary>
     public partial class AvailabilitySetData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of AvailabilitySetData. </summary>
diff --git a/test/TestProjects/MgmtOperations/Generated/AvailabilitySetGrandChildData.cs b/test/TestProjects/MgmtOperations/Generated/AvailabilitySetGrandChildData.cs
index aecc0aad56e..d3f1e28ce3f 100644
--- a/test/TestProjects/MgmtOperations/Generated/AvailabilitySetGrandChildData.cs
+++ b/test/TestProjects/MgmtOperations/Generated/AvailabilitySetGrandChildData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtOperations
 {
-    /// <summary> A class representing the AvailabilitySetGrandChild data model. </summary>
+    /// <summary>
+    /// A class representing the AvailabilitySetGrandChild data model.
+    /// Specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
+    /// </summary>
     public partial class AvailabilitySetGrandChildData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of AvailabilitySetGrandChildData. </summary>
diff --git a/test/TestProjects/MgmtOperations/Generated/UnpatchableResourceData.cs b/test/TestProjects/MgmtOperations/Generated/UnpatchableResourceData.cs
index 38da5d1cc21..be31ada072a 100644
--- a/test/TestProjects/MgmtOperations/Generated/UnpatchableResourceData.cs
+++ b/test/TestProjects/MgmtOperations/Generated/UnpatchableResourceData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtOperations
 {
-    /// <summary> A class representing the UnpatchableResource data model. </summary>
+    /// <summary>
+    /// A class representing the UnpatchableResource data model.
+    /// Specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
+    /// </summary>
     public partial class UnpatchableResourceData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of UnpatchableResourceData. </summary>
diff --git a/test/TestProjects/MgmtOptionalConstant/Generated/OptionalMachineData.cs b/test/TestProjects/MgmtOptionalConstant/Generated/OptionalMachineData.cs
index 1246124f33c..99847ddc877 100644
--- a/test/TestProjects/MgmtOptionalConstant/Generated/OptionalMachineData.cs
+++ b/test/TestProjects/MgmtOptionalConstant/Generated/OptionalMachineData.cs
@@ -12,7 +12,10 @@
 
 namespace MgmtOptionalConstant
 {
-    /// <summary> A class representing the OptionalMachine data model. </summary>
+    /// <summary>
+    /// A class representing the OptionalMachine data model.
+    /// Describes a Virtual Machine.
+    /// </summary>
     public partial class OptionalMachineData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of OptionalMachineData. </summary>
diff --git a/test/TestProjects/MgmtParamOrdering/Generated/AvailabilitySetData.cs b/test/TestProjects/MgmtParamOrdering/Generated/AvailabilitySetData.cs
index 3b7cf4cbd84..bd1d2de4f04 100644
--- a/test/TestProjects/MgmtParamOrdering/Generated/AvailabilitySetData.cs
+++ b/test/TestProjects/MgmtParamOrdering/Generated/AvailabilitySetData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtParamOrdering
 {
-    /// <summary> A class representing the AvailabilitySet data model. </summary>
+    /// <summary>
+    /// A class representing the AvailabilitySet data model.
+    /// Specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
+    /// </summary>
     public partial class AvailabilitySetData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of AvailabilitySetData. </summary>
diff --git a/test/TestProjects/MgmtParamOrdering/Generated/DedicatedHostData.cs b/test/TestProjects/MgmtParamOrdering/Generated/DedicatedHostData.cs
index 9ef43a81539..3e7b1361560 100644
--- a/test/TestProjects/MgmtParamOrdering/Generated/DedicatedHostData.cs
+++ b/test/TestProjects/MgmtParamOrdering/Generated/DedicatedHostData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtParamOrdering
 {
-    /// <summary> A class representing the DedicatedHost data model. </summary>
+    /// <summary>
+    /// A class representing the DedicatedHost data model.
+    /// Specifies information about the Dedicated host.
+    /// </summary>
     public partial class DedicatedHostData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of DedicatedHostData. </summary>
diff --git a/test/TestProjects/MgmtParamOrdering/Generated/DedicatedHostGroupData.cs b/test/TestProjects/MgmtParamOrdering/Generated/DedicatedHostGroupData.cs
index b877b55c187..d3ed7921e3f 100644
--- a/test/TestProjects/MgmtParamOrdering/Generated/DedicatedHostGroupData.cs
+++ b/test/TestProjects/MgmtParamOrdering/Generated/DedicatedHostGroupData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtParamOrdering
 {
-    /// <summary> A class representing the DedicatedHostGroup data model. </summary>
+    /// <summary>
+    /// A class representing the DedicatedHostGroup data model.
+    /// Specifies information about the Dedicated host.
+    /// </summary>
     public partial class DedicatedHostGroupData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of DedicatedHostGroupData. </summary>
diff --git a/test/TestProjects/MgmtParamOrdering/Generated/EnvironmentContainerResourceData.cs b/test/TestProjects/MgmtParamOrdering/Generated/EnvironmentContainerResourceData.cs
index 5ee4af52b3e..c0e006a63b6 100644
--- a/test/TestProjects/MgmtParamOrdering/Generated/EnvironmentContainerResourceData.cs
+++ b/test/TestProjects/MgmtParamOrdering/Generated/EnvironmentContainerResourceData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtParamOrdering
 {
-    /// <summary> A class representing the EnvironmentContainerResource data model. </summary>
+    /// <summary>
+    /// A class representing the EnvironmentContainerResource data model.
+    /// Azure Resource Manager resource envelope.
+    /// </summary>
     public partial class EnvironmentContainerResourceData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of EnvironmentContainerResourceData. </summary>
diff --git a/test/TestProjects/MgmtParamOrdering/Generated/VirtualMachineExtensionImageData.cs b/test/TestProjects/MgmtParamOrdering/Generated/VirtualMachineExtensionImageData.cs
index 884219a4582..ff5497d98f4 100644
--- a/test/TestProjects/MgmtParamOrdering/Generated/VirtualMachineExtensionImageData.cs
+++ b/test/TestProjects/MgmtParamOrdering/Generated/VirtualMachineExtensionImageData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtParamOrdering
 {
-    /// <summary> A class representing the VirtualMachineExtensionImage data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachineExtensionImage data model.
+    /// The VirtualMachineExtensionImage.
+    /// </summary>
     public partial class VirtualMachineExtensionImageData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineExtensionImageData. </summary>
diff --git a/test/TestProjects/MgmtParamOrdering/Generated/VirtualMachineScaleSetData.cs b/test/TestProjects/MgmtParamOrdering/Generated/VirtualMachineScaleSetData.cs
index db534780509..7a19bbc79e9 100644
--- a/test/TestProjects/MgmtParamOrdering/Generated/VirtualMachineScaleSetData.cs
+++ b/test/TestProjects/MgmtParamOrdering/Generated/VirtualMachineScaleSetData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtParamOrdering
 {
-    /// <summary> A class representing the VirtualMachineScaleSet data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachineScaleSet data model.
+    /// Describes a Virtual Machine Scale Set.
+    /// </summary>
     public partial class VirtualMachineScaleSetData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineScaleSetData. </summary>
diff --git a/test/TestProjects/MgmtParamOrdering/Generated/WorkspaceData.cs b/test/TestProjects/MgmtParamOrdering/Generated/WorkspaceData.cs
index fb722ec0884..acc9660c95b 100644
--- a/test/TestProjects/MgmtParamOrdering/Generated/WorkspaceData.cs
+++ b/test/TestProjects/MgmtParamOrdering/Generated/WorkspaceData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtParamOrdering
 {
-    /// <summary> A class representing the Workspace data model. </summary>
+    /// <summary>
+    /// A class representing the Workspace data model.
+    /// An object that represents a machine learning workspace.
+    /// </summary>
     public partial class WorkspaceData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of WorkspaceData. </summary>
diff --git a/test/TestProjects/MgmtParent/Generated/AvailabilitySetData.cs b/test/TestProjects/MgmtParent/Generated/AvailabilitySetData.cs
index bb699b89a60..d194fdcc067 100644
--- a/test/TestProjects/MgmtParent/Generated/AvailabilitySetData.cs
+++ b/test/TestProjects/MgmtParent/Generated/AvailabilitySetData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtParent
 {
-    /// <summary> A class representing the AvailabilitySet data model. </summary>
+    /// <summary>
+    /// A class representing the AvailabilitySet data model.
+    /// Specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintenance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
+    /// </summary>
     public partial class AvailabilitySetData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of AvailabilitySetData. </summary>
diff --git a/test/TestProjects/MgmtParent/Generated/DedicatedHostData.cs b/test/TestProjects/MgmtParent/Generated/DedicatedHostData.cs
index f3a0f2783a7..ac70bb7b2b6 100644
--- a/test/TestProjects/MgmtParent/Generated/DedicatedHostData.cs
+++ b/test/TestProjects/MgmtParent/Generated/DedicatedHostData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtParent
 {
-    /// <summary> A class representing the DedicatedHost data model. </summary>
+    /// <summary>
+    /// A class representing the DedicatedHost data model.
+    /// Specifies information about the Dedicated host.
+    /// </summary>
     public partial class DedicatedHostData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of DedicatedHostData. </summary>
diff --git a/test/TestProjects/MgmtParent/Generated/DedicatedHostGroupData.cs b/test/TestProjects/MgmtParent/Generated/DedicatedHostGroupData.cs
index ed907dbdbf3..9c183fa112e 100644
--- a/test/TestProjects/MgmtParent/Generated/DedicatedHostGroupData.cs
+++ b/test/TestProjects/MgmtParent/Generated/DedicatedHostGroupData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtParent
 {
-    /// <summary> A class representing the DedicatedHostGroup data model. </summary>
+    /// <summary>
+    /// A class representing the DedicatedHostGroup data model.
+    /// Specifies information about the Dedicated host.
+    /// </summary>
     public partial class DedicatedHostGroupData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of DedicatedHostGroupData. </summary>
diff --git a/test/TestProjects/MgmtParent/Generated/VirtualMachineExtensionImageData.cs b/test/TestProjects/MgmtParent/Generated/VirtualMachineExtensionImageData.cs
index 3c746a5ed82..452869c792c 100644
--- a/test/TestProjects/MgmtParent/Generated/VirtualMachineExtensionImageData.cs
+++ b/test/TestProjects/MgmtParent/Generated/VirtualMachineExtensionImageData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtParent
 {
-    /// <summary> A class representing the VirtualMachineExtensionImage data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachineExtensionImage data model.
+    /// The VirtualMachineExtensionImage.
+    /// </summary>
     public partial class VirtualMachineExtensionImageData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineExtensionImageData. </summary>
diff --git a/test/TestProjects/MgmtPropertyBag/Generated/BarData.cs b/test/TestProjects/MgmtPropertyBag/Generated/BarData.cs
index 5ae42385248..20e1d098d9f 100644
--- a/test/TestProjects/MgmtPropertyBag/Generated/BarData.cs
+++ b/test/TestProjects/MgmtPropertyBag/Generated/BarData.cs
@@ -10,7 +10,10 @@
 
 namespace MgmtPropertyBag
 {
-    /// <summary> A class representing the Bar data model. </summary>
+    /// <summary>
+    /// A class representing the Bar data model.
+    /// Bar instance details.
+    /// </summary>
     public partial class BarData : ResourceData
     {
         /// <summary> Initializes a new instance of BarData. </summary>
diff --git a/test/TestProjects/MgmtPropertyBag/Generated/FooData.cs b/test/TestProjects/MgmtPropertyBag/Generated/FooData.cs
index f673952b623..2b9289387bd 100644
--- a/test/TestProjects/MgmtPropertyBag/Generated/FooData.cs
+++ b/test/TestProjects/MgmtPropertyBag/Generated/FooData.cs
@@ -10,7 +10,10 @@
 
 namespace MgmtPropertyBag
 {
-    /// <summary> A class representing the Foo data model. </summary>
+    /// <summary>
+    /// A class representing the Foo data model.
+    /// Foo instance details.
+    /// </summary>
     public partial class FooData : ResourceData
     {
         /// <summary> Initializes a new instance of FooData. </summary>
diff --git a/test/TestProjects/MgmtPropertyChooser/Generated/VirtualMachineData.cs b/test/TestProjects/MgmtPropertyChooser/Generated/VirtualMachineData.cs
index 58917597527..0b44ef52b38 100644
--- a/test/TestProjects/MgmtPropertyChooser/Generated/VirtualMachineData.cs
+++ b/test/TestProjects/MgmtPropertyChooser/Generated/VirtualMachineData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtPropertyChooser
 {
-    /// <summary> A class representing the VirtualMachine data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachine data model.
+    /// Describes a Virtual Machine.
+    /// </summary>
     public partial class VirtualMachineData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineData. </summary>
diff --git a/test/TestProjects/MgmtRenameRules/Generated/ImageData.cs b/test/TestProjects/MgmtRenameRules/Generated/ImageData.cs
index 7bc3bcafee8..43907866a68 100644
--- a/test/TestProjects/MgmtRenameRules/Generated/ImageData.cs
+++ b/test/TestProjects/MgmtRenameRules/Generated/ImageData.cs
@@ -13,7 +13,11 @@
 
 namespace MgmtRenameRules
 {
-    /// <summary> A class representing the Image data model. </summary>
+    /// <summary>
+    /// A class representing the Image data model.
+    /// The source user image virtual hard disk. The virtual hard disk will be copied before being attached to the virtual machine. If SourceImage is provided, the destination virtual hard drive must not exist.
+    /// Serialized Name: Image
+    /// </summary>
     public partial class ImageData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of ImageData. </summary>
diff --git a/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineData.cs b/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineData.cs
index fda3e66bb3c..e3c101a56bd 100644
--- a/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineData.cs
+++ b/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineData.cs
@@ -13,7 +13,11 @@
 
 namespace MgmtRenameRules
 {
-    /// <summary> A class representing the VirtualMachine data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachine data model.
+    /// Describes a Virtual Machine.
+    /// Serialized Name: VirtualMachine
+    /// </summary>
     public partial class VirtualMachineData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineData. </summary>
diff --git a/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetData.cs b/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetData.cs
index cec86e8c7c2..3167ddf9ccf 100644
--- a/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetData.cs
+++ b/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetData.cs
@@ -13,7 +13,11 @@
 
 namespace MgmtRenameRules
 {
-    /// <summary> A class representing the VirtualMachineScaleSet data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachineScaleSet data model.
+    /// Describes a Virtual Machine Scale Set.
+    /// Serialized Name: VirtualMachineScaleSet
+    /// </summary>
     public partial class VirtualMachineScaleSetData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineScaleSetData. </summary>
diff --git a/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetExtensionData.cs b/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetExtensionData.cs
index dcc733369a8..260a0c6b149 100644
--- a/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetExtensionData.cs
+++ b/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetExtensionData.cs
@@ -12,7 +12,11 @@
 
 namespace MgmtRenameRules
 {
-    /// <summary> A class representing the VirtualMachineScaleSetExtension data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachineScaleSetExtension data model.
+    /// Describes a Virtual Machine Scale Set Extension.
+    /// Serialized Name: VirtualMachineScaleSetExtension
+    /// </summary>
     public partial class VirtualMachineScaleSetExtensionData : SubResourceReadOnly
     {
         /// <summary> Initializes a new instance of VirtualMachineScaleSetExtensionData. </summary>
diff --git a/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetRollingUpgradeData.cs b/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetRollingUpgradeData.cs
index 853c4183b44..7a52967e853 100644
--- a/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetRollingUpgradeData.cs
+++ b/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetRollingUpgradeData.cs
@@ -12,7 +12,11 @@
 
 namespace MgmtRenameRules
 {
-    /// <summary> A class representing the VirtualMachineScaleSetRollingUpgrade data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachineScaleSetRollingUpgrade data model.
+    /// The status of the latest virtual machine scale set rolling upgrade.
+    /// Serialized Name: RollingUpgradeStatusInfo
+    /// </summary>
     public partial class VirtualMachineScaleSetRollingUpgradeData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineScaleSetRollingUpgradeData. </summary>
diff --git a/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetVmData.cs b/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetVmData.cs
index 7fac798f247..889db4b9945 100644
--- a/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetVmData.cs
+++ b/test/TestProjects/MgmtRenameRules/Generated/VirtualMachineScaleSetVmData.cs
@@ -13,7 +13,11 @@
 
 namespace MgmtRenameRules
 {
-    /// <summary> A class representing the VirtualMachineScaleSetVm data model. </summary>
+    /// <summary>
+    /// A class representing the VirtualMachineScaleSetVm data model.
+    /// Describes a virtual machine scale set virtual machine.
+    /// Serialized Name: VirtualMachineScaleSetVM
+    /// </summary>
     public partial class VirtualMachineScaleSetVmData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of VirtualMachineScaleSetVmData. </summary>
diff --git a/test/TestProjects/MgmtResourceName/Generated/ProviderOperationData.cs b/test/TestProjects/MgmtResourceName/Generated/ProviderOperationData.cs
index 7e316660c18..16587a884d7 100644
--- a/test/TestProjects/MgmtResourceName/Generated/ProviderOperationData.cs
+++ b/test/TestProjects/MgmtResourceName/Generated/ProviderOperationData.cs
@@ -12,7 +12,10 @@
 
 namespace MgmtResourceName
 {
-    /// <summary> A class representing the ProviderOperation data model. </summary>
+    /// <summary>
+    /// A class representing the ProviderOperation data model.
+    /// Provider Operations metadata
+    /// </summary>
     public partial class ProviderOperationData : ResourceData
     {
         /// <summary> Initializes a new instance of ProviderOperationData. </summary>
diff --git a/test/TestProjects/MgmtSafeFlatten/Generated/TypeOneData.cs b/test/TestProjects/MgmtSafeFlatten/Generated/TypeOneData.cs
index ada7dca13c2..27f111190e6 100644
--- a/test/TestProjects/MgmtSafeFlatten/Generated/TypeOneData.cs
+++ b/test/TestProjects/MgmtSafeFlatten/Generated/TypeOneData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtSafeFlatten
 {
-    /// <summary> A class representing the TypeOne data model. </summary>
+    /// <summary>
+    /// A class representing the TypeOne data model.
+    /// The TypeOne.
+    /// </summary>
     public partial class TypeOneData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of TypeOneData. </summary>
diff --git a/test/TestProjects/MgmtSafeFlatten/Generated/TypeTwoData.cs b/test/TestProjects/MgmtSafeFlatten/Generated/TypeTwoData.cs
index 688674eece8..025a0117400 100644
--- a/test/TestProjects/MgmtSafeFlatten/Generated/TypeTwoData.cs
+++ b/test/TestProjects/MgmtSafeFlatten/Generated/TypeTwoData.cs
@@ -12,7 +12,10 @@
 
 namespace MgmtSafeFlatten
 {
-    /// <summary> A class representing the TypeTwo data model. </summary>
+    /// <summary>
+    /// A class representing the TypeTwo data model.
+    /// The TypeTwo.
+    /// </summary>
     public partial class TypeTwoData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of TypeTwoData. </summary>
diff --git a/test/TestProjects/MgmtScopeResource/Generated/DeploymentExtendedData.cs b/test/TestProjects/MgmtScopeResource/Generated/DeploymentExtendedData.cs
index 592f7bd706a..c273f54ddeb 100644
--- a/test/TestProjects/MgmtScopeResource/Generated/DeploymentExtendedData.cs
+++ b/test/TestProjects/MgmtScopeResource/Generated/DeploymentExtendedData.cs
@@ -12,7 +12,10 @@
 
 namespace MgmtScopeResource
 {
-    /// <summary> A class representing the DeploymentExtended data model. </summary>
+    /// <summary>
+    /// A class representing the DeploymentExtended data model.
+    /// Deployment information.
+    /// </summary>
     public partial class DeploymentExtendedData : ResourceData
     {
         /// <summary> Initializes a new instance of DeploymentExtendedData. </summary>
diff --git a/test/TestProjects/MgmtScopeResource/Generated/FakePolicyAssignmentData.cs b/test/TestProjects/MgmtScopeResource/Generated/FakePolicyAssignmentData.cs
index 373dc3206c1..ad390797866 100644
--- a/test/TestProjects/MgmtScopeResource/Generated/FakePolicyAssignmentData.cs
+++ b/test/TestProjects/MgmtScopeResource/Generated/FakePolicyAssignmentData.cs
@@ -13,7 +13,10 @@
 
 namespace MgmtScopeResource
 {
-    /// <summary> A class representing the FakePolicyAssignment data model. </summary>
+    /// <summary>
+    /// A class representing the FakePolicyAssignment data model.
+    /// The policy assignment.
+    /// </summary>
     public partial class FakePolicyAssignmentData : ResourceData
     {
         /// <summary> Initializes a new instance of FakePolicyAssignmentData. </summary>
diff --git a/test/TestProjects/MgmtScopeResource/Generated/GuestConfigurationAssignmentData.cs b/test/TestProjects/MgmtScopeResource/Generated/GuestConfigurationAssignmentData.cs
index ccb692d3e4e..ddb16c196ac 100644
--- a/test/TestProjects/MgmtScopeResource/Generated/GuestConfigurationAssignmentData.cs
+++ b/test/TestProjects/MgmtScopeResource/Generated/GuestConfigurationAssignmentData.cs
@@ -9,7 +9,10 @@
 
 namespace MgmtScopeResource
 {
-    /// <summary> A class representing the GuestConfigurationAssignment data model. </summary>
+    /// <summary>
+    /// A class representing the GuestConfigurationAssignment data model.
+    /// Guest configuration assignment is an association between a machine and guest configuration.
+    /// </summary>
     public partial class GuestConfigurationAssignmentData : GuestConfigurationBaseResource
     {
         /// <summary> Initializes a new instance of GuestConfigurationAssignmentData. </summary>
diff --git a/test/TestProjects/MgmtScopeResource/Generated/ResourceLinkData.cs b/test/TestProjects/MgmtScopeResource/Generated/ResourceLinkData.cs
index 74daa4d0087..6ea22c4e3e4 100644
--- a/test/TestProjects/MgmtScopeResource/Generated/ResourceLinkData.cs
+++ b/test/TestProjects/MgmtScopeResource/Generated/ResourceLinkData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtScopeResource
 {
-    /// <summary> A class representing the ResourceLink data model. </summary>
+    /// <summary>
+    /// A class representing the ResourceLink data model.
+    /// The resource link.
+    /// </summary>
     public partial class ResourceLinkData : ResourceData
     {
         /// <summary> Initializes a new instance of ResourceLinkData. </summary>
diff --git a/test/TestProjects/MgmtScopeResource/Generated/VMInsightsOnboardingStatusData.cs b/test/TestProjects/MgmtScopeResource/Generated/VMInsightsOnboardingStatusData.cs
index 807bb54379c..20325634fd2 100644
--- a/test/TestProjects/MgmtScopeResource/Generated/VMInsightsOnboardingStatusData.cs
+++ b/test/TestProjects/MgmtScopeResource/Generated/VMInsightsOnboardingStatusData.cs
@@ -12,7 +12,10 @@
 
 namespace MgmtScopeResource
 {
-    /// <summary> A class representing the VMInsightsOnboardingStatus data model. </summary>
+    /// <summary>
+    /// A class representing the VMInsightsOnboardingStatus data model.
+    /// VM Insights onboarding status for a resource.
+    /// </summary>
     public partial class VMInsightsOnboardingStatusData : ResourceData
     {
         /// <summary> Initializes a new instance of VMInsightsOnboardingStatusData. </summary>
diff --git a/test/TestProjects/MgmtSingletonResource/Generated/ParentResourceData.cs b/test/TestProjects/MgmtSingletonResource/Generated/ParentResourceData.cs
index a2440463384..ec474ace9df 100644
--- a/test/TestProjects/MgmtSingletonResource/Generated/ParentResourceData.cs
+++ b/test/TestProjects/MgmtSingletonResource/Generated/ParentResourceData.cs
@@ -11,7 +11,10 @@
 
 namespace MgmtSingletonResource
 {
-    /// <summary> A class representing the ParentResource data model. </summary>
+    /// <summary>
+    /// A class representing the ParentResource data model.
+    /// A parent resource.
+    /// </summary>
     public partial class ParentResourceData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of ParentResourceData. </summary>
diff --git a/test/TestProjects/MgmtSingletonResource/Generated/SingletonResourceData.cs b/test/TestProjects/MgmtSingletonResource/Generated/SingletonResourceData.cs
index ea023b7f020..96bda9cf0bf 100644
--- a/test/TestProjects/MgmtSingletonResource/Generated/SingletonResourceData.cs
+++ b/test/TestProjects/MgmtSingletonResource/Generated/SingletonResourceData.cs
@@ -10,7 +10,10 @@
 
 namespace MgmtSingletonResource
 {
-    /// <summary> A class representing the SingletonResource data model. </summary>
+    /// <summary>
+    /// A class representing the SingletonResource data model.
+    /// A singleton resource.
+    /// </summary>
     public partial class SingletonResourceData : ResourceData
     {
         /// <summary> Initializes a new instance of SingletonResourceData. </summary>
diff --git a/test/TestProjects/MgmtSubscriptionNameParameter/Generated/SBSubscriptionData.cs b/test/TestProjects/MgmtSubscriptionNameParameter/Generated/SBSubscriptionData.cs
index 3fe1d0970b7..8deb116b889 100644
--- a/test/TestProjects/MgmtSubscriptionNameParameter/Generated/SBSubscriptionData.cs
+++ b/test/TestProjects/MgmtSubscriptionNameParameter/Generated/SBSubscriptionData.cs
@@ -12,7 +12,10 @@
 
 namespace MgmtSubscriptionNameParameter
 {
-    /// <summary> A class representing the SBSubscription data model. </summary>
+    /// <summary>
+    /// A class representing the SBSubscription data model.
+    /// Description of subscription resource.
+    /// </summary>
     public partial class SBSubscriptionData : ResourceData
     {
         /// <summary> Initializes a new instance of SBSubscriptionData. </summary>
diff --git a/test/TestProjects/ResourceRename/Generated/SshPublicKeyInfoData.cs b/test/TestProjects/ResourceRename/Generated/SshPublicKeyInfoData.cs
index a74ef3aa9ab..a4c32568b7f 100644
--- a/test/TestProjects/ResourceRename/Generated/SshPublicKeyInfoData.cs
+++ b/test/TestProjects/ResourceRename/Generated/SshPublicKeyInfoData.cs
@@ -11,7 +11,10 @@
 
 namespace ResourceRename
 {
-    /// <summary> A class representing the SshPublicKeyInfo data model. </summary>
+    /// <summary>
+    /// A class representing the SshPublicKeyInfo data model.
+    /// Contains information about SSH certificate public key and the path on the Linux VM where the public key is placed.
+    /// </summary>
     public partial class SshPublicKeyInfoData : ResourceData
     {
         /// <summary> Initializes a new instance of SshPublicKeyInfoData. </summary>
diff --git a/test/TestProjects/SubscriptionExtensions/Generated/OvenData.cs b/test/TestProjects/SubscriptionExtensions/Generated/OvenData.cs
index d54177decf9..22b8536a20f 100644
--- a/test/TestProjects/SubscriptionExtensions/Generated/OvenData.cs
+++ b/test/TestProjects/SubscriptionExtensions/Generated/OvenData.cs
@@ -11,7 +11,10 @@
 
 namespace SubscriptionExtensions
 {
-    /// <summary> A class representing the Oven data model. </summary>
+    /// <summary>
+    /// A class representing the Oven data model.
+    /// The Oven.
+    /// </summary>
     public partial class OvenData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of OvenData. </summary>
diff --git a/test/TestProjects/SubscriptionExtensions/Generated/ToasterData.cs b/test/TestProjects/SubscriptionExtensions/Generated/ToasterData.cs
index a415dee35e3..7cfb389a5b5 100644
--- a/test/TestProjects/SubscriptionExtensions/Generated/ToasterData.cs
+++ b/test/TestProjects/SubscriptionExtensions/Generated/ToasterData.cs
@@ -11,7 +11,10 @@
 
 namespace SubscriptionExtensions
 {
-    /// <summary> A class representing the Toaster data model. </summary>
+    /// <summary>
+    /// A class representing the Toaster data model.
+    /// The ToasterListResult.
+    /// </summary>
     public partial class ToasterData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of ToasterData. </summary>
diff --git a/test/TestProjects/SupersetFlattenInheritance/Generated/ResourceModel1Data.cs b/test/TestProjects/SupersetFlattenInheritance/Generated/ResourceModel1Data.cs
index 77f52284bfd..88acad1b1ce 100644
--- a/test/TestProjects/SupersetFlattenInheritance/Generated/ResourceModel1Data.cs
+++ b/test/TestProjects/SupersetFlattenInheritance/Generated/ResourceModel1Data.cs
@@ -10,7 +10,10 @@
 
 namespace SupersetFlattenInheritance
 {
-    /// <summary> A class representing the ResourceModel1 data model. </summary>
+    /// <summary>
+    /// A class representing the ResourceModel1 data model.
+    /// Resource WITHOUT flatten properties.
+    /// </summary>
     public partial class ResourceModel1Data : ResourceData
     {
         /// <summary> Initializes a new instance of ResourceModel1Data. </summary>
diff --git a/test/TestProjects/SupersetFlattenInheritance/Generated/TrackedResourceModel1Data.cs b/test/TestProjects/SupersetFlattenInheritance/Generated/TrackedResourceModel1Data.cs
index dc005936577..98efe4bc5f4 100644
--- a/test/TestProjects/SupersetFlattenInheritance/Generated/TrackedResourceModel1Data.cs
+++ b/test/TestProjects/SupersetFlattenInheritance/Generated/TrackedResourceModel1Data.cs
@@ -11,7 +11,10 @@
 
 namespace SupersetFlattenInheritance
 {
-    /// <summary> A class representing the TrackedResourceModel1 data model. </summary>
+    /// <summary>
+    /// A class representing the TrackedResourceModel1 data model.
+    /// TrackedResource WITHOUT flatten properties
+    /// </summary>
     public partial class TrackedResourceModel1Data : TrackedResourceData
     {
         /// <summary> Initializes a new instance of TrackedResourceModel1Data. </summary>
diff --git a/test/TestProjects/SupersetInheritance/Generated/SupersetModel1Data.cs b/test/TestProjects/SupersetInheritance/Generated/SupersetModel1Data.cs
index c931ecdd744..b03786053e9 100644
--- a/test/TestProjects/SupersetInheritance/Generated/SupersetModel1Data.cs
+++ b/test/TestProjects/SupersetInheritance/Generated/SupersetModel1Data.cs
@@ -10,7 +10,10 @@
 
 namespace SupersetInheritance
 {
-    /// <summary> A class representing the SupersetModel1 data model. </summary>
+    /// <summary>
+    /// A class representing the SupersetModel1 data model.
+    /// This model does not have systemData, but should inherit from Resource.
+    /// </summary>
     public partial class SupersetModel1Data : ResourceData
     {
         /// <summary> Initializes a new instance of SupersetModel1Data. </summary>
diff --git a/test/TestProjects/SupersetInheritance/Generated/SupersetModel4Data.cs b/test/TestProjects/SupersetInheritance/Generated/SupersetModel4Data.cs
index e9280a818b4..cdf905546fa 100644
--- a/test/TestProjects/SupersetInheritance/Generated/SupersetModel4Data.cs
+++ b/test/TestProjects/SupersetInheritance/Generated/SupersetModel4Data.cs
@@ -11,7 +11,10 @@
 
 namespace SupersetInheritance
 {
-    /// <summary> A class representing the SupersetModel4 data model. </summary>
+    /// <summary>
+    /// A class representing the SupersetModel4 data model.
+    /// This model does not have systemData, but should inherit from TrackedResource.
+    /// </summary>
     public partial class SupersetModel4Data : TrackedResourceData
     {
         /// <summary> Initializes a new instance of SupersetModel4Data. </summary>
diff --git a/test/TestProjects/SupersetInheritance/Generated/SupersetModel6Data.cs b/test/TestProjects/SupersetInheritance/Generated/SupersetModel6Data.cs
index fb31ee5a47e..d8a61ced9ce 100644
--- a/test/TestProjects/SupersetInheritance/Generated/SupersetModel6Data.cs
+++ b/test/TestProjects/SupersetInheritance/Generated/SupersetModel6Data.cs
@@ -10,7 +10,10 @@
 
 namespace SupersetInheritance
 {
-    /// <summary> A class representing the SupersetModel6 data model. </summary>
+    /// <summary>
+    /// A class representing the SupersetModel6 data model.
+    /// This model has a common type systemData and should inherit from Resource.
+    /// </summary>
     public partial class SupersetModel6Data : ResourceData
     {
         /// <summary> Initializes a new instance of SupersetModel6Data. </summary>
diff --git a/test/TestProjects/SupersetInheritance/Generated/SupersetModel7Data.cs b/test/TestProjects/SupersetInheritance/Generated/SupersetModel7Data.cs
index 3732ccd5f5b..70e61d2df4d 100644
--- a/test/TestProjects/SupersetInheritance/Generated/SupersetModel7Data.cs
+++ b/test/TestProjects/SupersetInheritance/Generated/SupersetModel7Data.cs
@@ -9,7 +9,10 @@
 
 namespace SupersetInheritance
 {
-    /// <summary> A class representing the SupersetModel7 data model. </summary>
+    /// <summary>
+    /// A class representing the SupersetModel7 data model.
+    /// This model has a systemData different from common type and should not inherit from Resource.
+    /// </summary>
     public partial class SupersetModel7Data
     {
         /// <summary> Initializes a new instance of SupersetModel7Data. </summary>
diff --git a/test/TestProjects/TenantOnly/Generated/AgreementData.cs b/test/TestProjects/TenantOnly/Generated/AgreementData.cs
index 4ff002f1873..ffaf38265a9 100644
--- a/test/TestProjects/TenantOnly/Generated/AgreementData.cs
+++ b/test/TestProjects/TenantOnly/Generated/AgreementData.cs
@@ -11,7 +11,10 @@
 
 namespace TenantOnly
 {
-    /// <summary> A class representing the Agreement data model. </summary>
+    /// <summary>
+    /// A class representing the Agreement data model.
+    /// An agreement.
+    /// </summary>
     public partial class AgreementData : ResourceData
     {
         /// <summary> Initializes a new instance of AgreementData. </summary>
diff --git a/test/TestProjects/TenantOnly/Generated/BillingAccountData.cs b/test/TestProjects/TenantOnly/Generated/BillingAccountData.cs
index 434f1407adf..0d5eced59aa 100644
--- a/test/TestProjects/TenantOnly/Generated/BillingAccountData.cs
+++ b/test/TestProjects/TenantOnly/Generated/BillingAccountData.cs
@@ -11,7 +11,10 @@
 
 namespace TenantOnly
 {
-    /// <summary> A class representing the BillingAccount data model. </summary>
+    /// <summary>
+    /// A class representing the BillingAccount data model.
+    /// A billing account.
+    /// </summary>
     public partial class BillingAccountData : TrackedResourceData
     {
         /// <summary> Initializes a new instance of BillingAccountData. </summary>
diff --git a/test/TestProjects/XmlDeserialization/Generated/XmlInstanceData.cs b/test/TestProjects/XmlDeserialization/Generated/XmlInstanceData.cs
index 5cf2bf60a18..701c9207196 100644
--- a/test/TestProjects/XmlDeserialization/Generated/XmlInstanceData.cs
+++ b/test/TestProjects/XmlDeserialization/Generated/XmlInstanceData.cs
@@ -10,7 +10,10 @@
 
 namespace XmlDeserialization
 {
-    /// <summary> A class representing the XmlInstance data model. </summary>
+    /// <summary>
+    /// A class representing the XmlInstance data model.
+    /// Xml instance details.
+    /// </summary>
     public partial class XmlInstanceData : ResourceData
     {
         /// <summary> Initializes a new instance of XmlInstanceData. </summary>