diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/GetAzServiceFabricManagedClusterApplicationTypeVersion.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/GetAzServiceFabricManagedClusterApplicationTypeVersion.cs
index 9e3ebd7ce0a6..a983565a3ea2 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/GetAzServiceFabricManagedClusterApplicationTypeVersion.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/GetAzServiceFabricManagedClusterApplicationTypeVersion.cs
@@ -17,7 +17,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 
 namespace Microsoft.Azure.Commands.ServiceFabric.Commands
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/NewAzServiceFabricManagedClusterApplicationTypeVersion.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/NewAzServiceFabricManagedClusterApplicationTypeVersion.cs
index 78ef2bd91f20..c88e9f08fb1c 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/NewAzServiceFabricManagedClusterApplicationTypeVersion.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/NewAzServiceFabricManagedClusterApplicationTypeVersion.cs
@@ -17,7 +17,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/RemoveAzServiceFabricManagedClusterApplicationTypeVersion.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/RemoveAzServiceFabricManagedClusterApplicationTypeVersion.cs
index 5c08ed621a25..4e14b820a600 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/RemoveAzServiceFabricManagedClusterApplicationTypeVersion.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/RemoveAzServiceFabricManagedClusterApplicationTypeVersion.cs
@@ -16,7 +16,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 
 namespace Microsoft.Azure.Commands.ServiceFabric.Commands
 {
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/SetAzServiceFabricManagedClusterApplicationTypeVersion.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/SetAzServiceFabricManagedClusterApplicationTypeVersion.cs
index 7a3dd0ada3e4..16f47b9cce3e 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/SetAzServiceFabricManagedClusterApplicationTypeVersion.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypeVersions/SetAzServiceFabricManagedClusterApplicationTypeVersion.cs
@@ -18,7 +18,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/GetAzServiceFabricManagedClusterApplicationType.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/GetAzServiceFabricManagedClusterApplicationType.cs
index 2190413018cc..31f104ab82c2 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/GetAzServiceFabricManagedClusterApplicationType.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/GetAzServiceFabricManagedClusterApplicationType.cs
@@ -17,7 +17,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 
 namespace Microsoft.Azure.Commands.ServiceFabric.Commands
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/NewAzServiceFabricManagedClusterApplicationType.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/NewAzServiceFabricManagedClusterApplicationType.cs
index b48cc82dc58f..e8571d75f2d5 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/NewAzServiceFabricManagedClusterApplicationType.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/NewAzServiceFabricManagedClusterApplicationType.cs
@@ -14,7 +14,7 @@
 
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 using System;
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/RemoveAzServiceFabricManagedClusterApplicationType.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/RemoveAzServiceFabricManagedClusterApplicationType.cs
index 392a2dd9a388..b6c2ba2f051a 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/RemoveAzServiceFabricManagedClusterApplicationType.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/RemoveAzServiceFabricManagedClusterApplicationType.cs
@@ -16,7 +16,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 
 namespace Microsoft.Azure.Commands.ServiceFabric.Commands
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/SetAzServiceFabricManagedClusterApplicationType.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/SetAzServiceFabricManagedClusterApplicationType.cs
index 4d425edfcb10..7225e7017992 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/SetAzServiceFabricManagedClusterApplicationType.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ApplicationTypes/SetAzServiceFabricManagedClusterApplicationType.cs
@@ -17,7 +17,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/GetAzServiceFabricManagedClusterApplication.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/GetAzServiceFabricManagedClusterApplication.cs
index e26cc964a52c..6578cbc25118 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/GetAzServiceFabricManagedClusterApplication.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/GetAzServiceFabricManagedClusterApplication.cs
@@ -17,7 +17,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 
 namespace Microsoft.Azure.Commands.ServiceFabric.Commands
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/NewAzServiceFabricManagedClusterApplication.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/NewAzServiceFabricManagedClusterApplication.cs
index e5beb8bdc137..c587515ba103 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/NewAzServiceFabricManagedClusterApplication.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/NewAzServiceFabricManagedClusterApplication.cs
@@ -18,7 +18,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/RemoveAzServiceFabricManagedClusterApplication.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/RemoveAzServiceFabricManagedClusterApplication.cs
index e6f5aeb8c587..03201ed619d9 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/RemoveAzServiceFabricManagedClusterApplication.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/RemoveAzServiceFabricManagedClusterApplication.cs
@@ -16,7 +16,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 
 namespace Microsoft.Azure.Commands.ServiceFabric.Commands
 {
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/SetAzServiceFabricManagedClusterApplication.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/SetAzServiceFabricManagedClusterApplication.cs
index dec181b2feec..166670af3d34 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/SetAzServiceFabricManagedClusterApplication.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/SetAzServiceFabricManagedClusterApplication.cs
@@ -19,7 +19,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
@@ -124,7 +124,7 @@ public class SetAzServiceFabricManagedClusterApplication : ManagedApplicationCmd
             HelpMessage = "The mode used to monitor health during a rolling upgrade. The values are Monitored, and UnmonitoredAuto.")]
         [Parameter(Mandatory = false, ParameterSetName = ByInputObject,
             HelpMessage = "The mode used to monitor health during a rolling upgrade. The values are Monitored, and UnmonitoredAuto.")]
-        public UpgradeMode UpgradeMode { get; set; }
+        public ApplicationUpgradeMode UpgradeMode { get; set; }
 
         #region RollingUpgradeMonitoringPolicy
 
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/AddAzServiceFabricManagedClusterClientCertificate.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/AddAzServiceFabricManagedClusterClientCertificate.cs
index c07a46672ff5..24a7ed7371d2 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/AddAzServiceFabricManagedClusterClientCertificate.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/AddAzServiceFabricManagedClusterClientCertificate.cs
@@ -16,7 +16,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/GetAzServiceFabricManagedCluster.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/GetAzServiceFabricManagedCluster.cs
index 6fd3b226d25c..5e94185edc52 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/GetAzServiceFabricManagedCluster.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/GetAzServiceFabricManagedCluster.cs
@@ -16,7 +16,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/NewAzServiceFabricManagedCluster.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/NewAzServiceFabricManagedCluster.cs
index ecc097f9c67c..8c7d4a60b7cc 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/NewAzServiceFabricManagedCluster.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/NewAzServiceFabricManagedCluster.cs
@@ -17,7 +17,7 @@
 using System.Security;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.Internal.Resources.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/RemoveAzServiceFabricManagedCluster.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/RemoveAzServiceFabricManagedCluster.cs
