diff --git a/src/StorageCache/HPCCache/Commands/FlushAzHpcCache.cs b/src/StorageCache/HPCCache/Commands/FlushAzHpcCache.cs
index 319af33278ea..f898170a8939 100644
--- a/src/StorageCache/HPCCache/Commands/FlushAzHpcCache.cs
+++ b/src/StorageCache/HPCCache/Commands/FlushAzHpcCache.cs
@@ -50,7 +50,7 @@ public class FlushAzHpcCache : HpcCacheBaseCmdlet
         /// <summary>
         /// Gets or sets switch parameter passthru.
         /// </summary>
-        [Parameter(Mandatory = false, HelpMessage = "This Cmdlet does not return an object by default. If this switch is specified, it returns true if successful.")]
+        [Parameter(Mandatory = false, HelpMessage = "Returns an object representing the item with which you are working. By default, this cmdlet does not generate any output.")]
         public SwitchParameter PassThru { get; set; }
 
         /// <summary>
diff --git a/src/StorageCache/HPCCache/Commands/GetAzHpcCacheSku.cs b/src/StorageCache/HPCCache/Commands/GetAzHpcCacheSku.cs
index 46d34cffa3e4..ab052e96c8ed 100644
--- a/src/StorageCache/HPCCache/Commands/GetAzHpcCacheSku.cs
+++ b/src/StorageCache/HPCCache/Commands/GetAzHpcCacheSku.cs
@@ -20,7 +20,7 @@ namespace Microsoft.Azure.Commands.HPCCache
     using Microsoft.Azure.PowerShell.Cmdlets.HPCCache.Models;
 
     /// <summary>
-    /// Get SKUs related to HPC Cache service.
+    /// Get SKUs related to HPC Cache that are available in subscription
     /// </summary>
     [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HpcCacheSku")]
     [OutputType(typeof(PSSku))]
diff --git a/src/StorageCache/HPCCache/Commands/GetAzHpcCacheStorageTarget.cs b/src/StorageCache/HPCCache/Commands/GetAzHpcCacheStorageTarget.cs
index ed1d9cf8e150..ee5b7307af89 100644
--- a/src/StorageCache/HPCCache/Commands/GetAzHpcCacheStorageTarget.cs
+++ b/src/StorageCache/HPCCache/Commands/GetAzHpcCacheStorageTarget.cs
@@ -43,7 +43,7 @@ public class GetAzHpcCacheStorageTarget : HpcCacheBaseCmdlet
         /// <summary>
         /// Gets or sets storage target name.
         /// </summary>
-        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Name of storageTarget.")]
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Name of storage target.")]
         [ValidateNotNullOrEmpty]
         public string StorageTargetName { get; set; }
 
diff --git a/src/StorageCache/HPCCache/Commands/GetAzHpcCacheUsageModels.cs b/src/StorageCache/HPCCache/Commands/GetAzHpcCacheUsageModels.cs
index 7838cc9ba1d4..fd34008ed7f2 100644
--- a/src/StorageCache/HPCCache/Commands/GetAzHpcCacheUsageModels.cs
+++ b/src/StorageCache/HPCCache/Commands/GetAzHpcCacheUsageModels.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Commands.HPCCache
     using Microsoft.Azure.PowerShell.Cmdlets.HPCCache.Models;
 
     /// <summary>
-    /// Get UsageModels related to HPC Cache Storage Target.
+    /// Get usage models related to HPC Cache NFS Storage Target.
     /// </summary>
     [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HpcCacheUsageModels")]
     public class GetAzHpcCacheUsageModels : HpcCacheBaseCmdlet
diff --git a/src/StorageCache/HPCCache/Commands/NewAzHpcCache.cs b/src/StorageCache/HPCCache/Commands/NewAzHpcCache.cs
index 3c3eb5373156..8e7996126ec9 100644
--- a/src/StorageCache/HPCCache/Commands/NewAzHpcCache.cs
+++ b/src/StorageCache/HPCCache/Commands/NewAzHpcCache.cs
@@ -22,23 +22,23 @@ namespace Microsoft.Azure.Commands.HPCCache
     using Microsoft.Rest.Azure;
 
     /// <summary>
-    /// NewHPCCache comandlet.
+    /// Creates a HPC Cache.
     /// </summary>
     [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HpcCache")]
     [OutputType(typeof(PSHPCCache))]
     public class NewAzHpcCache : HpcCacheBaseCmdlet
     {
         /// <summary>
-        /// Gets or sets resource Group Name.
+        /// Gets or sets resource group name.
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of resource group under which you want to create cache.")]
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
 
         /// <summary>
-        /// Gets or sets resource CacheName.
+        /// Gets or sets cache name.
         /// </summary>
-        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of  cache.")]
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of cache.")]
         [ValidateNotNullOrEmpty]
         public string CacheName { get; set; }
 
@@ -112,7 +112,7 @@ public override void ExecuteCmdlet()
             catch (CloudErrorException ex)
             {
                 throw new CloudException(string.Format("Exception: {0}", ex.Body.Error.Message));
-            }    
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/StorageCache/HPCCache/Commands/NewAzHpcStorageTarget.cs b/src/StorageCache/HPCCache/Commands/NewAzHpcStorageTarget.cs
index 6aa0c9bc3bfd..bbee5f6486db 100644
--- a/src/StorageCache/HPCCache/Commands/NewAzHpcStorageTarget.cs
+++ b/src/StorageCache/HPCCache/Commands/NewAzHpcStorageTarget.cs
@@ -1,4 +1,17 @@
-namespace Microsoft.Azure.Commands.HPCCache
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+namespace Microsoft.Azure.Commands.HPCCache
 {
     using System;
     using System.Collections;
diff --git a/src/StorageCache/HPCCache/Commands/RemoveAzHpcCache.cs b/src/StorageCache/HPCCache/Commands/RemoveAzHpcCache.cs
index 72491ec29ce9..5d435e53a14e 100644
--- a/src/StorageCache/HPCCache/Commands/RemoveAzHpcCache.cs
+++ b/src/StorageCache/HPCCache/Commands/RemoveAzHpcCache.cs
@@ -30,7 +30,7 @@ public class RemoveAzHpcCache : HpcCacheBaseCmdlet
         /// <summary>
         /// Gets or sets ResourceGroupName.
         /// </summary>
-        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of resource group under which you want to delete cache.")]
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of resource group under which you want to remove cache.")]
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
 
@@ -44,13 +44,13 @@ public class RemoveAzHpcCache : HpcCacheBaseCmdlet
         /// <summary>
         /// Gets or sets Delete Force - always set to false.
         /// </summary>
-        [Parameter(Mandatory = false, HelpMessage = "Indicates that the cmdlet does not prompt you for confirmation. By default, this cmdlet prompts you to confirm that you want to delete the cache.")]
+        [Parameter(Mandatory = false, HelpMessage = "Indicates that the cmdlet does not prompt you for confirmation. By default, this cmdlet prompts you to confirm that you want to remove the cache.")]
         public SwitchParameter Force { get; set; }
 
         /// <summary>
         /// Gets or sets Switch parameter if you do not want to wait till success.
         /// </summary>
-        [Parameter(Mandatory = false, HelpMessage = "This Cmdlet does not return an object by default. If this switch is specified, it returns true if successful.")]
+        [Parameter(Mandatory = false, HelpMessage = "Returns an object representing the item with which you are working.By default, this cmdlet does not generate any output.")]
         public SwitchParameter PassThru { get; set; }
 
         /// <summary>
diff --git a/src/StorageCache/HPCCache/Commands/RemoveAzHpcCacheStorageTarget.cs b/src/StorageCache/HPCCache/Commands/RemoveAzHpcCacheStorageTarget.cs
index 515aea41bc7d..6ba3c9c7eb08 100644
--- a/src/StorageCache/HPCCache/Commands/RemoveAzHpcCacheStorageTarget.cs
+++ b/src/StorageCache/HPCCache/Commands/RemoveAzHpcCacheStorageTarget.cs
@@ -30,7 +30,7 @@ public class RemoveAzHpcCacheStorageTarget : HpcCacheBaseCmdlet
         /// <summary>
         /// Gets or sets ResourceGroupName.
         /// </summary>
-        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of resource group under which you want to delete storagetarget from cache.")]
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of resource group under which you want to remove storage target from cache.")]
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
 
@@ -51,13 +51,13 @@ public class RemoveAzHpcCacheStorageTarget : HpcCacheBaseCmdlet
         /// <summary>
         /// Gets or sets Delete Force - always set to false.
         /// </summary>
-        [Parameter(Mandatory = false, HelpMessage = "Indicates that the cmdlet does not prompt you for confirmation. By default, this cmdlet prompts you to confirm that you want to delete the storage target.")]
+        [Parameter(Mandatory = false, HelpMessage = "Indicates that the cmdlet does not prompt you for confirmation. By default, this cmdlet prompts you to confirm that you want to remove the storage target.")]
         public SwitchParameter Force { get; set; }
 
         /// <summary>
         /// Gets or sets Switch parameter if you do not want to wait till success.
         /// </summary>
-        [Parameter(Mandatory = false, HelpMessage = "This Cmdlet does not return an object by default. If this switch is specified, it returns true if successful.")]
+        [Parameter(Mandatory = false, HelpMessage = "Returns an object representing the item with which you are working.By default, this cmdlet does not generate any output.")]
         public SwitchParameter PassThru { get; set; }
 
         /// <summary>
diff --git a/src/StorageCache/HPCCache/Commands/SetAzHpcCache.cs b/src/StorageCache/HPCCache/Commands/SetAzHpcCache.cs
index 0da32fe5a246..c491eb5dcaf6 100644
--- a/src/StorageCache/HPCCache/Commands/SetAzHpcCache.cs
+++ b/src/StorageCache/HPCCache/Commands/SetAzHpcCache.cs
@@ -37,14 +37,14 @@ public class SetAzHpcCache : HpcCacheBaseCmdlet
         /// <summary>
         /// Gets or sets resource CacheName.
         /// </summary>
-        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of cache you want to update.")]
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of cache.")]
         [ValidateNotNullOrEmpty]
         public string CacheName { get; set; }
 
         /// <summary>
         /// Gets or sets the tags to associate with HPC Cache.
         /// </summary>
-        [Parameter(Mandatory = false, HelpMessage = "The tags to associate with HPC Cache that are getting updated.")]
+        [Parameter(Mandatory = false, HelpMessage = "The tags to associate with HPC Cache.")]
         public Hashtable Tag { get; set; }
 
         /// <summary>
diff --git a/src/StorageCache/HPCCache/Commands/SetAzHpcStorageTarget.cs b/src/StorageCache/HPCCache/Commands/SetAzHpcStorageTarget.cs
index fe4819298888..18d216a2d5cc 100644
--- a/src/StorageCache/HPCCache/Commands/SetAzHpcStorageTarget.cs
+++ b/src/StorageCache/HPCCache/Commands/SetAzHpcStorageTarget.cs
@@ -1,4 +1,17 @@
-namespace Microsoft.Azure.Commands.HPCCache
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+namespace Microsoft.Azure.Commands.HPCCache
 {
     using System;
     using System.Collections;
@@ -29,21 +42,21 @@ public class SetAzHpcStorageTarget : HpcCacheBaseCmdlet
         /// <summary>
         /// Gets or sets resource Group Name.
         /// </summary>
-        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of resource group under which you want to update cache.")]
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of resource group under which you want to update storage target.")]
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
 
         /// <summary>
         /// Gets or sets resource CacheName.
         /// </summary>
-        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of  cache.")]
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of cache.")]
         [ValidateNotNullOrEmpty]
         public string CacheName { get; set; }
 
         /// <summary>
         /// Gets or sets resource storage target name.
         /// </summary>
-        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of  storage target.")]
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of storage target.")]
         [ValidateNotNullOrEmpty]
         public string StorageTargetName { get; set; }
 
@@ -61,7 +74,6 @@ public class SetAzHpcStorageTarget : HpcCacheBaseCmdlet
         [ValidateNotNullOrEmpty]
         public SwitchParameter NFS { get; set; }
 
-
         /// <summary>
         /// Gets or sets junctions.  Note: only junctions can be updated as of now.
         /// </summary>
@@ -116,7 +128,6 @@ public override void ExecuteCmdlet()
                 }
             }
 
-
             var results = new List<PSHpcStorageTarget>() { this.CreateStorageTargetModel() };
             this.WriteObject(results, enumerateCollection: true);
         }
@@ -133,13 +144,12 @@ private PSHpcStorageTarget CreateStorageTargetModel()
             }
             catch (CloudErrorException ex)
             {
-
                 // Fix for update storage target, until Swagger is updated with correct response code.
                 if (ex.Response.StatusCode == HttpStatusCode.Accepted)
                 {
                     try
                     {
-                        storageTarget = Rest.Serialization.SafeJsonConvert.DeserializeObject<StorageTarget>(ex.Response.Content, this.HpcCacheClient.DeserializationSettings);
+                        this.storageTarget = Rest.Serialization.SafeJsonConvert.DeserializeObject<StorageTarget>(ex.Response.Content, this.HpcCacheClient.DeserializationSettings);
                     }
                     catch (JsonException jsonEx)
                     {
@@ -151,7 +161,8 @@ private PSHpcStorageTarget CreateStorageTargetModel()
                     throw;
                 }
             }
-            return new PSHpcStorageTarget(storageTarget);
+
+            return new PSHpcStorageTarget(this.storageTarget);
         }
 
         private StorageTarget DoesStorageTargetExists()
diff --git a/src/StorageCache/HPCCache/Commands/StopAzHpcCache.cs b/src/StorageCache/HPCCache/Commands/StopAzHpcCache.cs
index dd8b46393de5..74fcf93d4f81 100644
--- a/src/StorageCache/HPCCache/Commands/StopAzHpcCache.cs
+++ b/src/StorageCache/HPCCache/Commands/StopAzHpcCache.cs
@@ -84,6 +84,7 @@ private void StopHpcCache()
             {
                 throw new PSArgumentNullException("CacheName");
             }
+
             try
             {
                 this.HpcCacheClient.Caches.Stop(this.ResourceGroupName, this.CacheName);
diff --git a/src/StorageCache/HPCCache/Commands/UpgradeAzHpcCache.cs b/src/StorageCache/HPCCache/Commands/UpgradeAzHpcCache.cs
index 97efdaf564fd..db556e3a50bc 100644
--- a/src/StorageCache/HPCCache/Commands/UpgradeAzHpcCache.cs
+++ b/src/StorageCache/HPCCache/Commands/UpgradeAzHpcCache.cs
@@ -50,7 +50,7 @@ public class UpgradeAzHpcCache : HpcCacheBaseCmdlet
         /// <summary>
         /// Gets or sets switch parameter passthru.
         /// </summary>
-        [Parameter(Mandatory = false, HelpMessage = "This Cmdlet does not return an object by default. If this switch is specified, it returns true if successful.")]
+        [Parameter(Mandatory = false, HelpMessage = "Returns an object representing the item with which you are working. By default, this cmdlet does not generate any output.")]
         public SwitchParameter PassThru { get; set; }
 
         /// <summary>
@@ -90,6 +90,7 @@ public void UpgradeHpcCache()
             {
                 throw new PSArgumentNullException("CacheName");
             }
+
             try
             {
                 this.HpcCacheClient.Caches.UpgradeFirmware(this.ResourceGroupName, this.CacheName);
diff --git a/src/StorageCache/HPCCache/Models/PSHpcCache.cs b/src/StorageCache/HPCCache/Models/PSHpcCache.cs
index 52dfdd4527b1..b3b7061b1668 100644
--- a/src/StorageCache/HPCCache/Models/PSHpcCache.cs
+++ b/src/StorageCache/HPCCache/Models/PSHpcCache.cs
@@ -100,6 +100,7 @@ public PSHPCCache(StorageCacheModels.Cache cache)
         /// Gets or Sets CacheSize.
         /// </summary>
         public int? CacheSize { get; set; }
+
         /// <summary>
         /// Gets or Sets Tags.
         /// </summary>
diff --git a/src/StorageCache/HPCCache/Models/PSHpcCacheHealth.cs b/src/StorageCache/HPCCache/Models/PSHpcCacheHealth.cs
index 077657898645..ba8b87b0dbd2 100644
--- a/src/StorageCache/HPCCache/Models/PSHpcCacheHealth.cs
+++ b/src/StorageCache/HPCCache/Models/PSHpcCacheHealth.cs
@@ -12,7 +12,6 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-
 namespace Microsoft.Azure.PowerShell.Cmdlets.HPCCache.Models
 {
     using System;
@@ -28,12 +27,12 @@ public class PSHpcCacheHealth
         /// <summary>
         /// Gets cache health state.
         /// </summary>
-        public string state;
+        public string State;
 
         /// <summary>
         /// Gets cache health status description.
         /// </summary>
-        public string statusDescription;
+        public string StatusDescription;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PSHpcCacheHealth"/> class.
@@ -41,8 +40,8 @@ public class PSHpcCacheHealth
         /// <param name="health"> cache health object.</param>
         public PSHpcCacheHealth(StorageCacheModels.CacheHealth health)
         {
-            this.state = health.State;
-            this.statusDescription = health.StatusDescription;
+            this.State = health.State;
+            this.StatusDescription = health.StatusDescription;
         }
     }
 }
\ No newline at end of file
diff --git a/src/StorageCache/HPCCache/Models/PSHpcCacheSku.cs b/src/StorageCache/HPCCache/Models/PSHpcCacheSku.cs
index 7a7a89049eb5..2e11fdd42306 100644
--- a/src/StorageCache/HPCCache/Models/PSHpcCacheSku.cs
+++ b/src/StorageCache/HPCCache/Models/PSHpcCacheSku.cs
@@ -14,7 +14,6 @@
 
 namespace Microsoft.Azure.PowerShell.Cmdlets.HPCCache.Models
 {
-
     using StorageCacheModels = Microsoft.Azure.Management.StorageCache.Models;
 
     /// <summary>
@@ -35,9 +34,8 @@ public PSHpcCacheSku(StorageCacheModels.CacheSku sku)
         }
 
         /// <summary>
-        /// Gets Sku name.
+        /// Gets or Sets Sku name.
         /// </summary>
         public string Name { get; set; }
     }
-
 }
\ No newline at end of file
diff --git a/src/StorageCache/HPCCache/Models/PSHpcCacheUpgradeStatus.cs b/src/StorageCache/HPCCache/Models/PSHpcCacheUpgradeStatus.cs
index 50a47e46a25e..5fac458b2246 100644
--- a/src/StorageCache/HPCCache/Models/PSHpcCacheUpgradeStatus.cs
+++ b/src/StorageCache/HPCCache/Models/PSHpcCacheUpgradeStatus.cs
@@ -43,25 +43,25 @@ public PSHpcCacheUpgradeStatus(StorageCacheModels.CacheUpgradeStatus upgradeStat
         public string CurrentFirmwareVersion { get; private set; }
 
         /// <summary>
-        /// Gets true if there is a firmware update ready to install on this Cache. The firmware
+        /// Gets or sets true if there is a firmware update ready to install on this Cache. The firmware
         /// will automatically be installed after firmwareUpdateDeadline if not triggered
         /// earlier via the upgrade operation. Possible values include: 'available', 'unavailable'.
         /// </summary>
         public string FirmwareUpdateStatus { get;  set; }
 
         /// <summary>
-        /// Gets time at which the pending firmware update will automatically be installed
+        /// Gets or sets time at which the pending firmware update will automatically be installed
         /// on the Cache.
         /// </summary>
         public DateTime? FirmwareUpdateDeadline { get;  set; }
 
         /// <summary>
-        /// Gets time of the last successful firmware update.
+        /// Gets or Sets time of the last successful firmware update.
         /// </summary>
         public DateTime? LastFirmwareUpdate { get;  set; }
 
         /// <summary>
-        /// Gets when firmwareUpdateAvailable is true, this field holds the version string
+        /// Gets or Sets when firmwareUpdateAvailable is true, this field holds the version string
         /// for the update.
         /// </summary>
         public string PendingFirmwareVersion { get;  set; }
diff --git a/src/StorageCache/HPCCache/Models/PSSku.cs b/src/StorageCache/HPCCache/Models/PSSku.cs
index 7cee21c5ddf8..abf12a5e25d9 100644
--- a/src/StorageCache/HPCCache/Models/PSSku.cs
+++ b/src/StorageCache/HPCCache/Models/PSSku.cs
@@ -37,7 +37,6 @@ public PSSku(ResourceSku sku)
                 this.ResourceType = sku.ResourceType;
                 this.Restrictions = sku.Restrictions;
                 this.Capabilities = sku.Capabilities;
-
             }
         }
 
diff --git a/src/StorageCache/HPCCache/help/Flush-AzHpcCache.md b/src/StorageCache/HPCCache/help/Flush-AzHpcCache.md
index 89d77abec344..85503eb09a33 100644
--- a/src/StorageCache/HPCCache/help/Flush-AzHpcCache.md
+++ b/src/StorageCache/HPCCache/help/Flush-AzHpcCache.md
@@ -18,7 +18,7 @@ Flush-AzHpcCache -ResourceGroupName <String> -CacheName <String> [-PassThru] [-F
 ```
 
 ## DESCRIPTION
-The **Flush-AzHpcCache** cmdlet flushes a Azure HPC Cache.
+The **Flush-AzHpcCache** cmdlet flushes an Azure HPC Cache.
 
 ## EXAMPLES
 
@@ -31,7 +31,7 @@ PS C:\> Flush-AzHpcCache -ResourceGroupName testRG -CacheName testCache
 ## PARAMETERS
 
 ### -CacheName
-Name of  cache.
+Name of cache.
 
 ```yaml
 Type: System.String
@@ -46,7 +46,7 @@ Accept wildcard characters: False
 ```
 
 ### -Force
-Forces the command to run without asking for user confirmation.
+Indicates that the cmdlet does not prompt you for confirmation. By default, this cmdlet prompts you to confirm that you want to flush the cache.
 
 ```yaml
 Type: System.Management.Automation.SwitchParameter
diff --git a/src/StorageCache/HPCCache/help/Get-AzHpcCache.md b/src/StorageCache/HPCCache/help/Get-AzHpcCache.md
index d2287defa1d9..5fc3226316ef 100644
--- a/src/StorageCache/HPCCache/help/Get-AzHpcCache.md
+++ b/src/StorageCache/HPCCache/help/Get-AzHpcCache.md
@@ -18,7 +18,7 @@ Get-AzHPCCache [-ResourceGroupName <String>] [-CacheName <String>] [-DefaultProf
 ```
 
 ## DESCRIPTION
-The **Get-AzHpcCache** cmdlet gets a single cache, cache(s) in a specific ResourceGroup, or subscription wide list of caches.
+The **Get-AzHpcCache** cmdlet gets a single cache, cache(s) in a specific resource group, or subscription wide list of caches.
 
 ## EXAMPLES
 
@@ -27,7 +27,16 @@ The **Get-AzHpcCache** cmdlet gets a single cache, cache(s) in a specific Resour
 PS C:\> Get-AzHPCCache -ResourceGroupName rgtest -CacheName cachetest
 ```
 
-{{ Add example description here }}
+### Example 2
+```powershell
+PS C:\> Get-AzHPCCache -ResourceGroupName rgtest 
+```
+
+### Example 3
+```powershell
+PS C:\> Get-AzHPCCache 
+```
+
 
 ## PARAMETERS
 
diff --git a/src/StorageCache/HPCCache/help/Get-AzHpcCacheSku.md b/src/StorageCache/HPCCache/help/Get-AzHpcCacheSku.md
index 88d998f48de6..574e4015e969 100644
--- a/src/StorageCache/HPCCache/help/Get-AzHpcCacheSku.md
+++ b/src/StorageCache/HPCCache/help/Get-AzHpcCacheSku.md
@@ -23,10 +23,9 @@ The **Get-AzHpcCacheSku** cmdlet returns a list of SKUs available in subscriptio
 
 ### Example 1
 ```powershell
-PS C:\> GetAzHpcCacheSku 
+PS C:\> Get-AzHpcCacheSku 
 ```
 
-
 ## PARAMETERS
 
 ### -DefaultProfile
diff --git a/src/StorageCache/HPCCache/help/Get-AzHpcCacheStorageTarget.md b/src/StorageCache/HPCCache/help/Get-AzHpcCacheStorageTarget.md
index 2247a67e3a29..b4e99499b247 100644
--- a/src/StorageCache/HPCCache/help/Get-AzHpcCacheStorageTarget.md
+++ b/src/StorageCache/HPCCache/help/Get-AzHpcCacheStorageTarget.md
@@ -24,13 +24,18 @@ The **Get-AzHpcCacheStorageTarget** cmdlet gets storage target(s) that exist on
 
 ### Example 1
 ```powershell
-PS C:\> Get-AzHpcCacheStorageTarget -ResourceGroupName rgtest -CacheName cachetest
+PS C:\> Get-AzHpcCacheStorageTarget -ResourceGroupName rgTest -CacheName cacheTest
+```
+
+### Example 2
+```powershell
+PS C:\> Get-AzHpcCacheStorageTarget -ResourceGroupName rgTest -CacheName cacheTest -StorageTargetName stTest
 ```
 
 ## PARAMETERS
 
 ### -CacheName
-Name of  cache.
+Name of cache.
 
 ```yaml
 Type: System.String
@@ -74,7 +79,7 @@ Accept wildcard characters: False
 ```
 
 ### -StorageTargetName
-Name of Storage Target. 
+Name of storage target. 
 
 ```yaml
 Type: System.String
diff --git a/src/StorageCache/HPCCache/help/Get-AzHpcCacheUsageModels.md b/src/StorageCache/HPCCache/help/Get-AzHpcCacheUsageModels.md
index 9b0e5cc9f283..66029218019e 100644
--- a/src/StorageCache/HPCCache/help/Get-AzHpcCacheUsageModels.md
+++ b/src/StorageCache/HPCCache/help/Get-AzHpcCacheUsageModels.md
@@ -53,6 +53,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### Microsoft.Azure.PowerShell.Cmdlets.HPCCache.Models.PSHpcUsageModels
+
 ### System.Object
 ## NOTES
 
diff --git a/src/StorageCache/HPCCache/help/New-AzHpcCache.md b/src/StorageCache/HPCCache/help/New-AzHpcCache.md
index eee043bc3e7d..4f3b1c88f45d 100644
--- a/src/StorageCache/HPCCache/help/New-AzHpcCache.md
+++ b/src/StorageCache/HPCCache/help/New-AzHpcCache.md
@@ -30,7 +30,7 @@ PS C:\> New-AzHpcCache -ResourceGroupName testRG -CacheName testCache -Sku Stand
 ## PARAMETERS
 
 ### -CacheName
-Name of  cache.
+Name of cache.
 
 ```yaml
 Type: System.String
@@ -45,7 +45,7 @@ Accept wildcard characters: False
 ```
 
 ### -CacheSize
-cacheSize.
+CacheSize.
 
 ```yaml
 Type: System.Int32
@@ -75,7 +75,7 @@ Accept wildcard characters: False
 ```
 
 ### -Location
-location.
+Location.
 
 ```yaml
 Type: System.String
@@ -120,7 +120,7 @@ Accept wildcard characters: False
 ```
 
 ### -SubnetUri
-subnetURI.
+SubnetURI.
 
 ```yaml
 Type: System.String
@@ -135,7 +135,7 @@ Accept wildcard characters: False
 ```
 
 ### -Tag
-The tags to associate with the HPC Cache.
+The tags to associate with HPC Cache.
 
 ```yaml
 Type: System.Collections.Hashtable
diff --git a/src/StorageCache/HPCCache/help/New-AzHpcCacheStorageTarget.md b/src/StorageCache/HPCCache/help/New-AzHpcCacheStorageTarget.md
index ea8a19e224e4..7fe2ed452c25 100644
--- a/src/StorageCache/HPCCache/help/New-AzHpcCacheStorageTarget.md
+++ b/src/StorageCache/HPCCache/help/New-AzHpcCacheStorageTarget.md
@@ -34,7 +34,7 @@ PS C:\> New-AzHpcCacheStorageTarget -ResourceGroupName testRG -CacheName testCac
 ## PARAMETERS
 
 ### -CacheName
-Name of  cache.
+Name of cache.
 
 ```yaml
 Type: System.String
@@ -64,7 +64,22 @@ Accept wildcard characters: False
 ```
 
 ### -ResourceGroupName
-Name of resource group under which you want to remove storage target.
+"Name of resource group under which you want to create storage target for given cache.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
+### -StorageContainerID
+StorageContainerID
 
 ```yaml
 Type: System.String
@@ -79,7 +94,7 @@ Accept wildcard characters: False
 ```
 
 ### -StorageTargetName
-Name of Storage Target. 
+Name of storage target. 
 
 ```yaml
 Type: System.String
@@ -93,6 +108,51 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -NFS
+Update NFS Storage Target type.
+
+```yaml
+Type: System.Management.Automation.SwitchParameter
+Parameter Sets: NfsStorageTargetParameterSet
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -CLFS
+Update CLFS Storage Target type.
+
+```yaml
+Type: System.Management.Automation.SwitchParameter
+Parameter Sets: NfsStorageTargetParameterSet
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -Junctions
+Virtual namespace path of Storage Target. 
+
+```yaml
+Type: System.Collections.Hashtable[]
+Parameter Sets: ClfsStorageTargetParameterSet, NfsStorageTargetParameterSet
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -AsJob
 Run cmdlet in the background
 
@@ -117,6 +177,9 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### Microsoft.Azure.PowerShell.Cmdlets.HPCCache.Models.PsHpcStorageTarget
+
+
 ## NOTES
 
 ## RELATED LINKS
diff --git a/src/StorageCache/HPCCache/help/Remove-AzHpcCache.md b/src/StorageCache/HPCCache/help/Remove-AzHpcCache.md
index 6af25873c7e1..e5d1dd5028d7 100644
--- a/src/StorageCache/HPCCache/help/Remove-AzHpcCache.md
+++ b/src/StorageCache/HPCCache/help/Remove-AzHpcCache.md
@@ -31,7 +31,7 @@ PS C:\> Remove-AzHpcCache -ResourceGroupName testRG -CacheName testCache
 ## PARAMETERS
 
 ### -CacheName
-Name of  cache.
+Name of cache.
 
 ```yaml
 Type: System.String
@@ -46,7 +46,7 @@ Accept wildcard characters: False
 ```
 
 ### -Force
-Forces the command to run without asking for user confirmation.
+Indicates that the cmdlet does not prompt you for confirmation. By default, this cmdlet prompts you to confirm that you want to remove the cache.
 
 ```yaml
 Type: System.Management.Automation.SwitchParameter
@@ -92,7 +92,7 @@ Accept wildcard characters: False
 ```
 
 ### -ResourceGroupName
-Name of resource group under which you want to delete cache.
+Name of resource group under which you want to remove cache.
 
 ```yaml
 Type: System.String
@@ -131,8 +131,6 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.PowerShell.Cmdlets.HPCCache.Models.PSHPCCache
-
 ## NOTES
 
 ## RELATED LINKS
diff --git a/src/StorageCache/HPCCache/help/Remove-AzHpcCacheStorageTarget.md b/src/StorageCache/HPCCache/help/Remove-AzHpcCacheStorageTarget.md
index 738e7c77a351..0ede2edb792d 100644
--- a/src/StorageCache/HPCCache/help/Remove-AzHpcCacheStorageTarget.md
+++ b/src/StorageCache/HPCCache/help/Remove-AzHpcCacheStorageTarget.md
@@ -31,7 +31,7 @@ PS C:\> Remove-AzHpcCacheStorageTarget -ResourceGroupName testRG -CacheName test
 ## PARAMETERS
 
 ### -CacheName
-Name of  cache.
+Name of cache.
 
 ```yaml
 Type: System.String
@@ -46,7 +46,7 @@ Accept wildcard characters: False
 ```
 
 ### -Force
-Forces the command to run without asking for user confirmation.
+Indicates that the cmdlet does not prompt you for confirmation. By default, this cmdlet prompts you to confirm that you want to remove the storage target.
 
 ```yaml
 Type: System.Management.Automation.SwitchParameter
@@ -92,7 +92,7 @@ Accept wildcard characters: False
 ```
 
 ### -ResourceGroupName
-Name of resource group under which you want to remove storage target.
+Name of resource group under which you want to remove storage target from cache.
 
 ```yaml
 Type: System.String
@@ -107,7 +107,7 @@ Accept wildcard characters: False
 ```
 
 ### -StorageTargetName
-Name of Storage Target. 
+Name of storage target. 
 
 ```yaml
 Type: System.String
diff --git a/src/StorageCache/HPCCache/help/Set-AzHpcCache.md b/src/StorageCache/HPCCache/help/Set-AzHpcCache.md
index f752a684bcc4..868d8cf8e12f 100644
--- a/src/StorageCache/HPCCache/help/Set-AzHpcCache.md
+++ b/src/StorageCache/HPCCache/help/Set-AzHpcCache.md
@@ -30,7 +30,7 @@ PS C:\> Set-AzHpcCache -ResourceGroupName testRG -CacheName testCache -Tag @{"ta
 ## PARAMETERS
 
 ### -CacheName
-Name of  cache.
+Name of cache.
 
 ```yaml
 Type: System.String
@@ -61,7 +61,7 @@ Accept wildcard characters: False
 ```
 
 ### -ResourceGroupName
-Name of resource group under which you want to create cache.
+Name of resource group under which you want to update cache.
 
 ```yaml
 Type: System.String
@@ -76,7 +76,7 @@ Accept wildcard characters: False
 ```
 
 ### -Tag
-The tags to associate with the Azure HPC Cache. 
+The tags to associate with HPC Cache. 
 
 ```yaml
 Type: System.Collections.Hashtable
diff --git a/src/StorageCache/HPCCache/help/Set-AzHpcCacheStorageTarget.md b/src/StorageCache/HPCCache/help/Set-AzHpcCacheStorageTarget.md
index ba739fffd497..83c851069e25 100644
--- a/src/StorageCache/HPCCache/help/Set-AzHpcCacheStorageTarget.md
+++ b/src/StorageCache/HPCCache/help/Set-AzHpcCacheStorageTarget.md
@@ -36,7 +36,7 @@ PS C:\> Set-AzHpcCacheStorageTarget -ResourceGroupName testRG -CacheName testCac
 ## PARAMETERS
 
 ### -CacheName
-Name of  cache.
+Name of cache.
 
 ```yaml
 Type: System.String
@@ -81,7 +81,7 @@ Accept wildcard characters: False
 ```
 
 ### -StorageTargetName
-Name of Storage Target. 
+Name of storage target. 
 
 ```yaml
 Type: System.String
@@ -96,7 +96,7 @@ Accept wildcard characters: False
 ```
 
 ### -NFS
-NFS Storage Target type.
+Update NFS Storage Target type.
 
 ```yaml
 Type: System.Management.Automation.SwitchParameter
@@ -111,7 +111,7 @@ Accept wildcard characters: False
 ```
 
 ### -CLFS
-CLFS Storage Target type.
+Update CLFS Storage Target type.
 
 ```yaml
 Type: System.Management.Automation.SwitchParameter
@@ -165,6 +165,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
+### Microsoft.Azure.PowerShell.Cmdlets.HPCCache.Models.PsHpcStorageTarget
+
 ## NOTES
 
 ## RELATED LINKS
diff --git a/src/StorageCache/HPCCache/help/Start-AzHpcCache.md b/src/StorageCache/HPCCache/help/Start-AzHpcCache.md
index 9d6867b1ad60..663ef6908e80 100644
--- a/src/StorageCache/HPCCache/help/Start-AzHpcCache.md
+++ b/src/StorageCache/HPCCache/help/Start-AzHpcCache.md
@@ -31,7 +31,7 @@ PS C:\> Start-AzHpcCache -ResourceGroupName testRG -CacheName testCache
 ## PARAMETERS
 
 ### -CacheName
-Name of  cache.
+Name of cache.
 
 ```yaml
 Type: System.String
@@ -45,6 +45,37 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -Force
+Indicates that the cmdlet does not prompt you for confirmation. By default, this cmdlet prompts you to confirm that you want to start the cache.
+
+```yaml
+Type: System.Management.Automation.SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -PassThru
+Returns an object representing the item with which you are working.
+By default, this cmdlet does not generate any output.
+
+```yaml
+Type: System.Management.Automation.SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -DefaultProfile
 The credentials, account, tenant, and subscription used for communication with Azure.
 
@@ -100,8 +131,6 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.PowerShell.Cmdlets.HPCCache.Models.PSHPCCache
-
 ## NOTES
 
 ## RELATED LINKS
diff --git a/src/StorageCache/HPCCache/help/Stop-AzHpcCache.md b/src/StorageCache/HPCCache/help/Stop-AzHpcCache.md
index c025bb94efa1..0c75489d675b 100644
--- a/src/StorageCache/HPCCache/help/Stop-AzHpcCache.md
+++ b/src/StorageCache/HPCCache/help/Stop-AzHpcCache.md
@@ -31,7 +31,7 @@ PS C:\> Stop-AzHpcCache -ResourceGroupName testRG -CacheName testCache
 ## PARAMETERS
 
 ### -CacheName
-Name of  cache.
+Name of cache.
 
 ```yaml
 Type: System.String
@@ -45,6 +45,37 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -Force
+Indicates that the cmdlet does not prompt you for confirmation. By default, this cmdlet prompts you to confirm that you want to stop the cache.
+
+```yaml
+Type: System.Management.Automation.SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -PassThru
+Returns an object representing the item with which you are working.
+By default, this cmdlet does not generate any output.
+
+```yaml
+Type: System.Management.Automation.SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -DefaultProfile
 The credentials, account, tenant, and subscription used for communication with Azure.
 
@@ -84,8 +115,6 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.PowerShell.Cmdlets.HPCCache.Models.PSHPCCache
-
 ## NOTES
 
 ## RELATED LINKS
diff --git a/src/StorageCache/HPCCache/help/Upgrade-AzHpcCache.md b/src/StorageCache/HPCCache/help/Upgrade-AzHpcCache.md
index c01b6dd8b636..fa7331eb45a9 100644
--- a/src/StorageCache/HPCCache/help/Upgrade-AzHpcCache.md
+++ b/src/StorageCache/HPCCache/help/Upgrade-AzHpcCache.md
@@ -31,7 +31,7 @@ PS C:\> Upgrade-AzHpcCache -ResourceGroupName testRG -CacheName testCache
 ## PARAMETERS
 
 ### -CacheName
-Name of  cache.
+Name of cache.
 
 ```yaml
 Type: System.String
@@ -46,7 +46,7 @@ Accept wildcard characters: False
 ```
 
 ### -Force
-Forces the command to run without asking for user confirmation.
+Indicates that the cmdlet does not prompt you for confirmation. By default, this cmdlet prompts you to confirm that you want to upgrade the cache.
 
 ```yaml
 Type: System.Management.Automation.SwitchParameter