diff --git a/src/HDInsight/HDInsight/ManagementCommands/NewAzureHDInsightClusterAutoscaleConfigurationCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/NewAzureHDInsightClusterAutoscaleConfigurationCommand.cs
index 72257b026afa..3f93c95a4ff5 100644
--- a/src/HDInsight/HDInsight/ManagementCommands/NewAzureHDInsightClusterAutoscaleConfigurationCommand.cs
+++ b/src/HDInsight/HDInsight/ManagementCommands/NewAzureHDInsightClusterAutoscaleConfigurationCommand.cs
@@ -24,7 +24,7 @@
 using System.Management.Automation;
 using System.Text;
 
-namespace Microsoft.Azure.Commands.HDInsight.ManagementCommands
+namespace Microsoft.Azure.Commands.HDInsight
 {
     [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightClusterAutoscaleConfiguration",
         DefaultParameterSetName = LoadAutoscaleParameterSet), OutputType(typeof(AzureHDInsightAutoscale))]
diff --git a/src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightClusterAutoscaleConfigurationCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightClusterAutoscaleConfigurationCommand.cs
index 5e992fc6bf2f..a23922f93e59 100644
--- a/src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightClusterAutoscaleConfigurationCommand.cs
+++ b/src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightClusterAutoscaleConfigurationCommand.cs
@@ -24,7 +24,7 @@
 using System.Management.Automation;
 using System.Text;
 