index e87a40c44d36..56ba34d3fba5 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/RemoveAzServiceFabricManagedCluster.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/RemoveAzServiceFabricManagedCluster.cs
@@ -15,7 +15,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 
 namespace Microsoft.Azure.Commands.ServiceFabric.Commands
 {
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/RemoveAzServiceFabricManagedClusterClientCertificate.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/RemoveAzServiceFabricManagedClusterClientCertificate.cs
index 1ac6466f720c..f0d2e8571698 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/RemoveAzServiceFabricManagedClusterClientCertificate.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/RemoveAzServiceFabricManagedClusterClientCertificate.cs
@@ -16,7 +16,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/SetAzServiceFabricManagedCluster.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/SetAzServiceFabricManagedCluster.cs
index a8f176c5500f..03076896d3ba 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/SetAzServiceFabricManagedCluster.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/ManagedClusters/SetAzServiceFabricManagedCluster.cs
@@ -15,7 +15,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/AddAzServiceFabricManagedNodeTypeVMExtension.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/AddAzServiceFabricManagedNodeTypeVMExtension.cs
index 421625c45b33..643bb3574402 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/AddAzServiceFabricManagedNodeTypeVMExtension.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/AddAzServiceFabricManagedNodeTypeVMExtension.cs
@@ -16,7 +16,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/AddAzServiceFabricManagedNodeTypeVMSecret.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/AddAzServiceFabricManagedNodeTypeVMSecret.cs
index c4fa389e577d..0d58c2bd76b7 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/AddAzServiceFabricManagedNodeTypeVMSecret.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/AddAzServiceFabricManagedNodeTypeVMSecret.cs
@@ -17,7 +17,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/GetAzServiceFabricManagedNodeType.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/GetAzServiceFabricManagedNodeType.cs
index 9cf0ec65e865..99ce848e86a5 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/GetAzServiceFabricManagedNodeType.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/GetAzServiceFabricManagedNodeType.cs
@@ -16,7 +16,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/NewAzServiceFabricManagedNodeType.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/NewAzServiceFabricManagedNodeType.cs
index ee777c1305d2..87580632e66a 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/NewAzServiceFabricManagedNodeType.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/NewAzServiceFabricManagedNodeType.cs
@@ -17,7 +17,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/RemoveAzServiceFabricManagedNodeType.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/RemoveAzServiceFabricManagedNodeType.cs
index d7a5db3effb4..9ac21abcd63a 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/RemoveAzServiceFabricManagedNodeType.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/RemoveAzServiceFabricManagedNodeType.cs
@@ -15,7 +15,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 
 namespace Microsoft.Azure.Commands.ServiceFabric.Commands
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/RemoveAzServiceFabricManagedNodeTypeVMExtension.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/RemoveAzServiceFabricManagedNodeTypeVMExtension.cs
index aa8bbfffa8e2..df5b728437e9 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/RemoveAzServiceFabricManagedNodeTypeVMExtension.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/RemoveAzServiceFabricManagedNodeTypeVMExtension.cs
@@ -16,7 +16,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/SetAzServiceFabricManagedNodeType.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/SetAzServiceFabricManagedNodeType.cs
index 6f2f28a4c1df..e6482fa840d7 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/SetAzServiceFabricManagedNodeType.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/NodeTypes/SetAzServiceFabricManagedNodeType.cs
@@ -17,7 +17,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/GetAzServiceFabricManagedClusterService.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/GetAzServiceFabricManagedClusterService.cs
index 44dcbcc73830..f0ce1403dc33 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/GetAzServiceFabricManagedClusterService.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/GetAzServiceFabricManagedClusterService.cs
@@ -17,7 +17,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 
 namespace Microsoft.Azure.Commands.ServiceFabric.Commands
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/NewAzServiceFabricManagedClusterService.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/NewAzServiceFabricManagedClusterService.cs
index 5eafd8c024fc..f863675be5c7 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/NewAzServiceFabricManagedClusterService.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/NewAzServiceFabricManagedClusterService.cs
@@ -19,7 +19,6 @@
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
 using Microsoft.Azure.Commands.ServiceFabric.Models;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/RemoveAzServiceFabricManagedClusterService.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/RemoveAzServiceFabricManagedClusterService.cs
index 2b208d7c92c0..45e7d34f84bb 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/RemoveAzServiceFabricManagedClusterService.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/RemoveAzServiceFabricManagedClusterService.cs
@@ -16,7 +16,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
+using Microsoft.Azure.Commands.ServiceFabric.Models;
 
 namespace Microsoft.Azure.Commands.ServiceFabric.Commands
 {
diff --git a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/SetAzServiceFabricManagedClusterService.cs b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/SetAzServiceFabricManagedClusterService.cs
index 6a16d761adc9..d0bd9680f6de 100644
--- a/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/SetAzServiceFabricManagedClusterService.cs
+++ b/src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Services/SetAzServiceFabricManagedClusterService.cs
@@ -19,7 +19,6 @@
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
 using Microsoft.Azure.Commands.ServiceFabric.Models;
-using Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
diff --git a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/UpgradeMode.cs b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/ApplicationUpgradeMode.cs
similarity index 89%
rename from src/ServiceFabric/ServiceFabric/Models/ManagedClusters/UpgradeMode.cs
rename to src/ServiceFabric/ServiceFabric/Models/ManagedClusters/ApplicationUpgradeMode.cs
index 85b4fb0ca9cc..2f294300038d 100644
--- a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/UpgradeMode.cs
+++ b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/ApplicationUpgradeMode.cs
@@ -12,9 +12,9 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters
+namespace Microsoft.Azure.Commands.ServiceFabric.Models
 {
-    public enum UpgradeMode
+    public enum ApplicationUpgradeMode
     {
         Monitored,
         UnmonitoredAuto
diff --git a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/ManagedClusterSku.cs b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/ManagedClusterSku.cs
index 1b0a645fdb69..ee2a6d3dc9f7 100644
--- a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/ManagedClusterSku.cs
+++ b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/ManagedClusterSku.cs
@@ -11,7 +11,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters
+namespace Microsoft.Azure.Commands.ServiceFabric.Models
 {
     public enum ManagedClusterSku
     {
diff --git a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedApplication.cs b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedApplication.cs
index 5b8790db4f92..a76d107aa686 100644
--- a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedApplication.cs
+++ b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedApplication.cs
@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters
+namespace Microsoft.Azure.Commands.ServiceFabric.Models
 {
     using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 
diff --git a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedApplicationType.cs b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedApplicationType.cs
index f1091656275f..da1984a59da2 100644
--- a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedApplicationType.cs
+++ b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedApplicationType.cs
@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters
+namespace Microsoft.Azure.Commands.ServiceFabric.Models
 {
     using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 
diff --git a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedApplicationTypeVersion.cs b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedApplicationTypeVersion.cs
index 538f52db55a2..a5c8ddcbec55 100644
--- a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedApplicationTypeVersion.cs
+++ b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedApplicationTypeVersion.cs
@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters
+namespace Microsoft.Azure.Commands.ServiceFabric.Models
 {
     using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 
diff --git a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedCluster.cs b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedCluster.cs
index 02ee833bdcf9..6ad93238415e 100644
--- a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedCluster.cs
+++ b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedCluster.cs
@@ -14,7 +14,7 @@
 
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 
-namespace Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters
+namespace Microsoft.Azure.Commands.ServiceFabric.Models
 {
     public class PSManagedCluster : ManagedCluster
     {
diff --git a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedNodeType.cs b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedNodeType.cs
index ba122b5ad400..1a361a1530f5 100644
--- a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedNodeType.cs
+++ b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedNodeType.cs
@@ -14,7 +14,7 @@
 
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 
-namespace Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters
+namespace Microsoft.Azure.Commands.ServiceFabric.Models
 {
     public class PSManagedNodeType : NodeType
     {
diff --git a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedService.cs b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedService.cs
index 3e5ab29e278d..2a8db0a05c25 100644
--- a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedService.cs
+++ b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSManagedService.cs
@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters
+namespace Microsoft.Azure.Commands.ServiceFabric.Models
 {
     using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 
diff --git a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSServiceCorrelation.cs b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSServiceCorrelation.cs
index 9a55c41a4bd3..04a8e10bc7ae 100644
--- a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSServiceCorrelation.cs
+++ b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSServiceCorrelation.cs
@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters
+namespace Microsoft.Azure.Commands.ServiceFabric.Models
 {
     using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 
diff --git a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSServiceMetric.cs b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSServiceMetric.cs
index 5fe9942269f3..e385e3cfc362 100644
--- a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSServiceMetric.cs
+++ b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/PSServiceMetric.cs
@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters
+namespace Microsoft.Azure.Commands.ServiceFabric.Models
 {
     using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
 
diff --git a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/ServicePackageActivationModeEnum.cs b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/ServicePackageActivationModeEnum.cs
index bc726408d6c3..65087eb395b2 100644
--- a/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/ServicePackageActivationModeEnum.cs
+++ b/src/ServiceFabric/ServiceFabric/Models/ManagedClusters/ServicePackageActivationModeEnum.cs
@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters
+namespace Microsoft.Azure.Commands.ServiceFabric.Models
 {
     public enum ServicePackageActivationModeEnum
     {
diff --git a/src/ServiceFabric/ServiceFabric/help/Add-AzServiceFabricManagedClusterClientCertificate.md b/src/ServiceFabric/ServiceFabric/help/Add-AzServiceFabricManagedClusterClientCertificate.md
index 9bfdfac73e12..c0b04ed67c44 100644
--- a/src/ServiceFabric/ServiceFabric/help/Add-AzServiceFabricManagedClusterClientCertificate.md
+++ b/src/ServiceFabric/ServiceFabric/help/Add-AzServiceFabricManagedClusterClientCertificate.md
@@ -139,7 +139,7 @@ Accept wildcard characters: False
 Managed cluster resource
 
 ```yaml
-Type: Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedCluster
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedCluster
 Parameter Sets: ClientCertByTpByObj, ClientCertByCnByObj
 Aliases:
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Add-AzServiceFabricManagedNodeTypeVMExtension.md b/src/ServiceFabric/ServiceFabric/help/Add-AzServiceFabricManagedNodeTypeVMExtension.md
index df9c144674ed..436838c7045e 100644
--- a/src/ServiceFabric/ServiceFabric/help/Add-AzServiceFabricManagedNodeTypeVMExtension.md
+++ b/src/ServiceFabric/ServiceFabric/help/Add-AzServiceFabricManagedNodeTypeVMExtension.md
@@ -150,7 +150,7 @@ Accept wildcard characters: False
 Node Type resource
 
 ```yaml
-Type: Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedNodeType
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedNodeType
 Parameter Sets: ByObj
 Aliases:
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Add-AzServiceFabricManagedNodeTypeVMSecret.md b/src/ServiceFabric/ServiceFabric/help/Add-AzServiceFabricManagedNodeTypeVMSecret.md
index 954dee495288..70ca75ad81a4 100644
--- a/src/ServiceFabric/ServiceFabric/help/Add-AzServiceFabricManagedNodeTypeVMSecret.md
+++ b/src/ServiceFabric/ServiceFabric/help/Add-AzServiceFabricManagedNodeTypeVMSecret.md
@@ -137,7 +137,7 @@ Accept wildcard characters: False
 Node Type resource
 
 ```yaml
-Type: Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedNodeType
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedNodeType
 Parameter Sets: ByObj
 Aliases:
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Az.ServiceFabric.md b/src/ServiceFabric/ServiceFabric/help/Az.ServiceFabric.md
index 5b31bdfee285..04993e346b89 100644
--- a/src/ServiceFabric/ServiceFabric/help/Az.ServiceFabric.md
+++ b/src/ServiceFabric/ServiceFabric/help/Az.ServiceFabric.md
@@ -47,6 +47,18 @@ Get the cluster resource details.
 ### [Get-AzServiceFabricManagedCluster](Get-AzServiceFabricManagedCluster.md)
 Get the managed cluster resource details.
 
+### [Get-AzServiceFabricManagedClusterApplication](Get-AzServiceFabricManagedClusterApplication.md)
+Get Service Fabric managed application details. Only supports ARM deployed applications.
+
+### [Get-AzServiceFabricManagedClusterApplicationType](Get-AzServiceFabricManagedClusterApplicationType.md)
+Get Service Fabric managed application type details. Only supports ARM deployed application types.
+
+### [Get-AzServiceFabricManagedClusterApplicationTypeVersion](Get-AzServiceFabricManagedClusterApplicationTypeVersion.md)
+Get Service Fabric managed application type version details. Only supports ARM deployed application type versions.
+
+### [Get-AzServiceFabricManagedClusterService](Get-AzServiceFabricManagedClusterService.md)
+Get Service Fabric managed service details under the specified application and cluster. Only supports ARM deployed services.
+
 ### [Get-AzServiceFabricManagedNodeType](Get-AzServiceFabricManagedNodeType.md)
 Get the managed node type resource details.
 
@@ -68,6 +80,18 @@ This command uses certificates that you provide or system generated self-signed
 ### [New-AzServiceFabricManagedCluster](New-AzServiceFabricManagedCluster.md)
 Create new managed cluster.
 
+### [New-AzServiceFabricManagedClusterApplication](New-AzServiceFabricManagedClusterApplication.md)
+Create new service fabric managed application under the specified resource group and cluster.
+
+### [New-AzServiceFabricManagedClusterApplicationType](New-AzServiceFabricManagedClusterApplicationType.md)
+Create new service fabric managed application type under the specified resource group and cluster.
+
+### [New-AzServiceFabricManagedClusterApplicationTypeVersion](New-AzServiceFabricManagedClusterApplicationTypeVersion.md)
+Create new managed application type version under the specified resource group and cluster.
+
+### [New-AzServiceFabricManagedClusterService](New-AzServiceFabricManagedClusterService.md)
+Create new service fabric managed service under the specified application and cluster.
+
 ### [New-AzServiceFabricManagedNodeType](New-AzServiceFabricManagedNodeType.md)
 Create new node type resource.
 
@@ -92,9 +116,21 @@ Remove a cluster certificate from being used for cluster security.
 ### [Remove-AzServiceFabricManagedCluster](Remove-AzServiceFabricManagedCluster.md)
 Remove cluster resource.
 
+### [Remove-AzServiceFabricManagedClusterApplication](Remove-AzServiceFabricManagedClusterApplication.md)
+Remove an managed application from the cluster. This will remove all the managed services under the application. Only supports ARM deployed applications.
+
+### [Remove-AzServiceFabricManagedClusterApplicationType](Remove-AzServiceFabricManagedClusterApplicationType.md)
+Removes a managed application type from the cluster. This will remove all type versions under this resource. Only supports ARM deployed application types.
+
+### [Remove-AzServiceFabricManagedClusterApplicationTypeVersion](Remove-AzServiceFabricManagedClusterApplicationTypeVersion.md)
+Removes a managed application type version from the cluster. Only supports ARM deployed application type versions.
+
 ### [Remove-AzServiceFabricManagedClusterClientCertificate](Remove-AzServiceFabricManagedClusterClientCertificate.md)
 Remvoe client certificate by thumbprint or common name.
 
+### [Remove-AzServiceFabricManagedClusterService](Remove-AzServiceFabricManagedClusterService.md)
+Remove a managed service from the cluster. Only supports ARM deployed services.
+
 ### [Remove-AzServiceFabricManagedNodeType](Remove-AzServiceFabricManagedNodeType.md)
 Remove the node type or specific nodes within the node type.
 
@@ -119,6 +155,18 @@ Restart specific nodes from the node type.
 ### [Set-AzServiceFabricManagedCluster](Set-AzServiceFabricManagedCluster.md)
 Set cluster resource properties.
 
+### [Set-AzServiceFabricManagedClusterApplication](Set-AzServiceFabricManagedClusterApplication.md)
+Update a service fabric managed application. This allows to update the application parameters and/or upgrade the application type version which will trigger an application upgrade or other configuration only updates. Only supports ARM deployed applications.
+
+### [Set-AzServiceFabricManagedClusterApplicationType](Set-AzServiceFabricManagedClusterApplicationType.md)
+Update a service fabric managed application type. This allows you to update the tags. Only supports ARM deployed application types.
+
+### [Set-AzServiceFabricManagedClusterApplicationTypeVersion](Set-AzServiceFabricManagedClusterApplicationTypeVersion.md)
+Update a service fabric managed application type version. This allows you to update the tags and package Url. Only supports ARM deployed application type versions.
+
+### [Set-AzServiceFabricManagedClusterService](Set-AzServiceFabricManagedClusterService.md)
+Update a managed service from the cluster. Only supports ARM deployed services.
+
 ### [Set-AzServiceFabricManagedNodeType](Set-AzServiceFabricManagedNodeType.md)
 Sets node type resource properties or run reimage actions on specific ndes of the node type with -Reimage parameter.
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterApplication.md b/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterApplication.md
index 914ad4e68d07..a849bf3e9563 100644
--- a/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterApplication.md
+++ b/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterApplication.md
@@ -62,14 +62,13 @@ PS C:\> Get-AzServiceFabricManagedClusterApplication -ResourceId $resourceId
 
 This example will get the managed application details with the ARM Resource ID specified, if it doesn't find the resource it will throw an exception.
 
-
 ## PARAMETERS
 
 ### -ClusterName
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroupAndCluster, ByName
 Aliases:
 
@@ -84,7 +83,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -99,7 +98,7 @@ Accept wildcard characters: False
 Specify the name of the managed application.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByName
 Aliases: ApplicationName
 
@@ -114,7 +113,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroupAndCluster, ByName
 Aliases:
 
@@ -129,7 +128,7 @@ Accept wildcard characters: False
 Arm ResourceId of the managed application.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceId
 Aliases:
 
@@ -149,7 +148,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplication
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplication
 
 ## NOTES
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterApplicationType.md b/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterApplicationType.md
index d906295ed1ff..66c6532c54f3 100644
--- a/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterApplicationType.md
+++ b/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterApplicationType.md
@@ -68,7 +68,7 @@ This example will get the managed application type details with the ARM Resource
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroupAndCluster, ByName
 Aliases:
 
@@ -83,7 +83,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -98,7 +98,7 @@ Accept wildcard characters: False
 Specify the name of the managed application type
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByName
 Aliases: ApplicationTypeName
 
@@ -113,7 +113,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroupAndCluster, ByName
 Aliases:
 
@@ -128,7 +128,7 @@ Accept wildcard characters: False
 Arm ResourceId of the managed application type.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceId
 Aliases:
 
@@ -148,7 +148,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplicationType
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplicationType
 
 ## NOTES
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterApplicationTypeVersion.md b/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterApplicationTypeVersion.md
index b42a193ec7ff..5d1c98c4e77c 100644
--- a/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterApplicationTypeVersion.md
+++ b/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterApplicationTypeVersion.md
@@ -64,14 +64,13 @@ PS C:\> Get-AzServiceFabricManagedClusterApplicationTypeVersion -ResourceId $res
 
 This example will get the managed application type version details with the ARM Resource ID specified, if it doesn't find the resource it will throw an exception.
 
-
 ## PARAMETERS
 
 ### -ClusterName
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroupAndCluster, ByVersion
 Aliases:
 
@@ -86,7 +85,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -101,7 +100,7 @@ Accept wildcard characters: False
 Specify the name of the managed application type.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroupAndCluster, ByVersion
 Aliases: ApplicationTypeName
 
@@ -116,7 +115,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroupAndCluster, ByVersion
 Aliases:
 
@@ -131,7 +130,7 @@ Accept wildcard characters: False
 Arm ResourceId of the managed application type version.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceId
 Aliases:
 
@@ -146,7 +145,7 @@ Accept wildcard characters: False
 Specify the version of the managed application type.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByVersion
 Aliases: ApplicationTypeVersion
 
@@ -166,7 +165,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplicationTypeVersion
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplicationTypeVersion
 
 ## NOTES
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterService.md b/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterService.md
index cea35855f4ec..907526173bd7 100644
--- a/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterService.md
+++ b/src/ServiceFabric/ServiceFabric/help/Get-AzServiceFabricManagedClusterService.md
@@ -70,7 +70,7 @@ This example will get the managed service details with the ARM Resource ID speci
 Specify the name of the managed application.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroupAndCluster, ByName
 Aliases:
 
@@ -85,7 +85,7 @@ Accept wildcard characters: False
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroupAndCluster, ByName
 Aliases:
 
@@ -100,7 +100,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -115,7 +115,7 @@ Accept wildcard characters: False
 Specify the name of the managed service.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByName
 Aliases: ServiceName
 
@@ -130,7 +130,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroupAndCluster, ByName
 Aliases:
 
@@ -145,7 +145,7 @@ Accept wildcard characters: False
 Arm ResourceId of the managed service.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceId
 Aliases:
 
@@ -165,7 +165,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedService
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedService
 
 ## NOTES
 
diff --git a/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedCluster.md b/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedCluster.md
index 3475650faec1..1cd58a676ab2 100644
--- a/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedCluster.md
+++ b/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedCluster.md
@@ -308,7 +308,7 @@ Accept wildcard characters: False
 Cluster's Sku, the options are Basic: it will have a minimum of 3 seed nodes and only allows 1 node type and Standard: it will have a minimum of 5 seed nodes and allows multiple node types.
 
 ```yaml
-Type: Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.ManagedClusterSku
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusterSku
 Parameter Sets: (All)
 Aliases:
 Accepted values: Basic, Standard
diff --git a/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterApplication.md b/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterApplication.md
index 9bf16992d372..9ac03c6e54c2 100644
--- a/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterApplication.md
+++ b/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterApplication.md
@@ -67,7 +67,7 @@ Specify the application parameters as key/value pairs.
 These parameters must exist in the application manifest.
 
 ```yaml
-Type: Hashtable
+Type: System.Collections.Hashtable
 Parameter Sets: (All)
 Aliases:
 
@@ -82,7 +82,7 @@ Accept wildcard characters: False
 Specify the name of the managed application type
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -97,7 +97,7 @@ Accept wildcard characters: False
 Specify the managed application type version
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -112,7 +112,7 @@ Accept wildcard characters: False
 Run cmdlet in the background and return a Job to track progress.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -127,7 +127,7 @@ Accept wildcard characters: False
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -142,7 +142,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -157,7 +157,7 @@ Accept wildcard characters: False
 Continue without prompts
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -172,7 +172,7 @@ Accept wildcard characters: False
 Specify the name of the managed application
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases: ApplicationName
 
@@ -187,7 +187,7 @@ Accept wildcard characters: False
 Specify the url of the application package sfpkg file
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: CreateAppTypeVersion
 Aliases:
 
@@ -202,7 +202,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -217,7 +217,7 @@ Accept wildcard characters: False
 Specify the tags as key/value pairs.
 
 ```yaml
-Type: Hashtable
+Type: System.Collections.Hashtable
 Parameter Sets: (All)
 Aliases:
 
@@ -232,7 +232,7 @@ Accept wildcard characters: False
 Prompts you for confirmation before running the cmdlet.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: cf
 
@@ -248,7 +248,7 @@ Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: wi
 
@@ -270,7 +270,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplication
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplication
 
 ## NOTES
 
diff --git a/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterApplicationType.md b/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterApplicationType.md
index 30b5b7741b3e..53d2b680b93a 100644
--- a/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterApplicationType.md
+++ b/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterApplicationType.md
@@ -33,14 +33,13 @@ PS C:\> $appType = New-AzServiceFabricManagedClusterApplicationType -ResourceGro
 
 This example will create a new managed application type "testAppType" under the resource group and cluster specified.
 
-
 ## PARAMETERS
 
 ### -ClusterName
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -55,7 +54,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -70,7 +69,7 @@ Accept wildcard characters: False
 Specify the name of the application type
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases: ApplicationTypeName
 
@@ -85,7 +84,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -100,7 +99,7 @@ Accept wildcard characters: False
 Specify the tags as key/value pairs.
 
 ```yaml
-Type: Hashtable
+Type: System.Collections.Hashtable
 Parameter Sets: (All)
 Aliases:
 
@@ -115,7 +114,7 @@ Accept wildcard characters: False
 Prompts you for confirmation before running the cmdlet.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: cf
 
@@ -131,7 +130,7 @@ Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: wi
 
@@ -153,7 +152,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplicationType
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplicationType
 
 ## NOTES
 
diff --git a/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterApplicationTypeVersion.md b/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterApplicationTypeVersion.md
index f3bbe4002e6e..f57a10992dfb 100644
--- a/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterApplicationTypeVersion.md
+++ b/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterApplicationTypeVersion.md
@@ -35,14 +35,13 @@ PS C:\> New-AzServiceFabricManagedClusterApplicationTypeVersion -ResourceGroupNa
 
 This example will create an managed application type version "v1" under type "testAppType". The version in the application manifest contained in the package should have the same version as the one specified in -Version.
 
-
 ## PARAMETERS
 
 ### -AsJob
 Run cmdlet in the background and return a Job to track progress.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -57,7 +56,7 @@ Accept wildcard characters: False
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -72,7 +71,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -87,7 +86,7 @@ Accept wildcard characters: False
 Continue without prompts
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -102,7 +101,7 @@ Accept wildcard characters: False
 Specify the name of the managed application type
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases: ApplicationTypeName
 
@@ -117,7 +116,7 @@ Accept wildcard characters: False
 Specify the url of the application package sfpkg file
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -132,7 +131,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -147,7 +146,7 @@ Accept wildcard characters: False
 Specify the tags as key/value pairs.
 
 ```yaml
-Type: Hashtable
+Type: System.Collections.Hashtable
 Parameter Sets: (All)
 Aliases:
 
@@ -162,7 +161,7 @@ Accept wildcard characters: False
 Specify the managed application type version
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases: ApplicationTypeVersion
 
@@ -177,7 +176,7 @@ Accept wildcard characters: False
 Prompts you for confirmation before running the cmdlet.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: cf
 
@@ -193,7 +192,7 @@ Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: wi
 
@@ -215,7 +214,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplicationTypeVersion
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplicationTypeVersion
 
 ## NOTES
 
diff --git a/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterService.md b/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterService.md
index c7b93f820a8f..77cad74579bc 100644
--- a/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterService.md
+++ b/src/ServiceFabric/ServiceFabric/help/New-AzServiceFabricManagedClusterService.md
@@ -102,7 +102,7 @@ PS C:\> $clusterName = "testCluster"
 PS C:\> $appName = "testApp"
 PS C:\> $serviceName = "testService1"
 PS C:\> $serviceTypeName = "testStateless"
-PS C:\> $statelessServiceMetric = New-Object -TypeName "Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSServiceMetric" -ArgumentList @("metric1", "Low", 4)
+PS C:\> $statelessServiceMetric = New-Object -TypeName "Microsoft.Azure.Commands.ServiceFabric.Models.PSServiceMetric" -ArgumentList @("metric1", "Low", 4)
 PS C:\> New-AzServiceFabricManagedClusterService -ResourceGroupName $resourceGroupName -ClusterName $clusterName -ApplicationName $appName -Name $serviceName -Type $serviceTypeName -Stateless -InstanceCount -1 -PartitionSchemaSingleton -Metric @($statelessServiceMetric) -Verbose
 ```
 
@@ -118,7 +118,7 @@ PS C:\> $serviceTypeName = "testStatefulType"
 PS C:\> $partitionCount = 5
 PS C:\> $partitionLowKey = 0
 PS C:\> $partitionHighKey = 25
-PS C:\> $statefulServiceMetric = New-Object -TypeName "Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSServiceMetric" -ArgumentList @("metric2", "Medium", 4, 2)
+PS C:\> $statefulServiceMetric = New-Object -TypeName "Microsoft.Azure.Commands.ServiceFabric.Models.PSServiceMetric" -ArgumentList @("metric2", "Medium", 4, 2)
 PS C:\> New-AzServiceFabricManagedClusterService -ResourceGroupName $resourceGroupName -ClusterName $clusterName -ApplicationName $appName -Name $serviceName -Type $serviceTypeName -Stateful -TargetReplicaSetSize 5 -MinReplicaSetSize 3 -Metric @($statefulServiceMetric) -PartitionSchemeUniformInt64 -PartitionCount $partitionCount -LowKey $partitionLowKey -HighKey $partitionHighKey -Verbose
 ```
 
@@ -133,20 +133,19 @@ PS C:\> $serviceName = "testService3"
 PS C:\> $serviceName2 = "testService2"
 PS C:\> $serviceTypeName = "testStateless"
 PS C:\> $statefulService = Get-AzServiceFabricManagedClusterService -ResourceGroupName $resourceGroupName -ClusterName $clusterName -ApplicationName $appName -Name $serviceName2
-PS C:\> $statefulServiceCorrelation = New-Object -TypeName "Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSServiceCorrelation" -ArgumentList @("AlignedAffinity, $statefulService.Id)
+PS C:\> $statefulServiceCorrelation = New-Object -TypeName "Microsoft.Azure.Commands.ServiceFabric.Models.PSServiceCorrelation" -ArgumentList @("AlignedAffinity, $statefulService.Id)
 PS C:\> New-AzServiceFabricManagedClusterService -ResourceGroupName $resourceGroupName -ClusterName $clusterName -ApplicationName $appName -Name $serviceName -Type $serviceTypeName -Stateless -InstanceCount 3 -PartitionSchemaSingleton -Correlation @($statefulServiceCorrelation) -Verbose
 ```
 
 This example will create a new stateless managed service "testService3".
 
-
 ## PARAMETERS
 
 ### -ApplicationName
 Specify the name of the managed application.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -161,7 +160,7 @@ Accept wildcard characters: False
 Run cmdlet in the background and return a Job to track progress.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -176,7 +175,7 @@ Accept wildcard characters: False
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -191,7 +190,7 @@ Accept wildcard characters: False
 Specify the placement constraints of the managed service, as a string.
 
 ```yaml
-Type: PSServiceCorrelation[]
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSServiceCorrelation[]
 Parameter Sets: (All)
 Aliases:
 
@@ -207,7 +206,7 @@ Specify the default cost for a move.
 Higher costs make it less likely that the Cluster Resource Manager will move the replica when trying to balance the cluster
 
 ```yaml
-Type: MoveCostEnum
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.MoveCostEnum
 Parameter Sets: (All)
 Aliases:
 Accepted values: Zero, Low, Medium, High
@@ -223,7 +222,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -238,7 +237,7 @@ Accept wildcard characters: False
 Specify the drop source replica on move property for the managed service
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: Stateful-Singleton, Stateful-UniformInt64Range, Stateful-Named
 Aliases:
 
@@ -253,7 +252,7 @@ Accept wildcard characters: False
 Continue without prompts
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -268,7 +267,7 @@ Accept wildcard characters: False
 Specify the target replica set size for the managed service
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: Stateful-Singleton, Stateful-UniformInt64Range, Stateful-Named
 Aliases:
 
@@ -283,7 +282,7 @@ Accept wildcard characters: False
 Specify the upper bound of the partition key range.
 
 ```yaml
-Type: Int64
+Type: System.Int64
 Parameter Sets: Stateless-UniformInt64Range, Stateful-UniformInt64Range
 Aliases:
 
@@ -299,7 +298,7 @@ Specify the instance close delay duration for the managed service.
 Duration represented in ISO 8601 format 'hh:mm:ss'
 
 ```yaml
-Type: TimeSpan
+Type: System.TimeSpan
 Parameter Sets: Stateless-Singleton, Stateless-UniformInt64Range, Stateless-Named
 Aliases:
 
@@ -314,7 +313,7 @@ Accept wildcard characters: False
 Specify the instance count for the managed service
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: Stateless-Singleton, Stateless-UniformInt64Range, Stateless-Named
 Aliases:
 
@@ -329,7 +328,7 @@ Accept wildcard characters: False
 Specify the lower bound of the partition key range.
 
 ```yaml
-Type: Int64
+Type: System.Int64
 Parameter Sets: Stateless-UniformInt64Range, Stateful-UniformInt64Range
 Aliases:
 
@@ -344,7 +343,7 @@ Accept wildcard characters: False
 Specify the placement constraints of the managed service, as a string.
 
 ```yaml
-Type: PSServiceMetric[]
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSServiceMetric[]
 Parameter Sets: (All)
 Aliases:
 
@@ -359,7 +358,7 @@ Accept wildcard characters: False
 Specify the minimum instance count for the managed service
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: Stateless-Singleton, Stateless-UniformInt64Range, Stateless-Named
 Aliases:
 
@@ -374,7 +373,7 @@ Accept wildcard characters: False
 Specify the minimum instance percentage for the managed service
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: Stateless-Singleton, Stateless-UniformInt64Range, Stateless-Named
 Aliases:
 
@@ -389,7 +388,7 @@ Accept wildcard characters: False
 Specify the min replica set size for the managed service
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: Stateful-Singleton, Stateful-UniformInt64Range, Stateful-Named
 Aliases:
 
@@ -404,7 +403,7 @@ Accept wildcard characters: False
 Specify the name of the managed service.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases: ServiceName
 
@@ -419,7 +418,7 @@ Accept wildcard characters: False
 Specify the number of partitions.
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: Stateless-UniformInt64Range, Stateful-UniformInt64Range
 Aliases:
 
@@ -436,7 +435,7 @@ Services using this model usually have data that can be bucketed, within a bound
 Some common examples of data fields used as named partition keys would be regions, postal codes, customer groups, or other business boundaries.
 
 ```yaml
-Type: String[]
+Type: System.String[]
 Parameter Sets: Stateless-Named, Stateful-Named
 Aliases:
 
@@ -453,7 +452,7 @@ Services using this model usually have data that can be bucketed, within a bound
 Some common examples of data fields used as named partition keys would be regions, postal codes, customer groups, or other business boundaries.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: Stateless-Named, Stateful-Named
 Aliases:
 
@@ -469,7 +468,7 @@ Indicates that the service uses the singleton partition scheme.
 Singleton partitions are typically used when the service does not require any additional routing.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: Stateless-Singleton, Stateful-Singleton
 Aliases:
 
@@ -485,7 +484,7 @@ Indicates that the service uses the UniformInt64 partition scheme.
 This means that each partition owns a range of int64 keys.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: Stateless-UniformInt64Range, Stateful-UniformInt64Range
 Aliases:
 
@@ -500,7 +499,7 @@ Accept wildcard characters: False
 Specify the placement constraints of the managed service, as a string.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -516,7 +515,7 @@ Specify the quorum loss wait duration for the managed service.
 Duration represented in ISO 8601 format 'hh:mm:ss'
 
 ```yaml
-Type: TimeSpan
+Type: System.TimeSpan
 Parameter Sets: Stateful-Singleton, Stateful-UniformInt64Range, Stateful-Named
 Aliases:
 
@@ -532,7 +531,7 @@ Specify the replica restart wait duration for the managed service.
 Duration represented in ISO 8601 format 'hh:mm:ss'
 
 ```yaml
-Type: TimeSpan
+Type: System.TimeSpan
 Parameter Sets: Stateful-Singleton, Stateful-UniformInt64Range, Stateful-Named
 Aliases:
 
@@ -547,7 +546,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -562,7 +561,7 @@ Accept wildcard characters: False
 Specify the placement constraints of the managed service, as a string.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -578,7 +577,7 @@ Specify the default cost for a move.
 Higher costs make it less likely that the Cluster Resource Manager will move the replica when trying to balance the cluster
 
 ```yaml
-Type: ServicePackageActivationModeEnum
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.ServicePackageActivationModeEnum
 Parameter Sets: (All)
 Aliases:
 Accepted values: SharedProcess, ExclusiveProcess
@@ -595,7 +594,7 @@ Specify the service placement time limit for the managed service.
 Duration represented in ISO 8601 format 'hh:mm:ss'
 
 ```yaml
-Type: TimeSpan
+Type: System.TimeSpan
 Parameter Sets: Stateful-Singleton, Stateful-UniformInt64Range, Stateful-Named
 Aliases:
 
@@ -611,7 +610,7 @@ Specify the stand by replica duration for the managed service.
 Duration represented in ISO 8601 format 'hh:mm:ss'
 
 ```yaml
-Type: TimeSpan
+Type: System.TimeSpan
 Parameter Sets: Stateful-Singleton, Stateful-UniformInt64Range, Stateful-Named
 Aliases:
 
@@ -626,7 +625,7 @@ Accept wildcard characters: False
 Use for stateful service
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: Stateful-Singleton, Stateful-UniformInt64Range, Stateful-Named
 Aliases:
 
@@ -641,7 +640,7 @@ Accept wildcard characters: False
 Use for stateless service
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: Stateless-Singleton, Stateless-UniformInt64Range, Stateless-Named
 Aliases:
 
@@ -656,7 +655,7 @@ Accept wildcard characters: False
 Specify the tags as key/value pairs.
 
 ```yaml
-Type: Hashtable
+Type: System.Collections.Hashtable
 Parameter Sets: (All)
 Aliases:
 
@@ -671,7 +670,7 @@ Accept wildcard characters: False
 Specify the target replica set size for the managed service
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: Stateful-Singleton, Stateful-UniformInt64Range, Stateful-Named
 Aliases:
 
@@ -686,7 +685,7 @@ Accept wildcard characters: False
 Specify the service type name of the managed application, should exist in the application manifest.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases: ServiceType
 
@@ -701,7 +700,7 @@ Accept wildcard characters: False
 Prompts you for confirmation before running the cmdlet.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: cf
 
@@ -717,7 +716,7 @@ Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: wi
 
@@ -739,7 +738,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedService
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedService
 
 ## NOTES
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedCluster.md b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedCluster.md
index 3f1be9436d56..d33a53e4aa5e 100644
--- a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedCluster.md
+++ b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedCluster.md
@@ -91,7 +91,7 @@ Accept wildcard characters: False
 Managed Cluster resource
 
 ```yaml
-Type: Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedCluster
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedCluster
 Parameter Sets: ByObj
 Aliases:
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterApplication.md b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterApplication.md
index 7035faadceae..2056321ac7eb 100644
--- a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterApplication.md
+++ b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterApplication.md
@@ -71,7 +71,7 @@ This example removes the managed application "testApp" with the ARM Resource ID
 Run cmdlet in the background and return a Job to track progress.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -86,7 +86,7 @@ Accept wildcard characters: False
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -101,7 +101,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -116,7 +116,7 @@ Accept wildcard characters: False
 Remove without prompt.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -131,7 +131,7 @@ Accept wildcard characters: False
 The managed application resource.
 
 ```yaml
-Type: PSManagedApplication
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplication
 Parameter Sets: ByInputObject
 Aliases:
 
@@ -146,7 +146,7 @@ Accept wildcard characters: False
 Specify the name of the managed application.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases: ApplicationName
 
@@ -161,7 +161,7 @@ Accept wildcard characters: False
 {{ Fill PassThru Description }}
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -176,7 +176,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -191,7 +191,7 @@ Accept wildcard characters: False
 Arm ResourceId of the managed application.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceId
 Aliases:
 
@@ -206,7 +206,7 @@ Accept wildcard characters: False
 Prompts you for confirmation before running the cmdlet.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: cf
 
@@ -222,7 +222,7 @@ Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: wi
 
@@ -240,7 +240,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ### System.String
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplication
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplication
 
 ## OUTPUTS
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterApplicationType.md b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterApplicationType.md
index 470fa05482fd..5ae54059d8a2 100644
--- a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterApplicationType.md
+++ b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterApplicationType.md
@@ -65,14 +65,13 @@ PS C:\> Remove-AzServiceFabricManagedClusterApplicationType -ResourceId $resourc
 
 This example will remove the managed application type details with the ARM Resource ID specified.
 
-
 ## PARAMETERS
 
 ### -ClusterName
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -87,7 +86,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -102,7 +101,7 @@ Accept wildcard characters: False
 Remove without prompt.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -117,7 +116,7 @@ Accept wildcard characters: False
 The managed application type resource.
 
 ```yaml
-Type: PSManagedApplicationType
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplicationType
 Parameter Sets: ByInputObject
 Aliases:
 
@@ -132,7 +131,7 @@ Accept wildcard characters: False
 Specify the name of the managed application type.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases: ApplicationTypeName
 
@@ -147,7 +146,7 @@ Accept wildcard characters: False
 {{ Fill PassThru Description }}
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -162,7 +161,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -177,7 +176,7 @@ Accept wildcard characters: False
 Arm ResourceId of the managed application type.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceId
 Aliases:
 
@@ -192,7 +191,7 @@ Accept wildcard characters: False
 Prompts you for confirmation before running the cmdlet.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: cf
 
@@ -208,7 +207,7 @@ Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: wi
 
@@ -226,7 +225,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ### System.String
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplicationType
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplicationType
 
 ## OUTPUTS
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterApplicationTypeVersion.md b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterApplicationTypeVersion.md
index 7818701b9cc8..476a6a77dfa0 100644
--- a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterApplicationTypeVersion.md
+++ b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterApplicationTypeVersion.md
@@ -74,7 +74,7 @@ This example will remove the managed application type version details with the A
 Run cmdlet in the background and return a Job to track progress.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -89,7 +89,7 @@ Accept wildcard characters: False
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -104,7 +104,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -119,7 +119,7 @@ Accept wildcard characters: False
 Remove without prompt.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -134,7 +134,7 @@ Accept wildcard characters: False
 The managed application type version resource.
 
 ```yaml
-Type: PSManagedApplicationTypeVersion
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplicationTypeVersion
 Parameter Sets: ByInputObject
 Aliases:
 
@@ -149,7 +149,7 @@ Accept wildcard characters: False
 Specify the name of the managed application type.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases: ApplicationTypeName
 
@@ -164,7 +164,7 @@ Accept wildcard characters: False
 {{ Fill PassThru Description }}
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -179,7 +179,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -194,7 +194,7 @@ Accept wildcard characters: False
 Arm ResourceId of the managed application type version.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceId
 Aliases:
 
@@ -209,7 +209,7 @@ Accept wildcard characters: False
 Specify the managed application type version.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases: ApplicationTypeVersion
 
@@ -224,7 +224,7 @@ Accept wildcard characters: False
 Prompts you for confirmation before running the cmdlet.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: cf
 
@@ -240,7 +240,7 @@ Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: wi
 
@@ -258,7 +258,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ### System.String
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplicationTypeVersion
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplicationTypeVersion
 
 ## OUTPUTS
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterClientCertificate.md b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterClientCertificate.md
index a55f7b01fb8b..2e7f344cbd57 100644
--- a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterClientCertificate.md
+++ b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterClientCertificate.md
@@ -123,7 +123,7 @@ Accept wildcard characters: False
 Managed cluster resource
 
 ```yaml
-Type: Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedCluster
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedCluster
 Parameter Sets: ClientCertByTpByObj, ClientCertByCnByObj
 Aliases:
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterService.md b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterService.md
index d720148802a3..bc067e791aed 100644
--- a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterService.md
+++ b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedClusterService.md
@@ -54,7 +54,7 @@ PS C:\> $clusterName = "testCluster"
 PS C:\> $appName = "testApp"
 PS C:\> $serviceName = "testService1"
 PS C:\> $service = Get-AzServiceFabricManagedClusterService -ResourceGroupName $resourceGroupName -ClusterName $clusterName -ApplicationName $appName
-PS C:\> $service | Remove-AzServiceFabricManagedClusterService 
+PS C:\> $service | Remove-AzServiceFabricManagedClusterService
 ```
 
 This example will remove the managed service testService1".
@@ -73,7 +73,7 @@ This example will remove the managed service details with the ARM Resource ID sp
 Specify the name of the application.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -88,7 +88,7 @@ Accept wildcard characters: False
 Run cmdlet in the background and return a Job to track progress.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -103,7 +103,7 @@ Accept wildcard characters: False
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -118,7 +118,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -133,7 +133,7 @@ Accept wildcard characters: False
 Remove without prompt.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -148,7 +148,7 @@ Accept wildcard characters: False
 The managed service resource.
 
 ```yaml
-Type: PSManagedService
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedService
 Parameter Sets: ByInputObject
 Aliases:
 
@@ -163,7 +163,7 @@ Accept wildcard characters: False
 Specify the name of the service.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases: ServiceName
 
@@ -178,7 +178,7 @@ Accept wildcard characters: False
 {{ Fill PassThru Description }}
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -193,7 +193,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -208,7 +208,7 @@ Accept wildcard characters: False
 Arm ResourceId of the service.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceId
 Aliases:
 
@@ -223,7 +223,7 @@ Accept wildcard characters: False
 Prompts you for confirmation before running the cmdlet.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: cf
 
@@ -239,7 +239,7 @@ Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: wi
 
@@ -257,7 +257,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ### System.String
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedService
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedService
 
 ## OUTPUTS
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedNodeType.md b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedNodeType.md
index 6dc504577929..f2f506b9b78a 100644
--- a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedNodeType.md
+++ b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedNodeType.md
@@ -166,7 +166,7 @@ Accept wildcard characters: False
 Node type resource
 
 ```yaml
-Type: Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedNodeType
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedNodeType
 Parameter Sets: DeleteNodeTypeByObj, DeleteNodeByObj
 Aliases:
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedNodeTypeVMExtension.md b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedNodeTypeVMExtension.md
index 480c075d40ca..92d8a1dbabd4 100644
--- a/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedNodeTypeVMExtension.md
+++ b/src/ServiceFabric/ServiceFabric/help/Remove-AzServiceFabricManagedNodeTypeVMExtension.md
@@ -103,7 +103,7 @@ Accept wildcard characters: False
 Node type resource
 
 ```yaml
-Type: Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedNodeType
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedNodeType
 Parameter Sets: ByObj
 Aliases:
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedCluster.md b/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedCluster.md
index 8fff3a7437a8..5fe4708b5bf2 100644
--- a/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedCluster.md
+++ b/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedCluster.md
@@ -157,7 +157,7 @@ Accept wildcard characters: False
 Managed Cluster resource
 
 ```yaml
-Type: Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedCluster
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedCluster
 Parameter Sets: ByObj
 Aliases:
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterApplication.md b/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterApplication.md
index a8fcbda002b3..ea5426ff95b5 100644
--- a/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterApplication.md
+++ b/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterApplication.md
@@ -17,7 +17,7 @@ Update a service fabric managed application. This allows to update the applicati
 Set-AzServiceFabricManagedClusterApplication [-ResourceGroupName] <String> [-ClusterName] <String>
  [-Name] <String> [[-ApplicationTypeVersion] <String>] [-ApplicationParameter <Hashtable>] [-ForceRestart]
  [-RecreateApplication] [-UpgradeReplicaSetCheckTimeoutSec <Int32>] [-InstanceCloseDelayDurationSec <Int32>]
- [-UpgradeMode <UpgradeMode>] [-FailureAction <FailureAction>] [-HealthCheckRetryTimeoutSec <Int32>]
+ [-UpgradeMode <ApplicationUpgradeMode>] [-FailureAction <FailureAction>] [-HealthCheckRetryTimeoutSec <Int32>]
  [-HealthCheckWaitDurationSec <Int32>] [-HealthCheckStableDurationSec <Int32>]
  [-UpgradeDomainTimeoutSec <Int32>] [-UpgradeTimeoutSec <Int32>] [-ConsiderWarningAsError]
  [-DefaultServiceTypeMaxPercentUnhealthyPartitionsPerService <Int32>]
@@ -32,7 +32,7 @@ Set-AzServiceFabricManagedClusterApplication [-ResourceGroupName] <String> [-Clu
 Set-AzServiceFabricManagedClusterApplication [[-ApplicationTypeVersion] <String>]
  [-ApplicationParameter <Hashtable>] [-ForceRestart] [-RecreateApplication]
  [-UpgradeReplicaSetCheckTimeoutSec <Int32>] [-InstanceCloseDelayDurationSec <Int32>]
- [-UpgradeMode <UpgradeMode>] [-FailureAction <FailureAction>] [-HealthCheckRetryTimeoutSec <Int32>]
+ [-UpgradeMode <ApplicationUpgradeMode>] [-FailureAction <FailureAction>] [-HealthCheckRetryTimeoutSec <Int32>]
  [-HealthCheckWaitDurationSec <Int32>] [-HealthCheckStableDurationSec <Int32>]
  [-UpgradeDomainTimeoutSec <Int32>] [-UpgradeTimeoutSec <Int32>] [-ConsiderWarningAsError]
  [-DefaultServiceTypeMaxPercentUnhealthyPartitionsPerService <Int32>]
@@ -47,7 +47,7 @@ Set-AzServiceFabricManagedClusterApplication [[-ApplicationTypeVersion] <String>
 Set-AzServiceFabricManagedClusterApplication [[-ApplicationTypeVersion] <String>]
  [-ApplicationParameter <Hashtable>] [-ForceRestart] [-RecreateApplication]
  [-UpgradeReplicaSetCheckTimeoutSec <Int32>] [-InstanceCloseDelayDurationSec <Int32>]
- [-UpgradeMode <UpgradeMode>] [-FailureAction <FailureAction>] [-HealthCheckRetryTimeoutSec <Int32>]
+ [-UpgradeMode <ApplicationUpgradeMode>] [-FailureAction <FailureAction>] [-HealthCheckRetryTimeoutSec <Int32>]
  [-HealthCheckWaitDurationSec <Int32>] [-HealthCheckStableDurationSec <Int32>]
  [-UpgradeDomainTimeoutSec <Int32>] [-UpgradeTimeoutSec <Int32>] [-ConsiderWarningAsError]
  [-DefaultServiceTypeMaxPercentUnhealthyPartitionsPerService <Int32>]
@@ -105,7 +105,6 @@ PS C:\> Set-AzServiceFabricManagedClusterApplication -ResourceGroupName $resourc
 
 This example updates the application parameters but these changes will only take effect until the next version upgrade to the application.
 
-
 ## PARAMETERS
 
 ### -ApplicationParameter
@@ -113,7 +112,7 @@ Specify the application parameters as key/value pairs.
 These parameters must exist in the application manifest.
 
 ```yaml
-Type: Hashtable
+Type: System.Collections.Hashtable
 Parameter Sets: (All)
 Aliases:
 
@@ -128,7 +127,7 @@ Accept wildcard characters: False
 Specify the application type version
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -143,7 +142,7 @@ Accept wildcard characters: False
 Run cmdlet in the background and return a Job to track progress.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -158,7 +157,7 @@ Accept wildcard characters: False
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -173,7 +172,7 @@ Accept wildcard characters: False
 Indicates whether to treat a warning health event as an error event during health evaluation.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -188,7 +187,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -203,7 +202,7 @@ Accept wildcard characters: False
 Specifies the maximum percent of unhelthy partitions per service allowed by the health policy for the default service type to use for the monitored upgrade.
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: (All)
 Aliases:
 
@@ -218,7 +217,7 @@ Accept wildcard characters: False
 Specifies the maximum percent of unhelthy replicas per service allowed by the health policy for the default service type to use for the monitored upgrade.
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: (All)
 Aliases:
 
@@ -233,7 +232,7 @@ Accept wildcard characters: False
 Specifies the maximum percent of unhelthy services allowed by the health policy for the default service type to use for the monitored upgrade.
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: (All)
 Aliases:
 
@@ -249,7 +248,7 @@ Specifies the action to take if the monitored upgrade fails.
 The acceptable values for this parameter are Rollback or Manual.
 
 ```yaml
-Type: FailureAction
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.FailureAction
 Parameter Sets: (All)
 Aliases:
 Accepted values: Rollback, Manual
@@ -265,7 +264,7 @@ Accept wildcard characters: False
 Continue without prompts
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -280,7 +279,7 @@ Accept wildcard characters: False
 Indicates that the service host restarts even if the upgrade is a configuration-only change.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -295,7 +294,7 @@ Accept wildcard characters: False
 Specifies the duration, in seconds, after which Service Fabric retries the health check if the previous health check fails.
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: (All)
 Aliases:
 
@@ -311,7 +310,7 @@ Specifies the duration, in seconds, that Service Fabric waits in order to verify
 This wait duration prevents undetected changes of health right after the health check is performed.
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: (All)
 Aliases:
 
@@ -326,7 +325,7 @@ Accept wildcard characters: False
 Specifies the duration, in seconds, that Service Fabric waits before it performs the initial health check after it finishes the upgrade on the upgrade domain.
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: (All)
 Aliases:
 
@@ -341,7 +340,7 @@ Accept wildcard characters: False
 The managed application resource.
 
 ```yaml
-Type: PSManagedApplication
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplication
 Parameter Sets: ByInputObject
 Aliases:
 
@@ -356,7 +355,7 @@ Accept wildcard characters: False
 Specifies the duration in seconds, to wait before a stateless instance is closed, to allow the active requests to drain gracefully.
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: (All)
 Aliases:
 
@@ -371,7 +370,7 @@ Accept wildcard characters: False
 Specify the name of the application
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases: ApplicationName
 
@@ -387,7 +386,7 @@ Determines whether the application should be recreated on update.
 If value=true, the rest of the upgrade policy parameters are not allowed.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -402,7 +401,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -417,7 +416,7 @@ Accept wildcard characters: False
 Arm ResourceId of the managed application.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceId
 Aliases:
 
@@ -433,7 +432,7 @@ Specifies the map of the health policy to use for different service types as a h
 For example: @{ "ServiceTypeName01" = "5,10,5"; "ServiceTypeName02" = "5,5,5" }
 
 ```yaml
-Type: Hashtable
+Type: System.Collections.Hashtable
 Parameter Sets: (All)
 Aliases:
 
@@ -448,7 +447,7 @@ Accept wildcard characters: False
 Specify the tags as key/value pairs.
 
 ```yaml
-Type: Hashtable
+Type: System.Collections.Hashtable
 Parameter Sets: (All)
 Aliases:
 
@@ -463,7 +462,7 @@ Accept wildcard characters: False
 Specifies the maximum percentage of the application instances deployed on the nodes in the cluster that have a health state of error before the application health state for the cluster is error.
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: (All)
 Aliases:
 
@@ -479,7 +478,7 @@ Specifies the maximum time, in seconds, that Service Fabric takes to upgrade a s
 After this period, the upgrade fails.
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: (All)
 Aliases:
 
@@ -495,7 +494,7 @@ The mode used to monitor health during a rolling upgrade.
 The values are Monitored, and UnmonitoredAuto.
 
 ```yaml
-Type: UpgradeMode
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.ApplicationUpgradeMode
 Parameter Sets: (All)
 Aliases:
 Accepted values: Monitored, UnmonitoredAuto
@@ -511,7 +510,7 @@ Accept wildcard characters: False
 Specifies the maximum time that Service Fabric waits for a service to reconfigure into a safe state, if not already in a safe state, before Service Fabric proceeds with the upgrade.
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: (All)
 Aliases:
 
@@ -527,7 +526,7 @@ Specifies the maximum time, in seconds, that Service Fabric takes for the entire
 After this period, the upgrade fails.
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: (All)
 Aliases:
 
@@ -542,7 +541,7 @@ Accept wildcard characters: False
 Prompts you for confirmation before running the cmdlet.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: cf
 
@@ -558,7 +557,7 @@ Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: wi
 
@@ -578,11 +577,11 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ### System.Collections.Hashtable
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplication
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplication
 
 ## OUTPUTS
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplication
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplication
 
 ## NOTES
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterApplicationType.md b/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterApplicationType.md
index 21a5ad42586d..3000706be2c0 100644
--- a/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterApplicationType.md
+++ b/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterApplicationType.md
@@ -74,7 +74,7 @@ This example will update the managed application type details with the ARM Resou
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -89,7 +89,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -104,7 +104,7 @@ Accept wildcard characters: False
 Remove without prompt.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -119,7 +119,7 @@ Accept wildcard characters: False
 The managed application type resource.
 
 ```yaml
-Type: PSManagedApplicationType
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplicationType
 Parameter Sets: ByInputObject
 Aliases:
 
@@ -134,7 +134,7 @@ Accept wildcard characters: False
 Specify the name of the managed application type.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases: ApplicationTypeName
 
@@ -149,7 +149,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -164,7 +164,7 @@ Accept wildcard characters: False
 Arm ResourceId of the managed application type.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceId
 Aliases:
 
@@ -179,7 +179,7 @@ Accept wildcard characters: False
 Specify the tags as key/value pairs.
 
 ```yaml
-Type: Hashtable
+Type: System.Collections.Hashtable
 Parameter Sets: (All)
 Aliases:
 
@@ -194,7 +194,7 @@ Accept wildcard characters: False
 Prompts you for confirmation before running the cmdlet.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: cf
 
@@ -210,7 +210,7 @@ Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: wi
 
@@ -230,13 +230,13 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ### System.Collections.Hashtable
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplicationType
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplicationType
 
 ## OUTPUTS
 
 ### System.Boolean
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplicationType
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplicationType
 
 ## NOTES
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterApplicationTypeVersion.md b/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterApplicationTypeVersion.md
index e6813a4a24fb..fa85aba3e2c9 100644
--- a/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterApplicationTypeVersion.md
+++ b/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterApplicationTypeVersion.md
@@ -80,7 +80,7 @@ This example will update the managed application type details with the ARM Resou
 Run cmdlet in the background and return a Job to track progress.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -95,7 +95,7 @@ Accept wildcard characters: False
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -110,7 +110,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -125,7 +125,7 @@ Accept wildcard characters: False
 Continue without prompts
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -140,7 +140,7 @@ Accept wildcard characters: False
 The managed application type version resource.
 
 ```yaml
-Type: PSManagedApplicationTypeVersion
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplicationTypeVersion
 Parameter Sets: ByInputObject
 Aliases:
 
@@ -155,7 +155,7 @@ Accept wildcard characters: False
 Specify the name of the managed application type
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases: ApplicationTypeName
 
@@ -170,7 +170,7 @@ Accept wildcard characters: False
 Specify the url of the application package sfpkg file
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -185,7 +185,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases:
 
@@ -200,7 +200,7 @@ Accept wildcard characters: False
 Arm ResourceId of the managed application type version.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceId
 Aliases:
 
@@ -215,7 +215,7 @@ Accept wildcard characters: False
 Specify the tags as key/value pairs.
 
 ```yaml
-Type: Hashtable
+Type: System.Collections.Hashtable
 Parameter Sets: (All)
 Aliases:
 
@@ -230,7 +230,7 @@ Accept wildcard characters: False
 Specify the managed application type version
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: ByResourceGroup
 Aliases: ApplicationTypeVersion
 
@@ -245,7 +245,7 @@ Accept wildcard characters: False
 Prompts you for confirmation before running the cmdlet.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: cf
 
@@ -261,7 +261,7 @@ Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: wi
 
@@ -281,11 +281,11 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ### System.Collections.Hashtable
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplicationTypeVersion
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplicationTypeVersion
 
 ## OUTPUTS
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedApplicationTypeVersion
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedApplicationTypeVersion
 
 ## NOTES
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterService.md b/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterService.md
index 7e67fbfd0e84..70d593ca8a44 100644
--- a/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterService.md
+++ b/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedClusterService.md
@@ -105,7 +105,7 @@ PS C:\> $serviceName = "testService1"
 PS C:\> $instanceCloseDelayDuration = "00:11:00"
 PS C:\> $minInstancePercentage = 20
 PS C:\> $minInstanceCount = 2
-PS C:\> $statelessServiceMetric = New-Object -TypeName "Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSServiceMetric" -ArgumentList @("metric1", "Low", 4)
+PS C:\> $statelessServiceMetric = New-Object -TypeName "Microsoft.Azure.Commands.ServiceFabric.Models.PSServiceMetric" -ArgumentList @("metric1", "Low", 4)
 PS C:\> $service = Get-AzServiceFabricManagedClusterService -ResourceGroupName $resourceGroupName -ClusterName $clusterName -ApplicationName $appName
 PS C:\> $service | Set-AzServiceFabricManagedClusterService -Stateless -Metric @($statelessServiceMetric) -MinInstanceCount $minInstanceCount -InstanceCloseDelayDuration $instanceCloseDelayDuration -MinInstancePercentage $minInstancePercentage -Verbose
 ```
@@ -128,7 +128,7 @@ This example will remove the managed service details with the ARM Resource ID sp
 Specify the name of the managed application.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: Stateless-ByResourceGroup, Stateful-ByResourceGroup
 Aliases:
 
@@ -143,7 +143,7 @@ Accept wildcard characters: False
 Run cmdlet in the background and return a Job to track progress.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -158,7 +158,7 @@ Accept wildcard characters: False
 Specify the name of the cluster.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: Stateless-ByResourceGroup, Stateful-ByResourceGroup
 Aliases:
 
@@ -173,7 +173,7 @@ Accept wildcard characters: False
 Specify the placement constraints of the managed service, as a string.
 
 ```yaml
-Type: PSServiceCorrelation[]
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSServiceCorrelation[]
 Parameter Sets: (All)
 Aliases:
 
@@ -189,7 +189,7 @@ Specify the default cost for a move.
 Higher costs make it less likely that the Cluster Resource Manager will move the replica when trying to balance the cluster
 
 ```yaml
-Type: MoveCostEnum
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.MoveCostEnum
 Parameter Sets: (All)
 Aliases:
 Accepted values: Zero, Low, Medium, High
@@ -205,7 +205,7 @@ Accept wildcard characters: False
 The credentials, account, tenant, and subscription used for communication with Azure.
 
 ```yaml
-Type: IAzureContextContainer
+Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzContext, AzureRmContext, AzureCredential
 
@@ -220,7 +220,7 @@ Accept wildcard characters: False
 Specify the drop source replica on move property for the managed service
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: Stateful-ByResourceGroup, Stateful-ByResourceId, Stateful-ByInputObject
 Aliases:
 
@@ -235,7 +235,7 @@ Accept wildcard characters: False
 Continue without prompts
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
@@ -250,7 +250,7 @@ Accept wildcard characters: False
 Specify the target replica set size for the managed service
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: Stateful-ByResourceGroup, Stateful-ByResourceId, Stateful-ByInputObject
 Aliases:
 
@@ -265,7 +265,7 @@ Accept wildcard characters: False
 The managed service resource.
 
 ```yaml
-Type: PSManagedService
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedService
 Parameter Sets: Stateless-ByInputObject, Stateful-ByInputObject
 Aliases:
 
@@ -281,7 +281,7 @@ Specify the instance close delay duration for the managed service.
 Duration represented in ISO 8601 format 'hh:mm:ss'
 
 ```yaml
-Type: TimeSpan
+Type: System.TimeSpan
 Parameter Sets: Stateless-ByResourceGroup, Stateless-ByResourceId, Stateless-ByInputObject
 Aliases:
 
@@ -296,7 +296,7 @@ Accept wildcard characters: False
 Specify the instance count for the managed service
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: Stateless-ByResourceGroup, Stateless-ByResourceId, Stateless-ByInputObject
 Aliases:
 
@@ -311,7 +311,7 @@ Accept wildcard characters: False
 Specify the placement constraints of the managed service, as a string.
 
 ```yaml
-Type: PSServiceMetric[]
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSServiceMetric[]
 Parameter Sets: (All)
 Aliases:
 
@@ -326,7 +326,7 @@ Accept wildcard characters: False
 Specify the minimum instance count for the managed service
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: Stateless-ByResourceGroup, Stateless-ByResourceId, Stateless-ByInputObject
 Aliases:
 
@@ -341,7 +341,7 @@ Accept wildcard characters: False
 Specify the minimum instance percentage for the managed service
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: Stateless-ByResourceGroup, Stateless-ByResourceId, Stateless-ByInputObject
 Aliases:
 
@@ -356,7 +356,7 @@ Accept wildcard characters: False
 Specify the min replica set size for the managed service
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: Stateful-ByResourceGroup, Stateful-ByResourceId, Stateful-ByInputObject
 Aliases:
 
@@ -371,7 +371,7 @@ Accept wildcard characters: False
 Specify the name of the managed service.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: Stateless-ByResourceGroup, Stateful-ByResourceGroup
 Aliases: ServiceName
 
@@ -386,7 +386,7 @@ Accept wildcard characters: False
 Specify the placement constraints of the managed service, as a string.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -402,7 +402,7 @@ Specify the quorum loss wait duration for the managed service.
 Duration represented in ISO 8601 format 'hh:mm:ss'
 
 ```yaml
-Type: TimeSpan
+Type: System.TimeSpan
 Parameter Sets: Stateful-ByResourceGroup, Stateful-ByResourceId, Stateful-ByInputObject
 Aliases:
 
@@ -418,7 +418,7 @@ Specify the replica restart wait duration for the managed service.
 Duration represented in ISO 8601 format 'hh:mm:ss'
 
 ```yaml
-Type: TimeSpan
+Type: System.TimeSpan
 Parameter Sets: Stateful-ByResourceGroup, Stateful-ByResourceId, Stateful-ByInputObject
 Aliases:
 
@@ -433,7 +433,7 @@ Accept wildcard characters: False
 Specify the name of the resource group.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: Stateless-ByResourceGroup, Stateful-ByResourceGroup
 Aliases:
 
@@ -448,7 +448,7 @@ Accept wildcard characters: False
 Arm ResourceId of the managed service.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: Stateless-ByResourceId, Stateful-ByResourceId
 Aliases:
 
@@ -463,7 +463,7 @@ Accept wildcard characters: False
 Specify the placement constraints of the managed service, as a string.
 
 ```yaml
-Type: String
+Type: System.String
 Parameter Sets: (All)
 Aliases:
 
@@ -479,7 +479,7 @@ Specify the default cost for a move.
 Higher costs make it less likely that the Cluster Resource Manager will move the replica when trying to balance the cluster
 
 ```yaml
-Type: ServicePackageActivationModeEnum
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.ServicePackageActivationModeEnum
 Parameter Sets: (All)
 Aliases:
 Accepted values: SharedProcess, ExclusiveProcess
@@ -496,7 +496,7 @@ Specify the service placement time limit for the managed service.
 Duration represented in ISO 8601 format 'hh:mm:ss'
 
 ```yaml
-Type: TimeSpan
+Type: System.TimeSpan
 Parameter Sets: Stateful-ByResourceGroup, Stateful-ByResourceId, Stateful-ByInputObject
 Aliases:
 
@@ -512,7 +512,7 @@ Specify the stand by replica duration for the managed service.
 Duration represented in ISO 8601 format 'hh:mm:ss'
 
 ```yaml
-Type: TimeSpan
+Type: System.TimeSpan
 Parameter Sets: Stateful-ByResourceGroup, Stateful-ByResourceId, Stateful-ByInputObject
 Aliases:
 
@@ -527,7 +527,7 @@ Accept wildcard characters: False
 Use for stateful service
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: Stateful-ByResourceGroup, Stateful-ByResourceId, Stateful-ByInputObject
 Aliases:
 
@@ -542,7 +542,7 @@ Accept wildcard characters: False
 Use for stateless service
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: Stateless-ByResourceGroup, Stateless-ByResourceId, Stateless-ByInputObject
 Aliases:
 
@@ -557,7 +557,7 @@ Accept wildcard characters: False
 Specify the tags as key/value pairs.
 
 ```yaml
-Type: Hashtable
+Type: System.Collections.Hashtable
 Parameter Sets: (All)
 Aliases:
 
@@ -572,7 +572,7 @@ Accept wildcard characters: False
 Specify the target replica set size for the managed service
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: Stateful-ByResourceGroup, Stateful-ByResourceId, Stateful-ByInputObject
 Aliases:
 
@@ -587,7 +587,7 @@ Accept wildcard characters: False
 Prompts you for confirmation before running the cmdlet.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: cf
 
@@ -603,7 +603,7 @@ Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
 
 ```yaml
-Type: SwitchParameter
+Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases: wi
 
@@ -621,13 +621,13 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ### System.String
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedService
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedService
 
 ### System.Collections.Hashtable
 
 ## OUTPUTS
 
-### Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedService
+### Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedService
 
 ## NOTES
 
diff --git a/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedNodeType.md b/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedNodeType.md
index 94b367d3e13c..95323ec2c152 100644
--- a/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedNodeType.md
+++ b/src/ServiceFabric/ServiceFabric/help/Set-AzServiceFabricManagedNodeType.md
@@ -243,7 +243,7 @@ Accept wildcard characters: False
 Node type resource
 
 ```yaml
-Type: Microsoft.Azure.Commands.ServiceFabric.Models.ManagedClusters.PSManagedNodeType
+Type: Microsoft.Azure.Commands.ServiceFabric.Models.PSManagedNodeType
 Parameter Sets: ByObj, ReimageByObj
 Aliases: