diff --git a/src/Peering/Peering/Common/HelperExtensionMethods.cs b/src/Peering/Peering/Common/HelperExtensionMethods.cs
index 251c9a65b17b..8261b374aa14 100644
--- a/src/Peering/Peering/Common/HelperExtensionMethods.cs
+++ b/src/Peering/Peering/Common/HelperExtensionMethods.cs
@@ -113,7 +113,7 @@ public static IPAddress ToIpAddress(this BitArray self)
         /// <typeparam name="T"> The Type parameter
         /// </typeparam>
         /// <returns>
-        /// The <see cref="List"/>.
+        /// The <see cref="List{Variance}"/>.
         /// </returns>
         public static List<Variance> DetailedCompare<T>(this T val1, T val2)
         {
diff --git a/src/Peering/Peering/Common/PeeringBaseCmdlet.cs b/src/Peering/Peering/Common/PeeringBaseCmdlet.cs
index c0ec15a984a5..738c5de956c5 100644
--- a/src/Peering/Peering/Common/PeeringBaseCmdlet.cs
+++ b/src/Peering/Peering/Common/PeeringBaseCmdlet.cs
@@ -159,7 +159,7 @@ public PeeringModel ToPeering(object pSPeering)
         /// The peering.
         /// </param>
         /// <returns>
-        /// The <see cref="object"/>.
+        /// The <see cref="PSPeering"/>.
         /// </returns>
         public PSPeering ToPeeringPs(object peering)
         {
@@ -510,7 +510,7 @@ public virtual void Execute()
         /// <summary>
         /// Base Cmdlet execute.
         /// </summary>
-        /// <exception cref="NetworkErrorResponseException"></exception>
+        /// <exception cref="ErrorResponseException"></exception>
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
@@ -520,7 +520,7 @@ public override void ExecuteCmdlet()
         /// <summary>
         /// The get azure region.
         /// </summary>
-        /// <param name="PeeringLocation">
+        /// <param name="peeringLocation">
         /// The InputObject location.
         /// </param>
         /// <param name="kind">
@@ -529,7 +529,7 @@ public override void ExecuteCmdlet()
         /// <returns>
         /// The <see cref="string"/>.
         /// </returns>
-        /// <exception cref="Exception">
+        /// <exception cref="PSArgumentNullException">
         /// </exception>
         public string GetAzureRegion(string peeringLocation, string kind)
         {
diff --git a/src/Peering/Peering/Direct/SetAzureDirectPeeringConnectionCommand.cs b/src/Peering/Peering/Direct/SetAzureDirectPeeringConnectionCommand.cs
index a37a0f6feacd..11dd52139e14 100644
--- a/src/Peering/Peering/Direct/SetAzureDirectPeeringConnectionCommand.cs
+++ b/src/Peering/Peering/Direct/SetAzureDirectPeeringConnectionCommand.cs
@@ -35,6 +35,7 @@ public class SetAzureDirectPeeringConnectionCommand : PeeringBaseCmdlet
     {
         /// <summary>
         /// Gets or sets the legacy InputObject.
+        /// </summary>
         [Parameter(
              Mandatory = true,
              ValueFromPipeline = true,
diff --git a/src/Peering/Peering/Exchange/SetAzureExchangePeeringConnectionCommand.cs b/src/Peering/Peering/Exchange/SetAzureExchangePeeringConnectionCommand.cs
index eb01e9fda1bd..642ced1d02ca 100644
--- a/src/Peering/Peering/Exchange/SetAzureExchangePeeringConnectionCommand.cs
+++ b/src/Peering/Peering/Exchange/SetAzureExchangePeeringConnectionCommand.cs
@@ -34,6 +34,7 @@ public class SetAzureExchangePeeringConnectionCommand : PeeringBaseCmdlet
     {
         /// <summary>
         /// Gets or sets the legacy InputObject.
+        /// </summary>
         [Parameter(
              Mandatory = true,
              ValueFromPipeline = true,
diff --git a/src/Peering/Peering/PeerAsn/GetAzurePeerAsnCommand.cs b/src/Peering/Peering/PeerAsn/GetAzurePeerAsnCommand.cs
index 6fae2ca3e4f2..a3aa6636f6e6 100644
--- a/src/Peering/Peering/PeerAsn/GetAzurePeerAsnCommand.cs
+++ b/src/Peering/Peering/PeerAsn/GetAzurePeerAsnCommand.cs
@@ -103,7 +103,7 @@ private object GetPeerAsn(string peerName)
         /// The list peer asn.
         /// </summary>
         /// <returns>
-        /// The <see cref="List"/>.
+        /// The <see cref="List{T}"/>.
         /// </returns>
         private List<object> ListPeerAsn()
         {
diff --git a/src/Peering/Peering/PeerAsn/NewAzurePeerAsnCommand.cs b/src/Peering/Peering/PeerAsn/NewAzurePeerAsnCommand.cs
index 0f681ebbd815..d4dfa971c365 100644
--- a/src/Peering/Peering/PeerAsn/NewAzurePeerAsnCommand.cs
+++ b/src/Peering/Peering/PeerAsn/NewAzurePeerAsnCommand.cs
@@ -101,7 +101,7 @@ public override void Execute()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
@@ -118,7 +118,7 @@ private PSPeerAsn CreatePeerInfo()
         /// <summary>
         /// The put new InputObject.
         /// </summary>
-        /// <param name="newPeering">
+        /// <param name="psPeerInfo">
         /// The new InputObject.
         /// </param>
         /// <returns>
diff --git a/src/Peering/Peering/Peering/NewAzurePeeringCommand.cs b/src/Peering/Peering/Peering/NewAzurePeeringCommand.cs
index 04b5208fac2a..59febee14f43 100644
--- a/src/Peering/Peering/Peering/NewAzurePeeringCommand.cs
+++ b/src/Peering/Peering/Peering/NewAzurePeeringCommand.cs
@@ -239,7 +239,7 @@ public override void ExecuteCmdlet()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
@@ -318,7 +318,7 @@ private PSPeering CreateDirectPeering()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
@@ -391,10 +391,11 @@ private object PutNewPeering(PSPeering newPeering)
         /// <summary>
         /// The convert classic to Exchange peering.
         /// </summary>
+        /// <param name="peering">
         /// The classic peering.
         /// </param>
         /// <returns>
-        /// The <see cref="object"/>.
+        /// The <see cref="PSPeering"/>.
         /// </returns>
         private PSPeering ConvertClassicToExchangePeering(PSExchangePeeringModelView peering)
         {
@@ -437,11 +438,11 @@ private PSPeering ConvertClassicToExchangePeering(PSExchangePeeringModelView pee
         /// <summary>
         /// The convert classic to direct peering.
         /// </summary>
-        /// <param name="this.LegacyPeering">
+        /// <param name="peering">
         /// The classic peering.
         /// </param>
         /// <returns>
-        /// The <see cref="object"/>.
+        /// The <see cref="PSPeering"/>.
         /// </returns>
         private PSPeering ConvertClassicToDirectPeering(PSDirectPeeringModelView peering)
         {
diff --git a/src/Peering/Peering/Peering/RegisteredAsn/NewPeeringRegisteredAsnCommand.cs b/src/Peering/Peering/Peering/RegisteredAsn/NewPeeringRegisteredAsnCommand.cs
index 58fcb013f3ac..51f8222af026 100644
--- a/src/Peering/Peering/Peering/RegisteredAsn/NewPeeringRegisteredAsnCommand.cs
+++ b/src/Peering/Peering/Peering/RegisteredAsn/NewPeeringRegisteredAsnCommand.cs
@@ -158,7 +158,7 @@ public override void ExecuteCmdlet()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
@@ -187,7 +187,7 @@ private PSPeeringRegisteredAsn CreateParameterSetNameByResourceAndName()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
@@ -217,7 +217,7 @@ private PSPeeringRegisteredAsn CreateParameterSetNameByResourceId()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
diff --git a/src/Peering/Peering/Peering/RegisteredAsn/SetPeeringRegisteredAsnCommand.cs b/src/Peering/Peering/Peering/RegisteredAsn/SetPeeringRegisteredAsnCommand.cs
index 9a6066b595be..8abd7ffa3eee 100644
--- a/src/Peering/Peering/Peering/RegisteredAsn/SetPeeringRegisteredAsnCommand.cs
+++ b/src/Peering/Peering/Peering/RegisteredAsn/SetPeeringRegisteredAsnCommand.cs
@@ -13,7 +13,7 @@
 // ----------------------------------------------------------------------------------
 using System;
 using System.Management.Automation;
-
+using System.Net.Http;
 using Microsoft.Azure.Commands.Peering.Properties;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
@@ -156,7 +156,7 @@ public override void ExecuteCmdlet()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
@@ -185,7 +185,7 @@ private PSPeeringRegisteredAsn CreateParameterSetNameByResourceAndName()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
@@ -215,7 +215,7 @@ private PSPeeringRegisteredAsn CreateParameterSetNameByResourceId()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
diff --git a/src/Peering/Peering/Peering/RegisteredPrefix/NewAzPeeringRegisteredPrefixCommand.cs b/src/Peering/Peering/Peering/RegisteredPrefix/NewAzPeeringRegisteredPrefixCommand.cs
index fdf3bd372ab5..d12743cd2912 100644
--- a/src/Peering/Peering/Peering/RegisteredPrefix/NewAzPeeringRegisteredPrefixCommand.cs
+++ b/src/Peering/Peering/Peering/RegisteredPrefix/NewAzPeeringRegisteredPrefixCommand.cs
@@ -161,7 +161,7 @@ public override void ExecuteCmdlet()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
@@ -190,7 +190,7 @@ private PSPeeringRegisteredPrefix CreateParameterSetNameByResourceAndName()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
@@ -220,7 +220,7 @@ private PSPeeringRegisteredPrefix CreateParameterSetNameByResourceId()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
diff --git a/src/Peering/Peering/Peering/RegisteredPrefix/SetAzPeeringRegisteredPrefixCommand.cs b/src/Peering/Peering/Peering/RegisteredPrefix/SetAzPeeringRegisteredPrefixCommand.cs
index 959f875fc604..e5b65b20180a 100644
--- a/src/Peering/Peering/Peering/RegisteredPrefix/SetAzPeeringRegisteredPrefixCommand.cs
+++ b/src/Peering/Peering/Peering/RegisteredPrefix/SetAzPeeringRegisteredPrefixCommand.cs
@@ -13,7 +13,7 @@
 // ----------------------------------------------------------------------------------
 using System;
 using System.Management.Automation;
-
+using System.Net.Http;
 using Microsoft.Azure.Commands.Peering.Properties;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
@@ -159,7 +159,7 @@ public override void ExecuteCmdlet()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
@@ -188,7 +188,7 @@ private PSPeeringRegisteredPrefix CreateParameterSetNameByResourceAndName()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
@@ -218,7 +218,7 @@ private PSPeeringRegisteredPrefix CreateParameterSetNameByResourceId()
         /// </exception>
         /// <exception cref="Exception">
         /// </exception>
-        /// <exception cref="ArmErrorException">
+        /// <exception cref="ErrorResponseException">
         /// </exception>
         /// <exception cref="HttpRequestException">
         /// </exception>
diff --git a/src/Peering/Peering/Peering/UpdateAzurePeeringCommand.cs b/src/Peering/Peering/Peering/UpdateAzurePeeringCommand.cs
index 4f767027b0c1..a372b40a9f74 100644
--- a/src/Peering/Peering/Peering/UpdateAzurePeeringCommand.cs
+++ b/src/Peering/Peering/Peering/UpdateAzurePeeringCommand.cs
@@ -352,6 +352,12 @@ private PSDirectPeeringModelView GetAndUpdateDirectPeering()
         /// <param name="directPeering">
         /// The direct peering.
         /// </param>
+        /// <param name="resourceGroupName">
+        /// The resource group name.
+        /// </param>
+        /// <param name="name">
+        /// The name.
+        /// </param>
         /// <returns>
         /// The <see cref="PSDirectPeeringModelView"/>.
         /// </returns>
@@ -399,7 +405,7 @@ private PSExchangePeeringModelView GetAndUpdateExchangePeering()
         /// <summary>
         /// The update exchange peering.
         /// </summary>
-        /// <param name="psExchange">
+        /// <param name="exchangePeering">
         /// The ps exchange.
         /// </param>
         /// <param name="resourceGroupName">
diff --git a/src/Peering/Peering/PeeringService/GetAzurePeeringServiceCountryCommand.cs b/src/Peering/Peering/PeeringService/GetAzurePeeringServiceCountryCommand.cs
index 0af1ab1841a5..93ade81d4d41 100644
--- a/src/Peering/Peering/PeeringService/GetAzurePeeringServiceCountryCommand.cs
+++ b/src/Peering/Peering/PeeringService/GetAzurePeeringServiceCountryCommand.cs
@@ -44,7 +44,7 @@ public override void Execute()
         /// The get peering service location.
         /// </summary>
         /// <returns>
-        /// The <see cref="List"/>.
+        /// The <see cref="List{PSPeeringServiceCountry}"/>.
         /// </returns>
         /// <exception cref="ErrorResponseException">
         /// </exception>
diff --git a/src/Peering/Peering/PeeringService/GetAzurePeeringServiceLocationCommand.cs b/src/Peering/Peering/PeeringService/GetAzurePeeringServiceLocationCommand.cs
index 6958feb30ae7..ad48001b97a2 100644
--- a/src/Peering/Peering/PeeringService/GetAzurePeeringServiceLocationCommand.cs
+++ b/src/Peering/Peering/PeeringService/GetAzurePeeringServiceLocationCommand.cs
@@ -50,7 +50,7 @@ public override void Execute()
         /// The get peering service location.
         /// </summary>
         /// <returns>
-        /// The <see cref="List"/>.
+        /// The <see cref="List{PSPeeringServiceLocation}"/>.
         /// </returns>
         /// <exception cref="ErrorResponseException">
         /// </exception>
diff --git a/src/Peering/Peering/PeeringService/GetAzurePeeringServiceProviderCommand.cs b/src/Peering/Peering/PeeringService/GetAzurePeeringServiceProviderCommand.cs
index 68e528be822b..6d6f19c9c0ae 100644
--- a/src/Peering/Peering/PeeringService/GetAzurePeeringServiceProviderCommand.cs
+++ b/src/Peering/Peering/PeeringService/GetAzurePeeringServiceProviderCommand.cs
@@ -44,7 +44,7 @@ public override void Execute()
         /// The get peering service provider.
         /// </summary>
         /// <returns>
-        /// The <see cref="List"/>.
+        /// The <see cref="List{PSPeeringServiceProvider}"/>.
         /// </returns>
         /// <exception cref="ErrorResponseException">
         /// </exception>