-namespace Microsoft.Azure.Commands.HDInsight.ManagementCommands
+namespace Microsoft.Azure.Commands.HDInsight
 {
     [Cmdlet("Set", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightClusterAutoscaleConfiguration",
         DefaultParameterSetName = LoadAutoscaleByNameParameterSet, SupportsShouldProcess = true),
diff --git a/src/HDInsight/HDInsight/help/Az.HDInsight.md b/src/HDInsight/HDInsight/help/Az.HDInsight.md
index 1373cf913dd0..bef9dcf265ed 100644
--- a/src/HDInsight/HDInsight/help/Az.HDInsight.md
+++ b/src/HDInsight/HDInsight/help/Az.HDInsight.md
@@ -74,6 +74,9 @@ Creates an Azure HDInsight cluster in the specified resource group for the curre
 ### [New-AzHDInsightClusterAutoscaleConfiguration](New-AzHDInsightClusterAutoscaleConfiguration.md)
 Creates a non-persisted object that describes the autoscale configuration of an Azure HDInsight cluster.
 
+### [New-AzHDInsightClusterAutoscaleScheduleCondition](New-AzHDInsightClusterAutoscaleScheduleCondition.md)
+Creates Schedule-based autoscale condition.
+
 ### [New-AzHDInsightClusterConfig](New-AzHDInsightClusterConfig.md)
 Creates a non-persisted cluster configuration object that describes an Azure HDInsight cluster configuration.
 
diff --git a/src/HDInsight/HDInsight/help/New-AzHDInsightClusterAutoscaleScheduleCondition.md b/src/HDInsight/HDInsight/help/New-AzHDInsightClusterAutoscaleScheduleCondition.md
index 86b942551b7e..6b055e8deb93 100644
--- a/src/HDInsight/HDInsight/help/New-AzHDInsightClusterAutoscaleScheduleCondition.md
+++ b/src/HDInsight/HDInsight/help/New-AzHDInsightClusterAutoscaleScheduleCondition.md
@@ -49,7 +49,7 @@ This command creates a condition where cluster autoscale to 5 worker nodes at 09
 Gets or sets the days of Autoscale schedule condition.
 
 ```yaml
-Type: AzureHDInsightDaysOfWeek[]
+Type: Microsoft.Azure.Commands.HDInsight.Models.AzureHDInsightDaysOfWeek[]
 Parameter Sets: (All)
 Aliases:
 Accepted values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday
@@ -65,7 +65,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
 
@@ -80,7 +80,7 @@ Accept wildcard characters: False
 Gets or sets the time of Autoscale schedule condition.
 
 ```yaml
-Type: DateTime
+Type: System.DateTime
 Parameter Sets: (All)
 Aliases:
 
@@ -95,7 +95,7 @@ Accept wildcard characters: False
 Gets or sets the schedule workernode count of Autoscale schedule condition.
 
 ```yaml
-Type: Int32
+Type: System.Int32
 Parameter Sets: (All)
 Aliases:
 
diff --git a/tools/StaticAnalysis/Exceptions/Az.HDInsight/SignatureIssues.csv b/tools/StaticAnalysis/Exceptions/Az.HDInsight/SignatureIssues.csv
index e0ba9c3c5bfd..b384ee0e6730 100644
--- a/tools/StaticAnalysis/Exceptions/Az.HDInsight/SignatureIssues.csv
+++ b/tools/StaticAnalysis/Exceptions/Az.HDInsight/SignatureIssues.csv
@@ -68,3 +68,9 @@
 "Microsoft.Azure.PowerShell.Cmdlets.HDInsight.dll","Microsoft.Azure.Commands.HDInsight.ManagementCommands.AddAzureHDInsightClusterIdentity","Add-AzHDInsightClusterIdentity","1","8420","Parameter set 'CertificateFilePath' of cmdlet 'Add-AzHDInsightClusterIdentity' contains at least one parameter with a position larger than four, which is discouraged.","Limit the number of positional parameters in a single parameter set to four or fewer."
 "Microsoft.Azure.PowerShell.Cmdlets.HDInsight.dll","Microsoft.Azure.Commands.HDInsight.ManagementCommands.AddAzureHDInsightClusterIdentity","Add-AzHDInsightClusterIdentity","1","8420","Parameter set 'CertificateFileContents' of cmdlet 'Add-AzHDInsightClusterIdentity' contains at least one parameter with a position larger than four, which is discouraged.","Limit the number of positional parameters in a single parameter set to four or fewer."
 "Microsoft.Azure.PowerShell.Cmdlets.HDInsight.dll","Microsoft.Azure.Commands.HDInsight.NewAzureHDInsightClusterCommand","New-AzHDInsightCluster","1","8700","Parameter set '__AllParameterSets', 'CertificateFilePath', 'CertificateFileContents' of cmdlet 'New-AzHDInsightCluster' have the same mandatory parameters, and both of them are not default parameter set which may cause confusion.","Merge these parameter sets into one parameter set."
+"Microsoft.Azure.PowerShell.Cmdlets.HDInsight.dll","Microsoft.Azure.Commands.HDInsight.NewAzureHDInsightClusterAutoscaleScheduleConditionCommand","New-AzHDInsightClusterAutoscaleScheduleCondition","1","8100","New-AzHDInsightClusterAutoscaleScheduleCondition Does not support ShouldProcess but the cmdlet verb New indicates that it should.","Determine if the cmdlet should implement ShouldProcess and if so determine if it should implement Force / ShouldContinue"
+"Microsoft.Azure.PowerShell.Cmdlets.HDInsight.dll","Microsoft.Azure.Commands.HDInsight.NewAzureHDInsightClusterAutoscaleScheduleConditionCommand","New-AzHDInsightClusterAutoscaleScheduleCondition","1","8410","Parameter Days of cmdlet New-AzHDInsightClusterAutoscaleScheduleCondition does not follow the enforced naming convention of using a singular noun for a parameter name.","Consider using a singular noun for the parameter name."
+"Microsoft.Azure.PowerShell.Cmdlets.HDInsight.dll","Microsoft.Azure.Commands.HDInsight.NewAzureHDInsightClusterAutoscaleConfiguration","New-AzHDInsightClusterAutoscaleConfiguration","1","8100","New-AzHDInsightClusterAutoscaleConfiguration Does not support ShouldProcess but the cmdlet verb New indicates that it should.","Determine if the cmdlet should implement ShouldProcess and if so determine if it should implement Force / ShouldContinue"
+"Microsoft.Azure.PowerShell.Cmdlets.HDInsight.dll","Microsoft.Azure.Commands.HDInsight.SetAzureHDInsightClusterAutoscaleConfigurationCommand","Set-AzHDInsightClusterAutoscaleConfiguration","1","8700","Parameter set 'LoadAutoscaleByResourceIdParameterSet', 'ScheduleAutoscaleByResourceIdParameterSet' of cmdlet 'Set-AzHDInsightClusterAutoscaleConfiguration' have the same mandatory parameters, and both of them are not default parameter set which may cause confusion.","Merge these parameter sets into one parameter set."
+"Microsoft.Azure.PowerShell.Cmdlets.HDInsight.dll","Microsoft.Azure.Commands.HDInsight.SetAzureHDInsightClusterAutoscaleConfigurationCommand","Set-AzHDInsightClusterAutoscaleConfiguration","1","8700","Parameter set 'LoadAutoscaleByInputObjectParameterSet', 'ScheduleAutoscaleByInputObjectParameterSet' of cmdlet 'Set-AzHDInsightClusterAutoscaleConfiguration' have the same mandatory parameters, and both of them are not default parameter set which may cause confusion.","Merge these parameter sets into one parameter set."
+