Rename WAF cmdlets from *-AzFrontDoor* to *-AzFrontDoorWaf*

src/Accounts/Accounts/AzureRmAlias/Mappings.json

@@ -947,14 +947,15 @@
     "New-AzFrontDoorFrontendEndpointObject": "New-AzureRmFrontDoorFrontendEndpointObject",
     "New-AzFrontDoorHealthProbeSettingObject": "New-AzureRmFrontDoorHealthProbeSettingObject",
     "New-AzFrontDoorLoadBalancingSettingObject": "New-AzureRmFrontDoorLoadBalancingSettingObject",
-    "New-AzFrontDoorMatchConditionObject": "New-AzureRmFrontDoorMatchConditionObject",
-    "New-AzFrontDoorCustomRuleObject": "New-AzureRmFrontDoorCustomRuleObject",
-    "New-AzFrontDoorManagedRuleObject": "New-AzureRmFrontDoorManagedRuleObject",
-    "New-AzFrontDoorFireWallPolicy": "New-AzureRmFrontDoorFireWallPolicy",
-    "Get-AzFrontDoorFireWallPolicy": "Get-AzureRmFrontDoorFireWallPolicy",
-    "Set-AzFrontDoorFireWallPolicy": "Set-AzureRmFrontDoorFireWallPolicy",
-    "Remove-AzFrontDoorFireWallPolicy": "Remove-AzureRmFrontDoorFireWallPolicy",
-    "New-AzFrontDoorRuleGroupOverrideObject": "New-AzureRmFrontDoorRuleGroupOverrideObject",
+    "New-AzFrontDoorWafMatchConditionObject": "New-AzureRmFrontDoorMatchConditionObject",
+    "New-AzFrontDoorWafCustomRuleObject": "New-AzureRmFrontDoorCustomRuleObject",
+    "New-AzFrontDoorWafManagedRuleObject": "New-AzureRmFrontDoorManagedRuleObject",
+    "New-AzFrontDoorWafManagedRuleOverrideObject": "New-AzureRmFrontDoorManagedRuleOverrideObject",
+    "New-AzFrontDoorWafPolicy": "New-AzureRmFrontDoorFireWallPolicy",
+    "Get-AzFrontDoorWafPolicy": "Get-AzureRmFrontDoorFireWallPolicy",
+    "Set-AzFrontDoorWafPolicy": "Set-AzureRmFrontDoorFireWallPolicy",
+    "Remove-AzFrontDoorWafPolicy": "Remove-AzureRmFrontDoorFireWallPolicy",
+    "New-AzFrontDoorWafRuleGroupOverrideObject": "New-AzureRmFrontDoorRuleGroupOverrideObject",
     "Remove-AzFrontDoorContent": "Remove-AzureRmFrontDoorContent",
     "Enable-AzFrontDoorCustomDomainHttps": "Enable-AzureRmFrontDoorCustomDomainHttps",
     "Disable-AzFrontDoorCustomDomainHttps": "Disable-AzureRmFrontDoorCustomDomainHttps",

src/FrontDoor/FrontDoor.Test/ScenarioTests/WebApplicationFireWallPolicyTests.ps1

@@ -22,16 +22,16 @@ function Test-PolicyCrud
     $resourceGroup = TestSetup-CreateResourceGroup
     $resourceGroupName = $resourceGroup.ResourceGroupName
     $tags = @{"tag1" = "value1"; "tag2" = "value2"}
-    $matchCondition1 = New-AzFrontDoorMatchConditionObject -MatchVariable RequestHeader -OperatorProperty Contains -Selector "UserAgent" -MatchValue "Windows"
-    $customRule1 = New-AzFrontDoorCustomRuleObject -Name "Rule1" -RuleType MatchRule -MatchCondition $matchCondition1 -Action Block -Priority 2
+    $matchCondition1 = New-AzFrontDoorWafMatchConditionObject -MatchVariable RequestHeader -OperatorProperty Contains -Selector "UserAgent" -MatchValue "Windows"
+    $customRule1 = New-AzFrontDoorWafCustomRuleObject -Name "Rule1" -RuleType MatchRule -MatchCondition $matchCondition1 -Action Block -Priority 2
 
-    $ruleOverride = New-AzFrontDoorManagedRuleOverrideObject -RuleId "942100" -Action Log
-    $override1 = New-AzFrontDoorRuleGroupOverrideObject -RuleGroupName SQLI -ManagedRuleOverride $ruleOverride
-    $managedRule1 = New-AzFrontDoorManagedRuleObject -Type DefaultRuleSet -Version "preview-0.1" -RuleGroupOverride $override1
+    $ruleOverride = New-AzFrontDoorWafManagedRuleOverrideObject -RuleId "942100" -Action Log
+    $override1 = New-AzFrontDoorWafRuleGroupOverrideObject -RuleGroupName SQLI -ManagedRuleOverride $ruleOverride
+    $managedRule1 = New-AzFrontDoorWafManagedRuleObject -Type DefaultRuleSet -Version "preview-0.1" -RuleGroupOverride $override1
 
-    New-AzFrontDoorFireWallPolicy -Name $Name -ResourceGroupName $resourceGroupName -Customrule $customRule1 -ManagedRule $managedRule1 -EnabledState Enabled -Mode Prevention
+    New-AzFrontDoorWafPolicy -Name $Name -ResourceGroupName $resourceGroupName -Customrule $customRule1 -ManagedRule $managedRule1 -EnabledState Enabled -Mode Prevention
 
-    $retrievedPolicy = Get-AzFrontDoorFireWallPolicy -Name $Name -ResourceGroupName $resourceGroupName 
+    $retrievedPolicy = Get-AzFrontDoorWafPolicy -Name $Name -ResourceGroupName $resourceGroupName 
     Assert-NotNull $retrievedPolicy
     Assert-AreEqual $Name $retrievedPolicy.Name
     Assert-AreEqual $customRule1.Name $retrievedPolicy.CustomRules[0].Name
@@ -40,18 +40,18 @@ function Test-PolicyCrud
     Assert-AreEqual $customRule1.Priority $retrievedPolicy.CustomRules[0].Priority
     Assert-AreEqual $managedRule1.RuleGroupOverrides[0].ManagedRuleOverrides[0].Action $retrievedPolicy.ManagedRules[0].RuleGroupOverrides[0].ManagedRuleOverrides[0].Action
 
-    $customRule2 = New-AzFrontDoorCustomRuleObject -Name "Rule2" -RuleType MatchRule -MatchCondition $matchCondition1 -Action Log -Priority 2
-    $updatedPolicy = Update-AzFrontDoorFireWallPolicy -Name $Name -ResourceGroupName $resourceGroupName -Customrule $customRule2
+    $customRule2 = New-AzFrontDoorWafCustomRuleObject -Name "Rule2" -RuleType MatchRule -MatchCondition $matchCondition1 -Action Log -Priority 2
+    $updatedPolicy = Update-AzFrontDoorWafPolicy -Name $Name -ResourceGroupName $resourceGroupName -Customrule $customRule2
     Assert-NotNull $updatedPolicy
     Assert-AreEqual $Name $updatedPolicy.Name
     Assert-AreEqual $customRule2.Name $updatedPolicy.CustomRules[0].Name
     Assert-AreEqual $customRule2.Action $updatedPolicy.CustomRules[0].Action
     Assert-AreEqual $customRule2.Priority $updatedPolicy.CustomRules[0].Priority
     Assert-AreEqual $managedRule1.RuleGroupOverrides[0].ManagedRuleOverrides[0].Action $updatedPolicy.ManagedRules[0].RuleGroupOverrides[0].ManagedRuleOverrides[0].Action
 
-    $removed = Remove-AzFrontDoorFireWallPolicy -Name $Name -ResourceGroupName $resourceGroupName -PassThru
+    $removed = Remove-AzFrontDoorWafPolicy -Name $Name -ResourceGroupName $resourceGroupName -PassThru
     Assert-True { $removed }
-    Assert-ThrowsContains { Get-AzFrontDoorFireWallPolicy -Name $Name -ResourceGroupName $resourceGroupName } "does not exist."
+    Assert-ThrowsContains { Get-AzFrontDoorWafPolicy -Name $Name -ResourceGroupName $resourceGroupName } "does not exist."
 }
 
 <#
@@ -64,25 +64,25 @@ function Test-PolicyCrudWithPiping
     $resourceGroup = TestSetup-CreateResourceGroup
     $resourceGroupName = $resourceGroup.ResourceGroupName
     $tag = @{"tag1" = "value1"; "tag2" = "value2"}
-    $matchCondition1 = New-AzFrontDoorMatchConditionObject -MatchVariable RequestHeader -OperatorProperty Contains -Selector "UserAgent" -MatchValue "Windows"
-    $customRule1 = New-AzFrontDoorCustomRuleObject -Name "Rule1" -RuleType MatchRule -MatchCondition $matchCondition1 -Action Block -Priority 2
+    $matchCondition1 = New-AzFrontDoorWafMatchConditionObject -MatchVariable RequestHeader -OperatorProperty Contains -Selector "UserAgent" -MatchValue "Windows"
+    $customRule1 = New-AzFrontDoorWafCustomRuleObject -Name "Rule1" -RuleType MatchRule -MatchCondition $matchCondition1 -Action Block -Priority 2
 
-    $ruleOverride = New-AzFrontDoorManagedRuleOverrideObject -RuleId "942100" -Action Log
-    $override1 = New-AzFrontDoorRuleGroupOverrideObject -RuleGroupName SQLI -ManagedRuleOverride $ruleOverride
-    $managedRule1 = New-AzFrontDoorManagedRuleObject -Type DefaultRuleSet -Version "preview-0.1" -RuleGroupOverride $override1
+    $ruleOverride = New-AzFrontDoorWafManagedRuleOverrideObject -RuleId "942100" -Action Log
+    $override1 = New-AzFrontDoorWafRuleGroupOverrideObject -RuleGroupName SQLI -ManagedRuleOverride $ruleOverride
+    $managedRule1 = New-AzFrontDoorWafManagedRuleObject -Type DefaultRuleSet -Version "preview-0.1" -RuleGroupOverride $override1
 
-    New-AzFrontDoorFireWallPolicy -Name $Name -ResourceGroupName $resourceGroupName -Customrule $customRule1 -ManagedRule $managedRule1 -EnabledState Enabled -Mode Prevention
+    New-AzFrontDoorWafPolicy -Name $Name -ResourceGroupName $resourceGroupName -Customrule $customRule1 -ManagedRule $managedRule1 -EnabledState Enabled -Mode Prevention
 
-    $customRule2 = New-AzFrontDoorCustomRuleObject -Name "Rule2" -RuleType MatchRule -MatchCondition $matchCondition1 -Action Log -Priority 2
-    $updatedPolicy = Get-AzFrontDoorFireWallPolicy -Name $Name -ResourceGroupName $resourceGroupName | Update-AzFrontDoorFireWallPolicy -Customrule $customRule2
+    $customRule2 = New-AzFrontDoorWafCustomRuleObject -Name "Rule2" -RuleType MatchRule -MatchCondition $matchCondition1 -Action Log -Priority 2
+    $updatedPolicy = Get-AzFrontDoorWafPolicy -Name $Name -ResourceGroupName $resourceGroupName | Update-AzFrontDoorWafPolicy -Customrule $customRule2
     Assert-NotNull $updatedPolicy
     Assert-AreEqual $Name $updatedPolicy.Name
     Assert-AreEqual $customRule2.Name $updatedPolicy.CustomRules[0].Name
     Assert-AreEqual $customRule2.Action $updatedPolicy.CustomRules[0].Action
     Assert-AreEqual $customRule2.Priority $updatedPolicy.CustomRules[0].Priority
     Assert-AreEqual $managedRule1.RuleGroupOverrides[0].ManagedRuleOverrides[0].Action $updatedPolicy.ManagedRules[0].RuleGroupOverrides[0].ManagedRuleOverrides[0].Action
 
-    $removed = Get-AzFrontDoorFireWallPolicy -Name $Name -ResourceGroupName $resourceGroupName | Remove-AzFrontDoorFireWallPolicy -PassThru
+    $removed = Get-AzFrontDoorWafPolicy -Name $Name -ResourceGroupName $resourceGroupName | Remove-AzFrontDoorWafPolicy -PassThru
     Assert-True { $removed }
-    Assert-ThrowsContains { Get-AzFrontDoorFireWallPolicy -Name $Name -ResourceGroupName $resourceGroupName } "does not exist."
+    Assert-ThrowsContains { Get-AzFrontDoorWafPolicy -Name $Name -ResourceGroupName $resourceGroupName } "does not exist."
 }

src/FrontDoor/FrontDoor/Az.FrontDoor.psd1

@@ -80,16 +80,16 @@ CmdletsToExport = 'New-AzFrontDoor', 'Get-AzFrontDoor', 'Set-AzFrontDoor',
                'New-AzFrontDoorFrontendEndpointObject', 
                'New-AzFrontDoorHealthProbeSettingObject', 
                'New-AzFrontDoorLoadBalancingSettingObject', 
-               'New-AzFrontDoorMatchConditionObject', 
-               'New-AzFrontDoorCustomRuleObject', 
-               'New-AzFrontDoorManagedRuleObject', 'New-AzFrontDoorFireWallPolicy', 
-               'Get-AzFrontDoorFireWallPolicy', 'Update-AzFrontDoorFireWallPolicy', 
-               'Remove-AzFrontDoorFireWallPolicy', 
-               'New-AzFrontDoorRuleGroupOverrideObject', 
+               'New-AzFrontDoorWafMatchConditionObject', 
+               'New-AzFrontDoorWafCustomRuleObject', 
+               'New-AzFrontDoorWafManagedRuleObject', 'New-AzFrontDoorWafPolicy', 
+               'Get-AzFrontDoorWafPolicy', 'Update-AzFrontDoorWafPolicy', 
+               'Remove-AzFrontDoorWafPolicy', 
+               'New-AzFrontDoorWafRuleGroupOverrideObject', 
                'Remove-AzFrontDoorContent', 'Enable-AzFrontDoorCustomDomainHttps', 
                'Disable-AzFrontDoorCustomDomainHttps', 
                'Get-AzFrontDoorFrontendEndpoint', 
-               'New-AzFrontDoorManagedRuleOverrideObject'
+               'New-AzFrontDoorWafManagedRuleOverrideObject'
 
 # Variables to export from this module
 # VariablesToExport = @()

src/FrontDoor/FrontDoor/ChangeLog.md

@@ -18,6 +18,19 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+## Version 0.7.5
+* Rename WAF cmdlets to include 'Waf'
+    - `Get-AzFrontDoorFireWallPolicy --> Get-AzFrontDoorWafPolicy`
+    - `New-AzFrontDoorCustomRuleObject --> New-AzFrontDoorWafCustomRuleObject`
+    - `New-AzFrontDoorFireWallPolicy --> New-AzFrontDoorWafPolicy`
+    - `New-AzFrontDoorManagedRuleObject --> New-AzFrontDoorWafManagedRuleObject`
+    - `New-AzFrontDoorManagedRuleOverrideObject --> New-AzFrontDoorWafManagedRuleOverrideObject`
+    - `New-AzFrontDoorMatchConditionObject --> New-AzFrontDoorWafMatchConditionObject`
+    - `New-AzFrontDoorRuleGroupOverrideObject --> New-AzFrontDoorWafRuleGroupOverrideObject`
+    - `Remove-AzFrontDoorFireWallPolicy --> Remove-AzFrontDoorWafPolicy`
+    - `Update-AzFrontDoorFireWallPolicy --> Update-AzFrontDoorWafPolicy`
+
+
 ## Version 0.7.4
 * Change enum type parameters to string.
 

src/FrontDoor/FrontDoor/Cmdlets/GetAzureRmFrontDoorFireWallPolicy.cs → src/FrontDoor/FrontDoor/Cmdlets/GetAzureRmFrontDoorWafPolicy.cs

@@ -29,8 +29,8 @@ namespace Microsoft.Azure.Commands.FrontDoor.Cmdlets
     /// <summary>
     /// Defines the Get-AzFrontDoorFireWallPolicy cmdlet.
     /// </summary>
-    [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorFireWallPolicy"), OutputType(typeof(PSPolicy))]
-    public class GetAzureRmFrontDoorFireWallPolicy : AzureFrontDoorCmdletBase
+    [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorWafPolicy"), OutputType(typeof(PSPolicy))]
+    public class GetAzureRmFrontDoorWafPolicy : AzureFrontDoorCmdletBase
     {
         /// <summary>
         /// The resource group name.

src/FrontDoor/FrontDoor/Cmdlets/NewAzureRmFrontDoorCustomRuleObject.cs → src/FrontDoor/FrontDoor/Cmdlets/NewAzureRmFrontDoorWafCustomRuleObject.cs

@@ -26,10 +26,10 @@
 namespace Microsoft.Azure.Commands.FrontDoor.Cmdlets
 {
     /// <summary>
-    /// Defines the New-AzFrontDoorCustomRuleObject cmdlet.
+    /// Defines the New-AzFrontDoorWafCustomRuleObject cmdlet.
     /// </summary>
-    [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorCustomRuleObject"), OutputType(typeof(PSCustomRule))]
-    public class NewAzureRmFrontDoorCustomRuleObject : AzureFrontDoorCmdletBase
+    [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorWafCustomRuleObject"), OutputType(typeof(PSCustomRule))]
+    public class NewAzureRmFrontDoorWafCustomRuleObject : AzureFrontDoorCmdletBase
     {
         /// <summary>
         /// Name of the rule. 

src/FrontDoor/FrontDoor/Cmdlets/NewAzureRmFrontDoorManagedRuleObject.cs → src/FrontDoor/FrontDoor/Cmdlets/NewAzureRmFrontDoorWafManagedRuleObject.cs

@@ -21,10 +21,10 @@
 namespace Microsoft.Azure.Commands.FrontDoor.Cmdlets
 {
     /// <summary>
-    /// Defines the New-AzFrontDoorManagedRuleObject cmdlet.
+    /// Defines the New-AzFrontDoorWafManagedRuleObject cmdlet.
     /// </summary>
-    [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorManagedRuleObject"), OutputType(typeof(PSAzureManagedRule))]
-    public class NewAzureRmFrontDoorManagedRuleObject : AzureFrontDoorCmdletBase
+    [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorWafManagedRuleObject"), OutputType(typeof(PSAzureManagedRule))]
+    public class NewAzureRmFrontDoorWafManagedRuleObject : AzureFrontDoorCmdletBase
     {
         /// <summary>
         /// Type of the ruleset (e.g.: DefaultRuleSet)

src/FrontDoor/FrontDoor/Cmdlets/NewAzureRmFrontDoorManagedRuleOverrideObject.cs → src/FrontDoor/FrontDoor/Cmdlets/NewAzureRmFrontDoorWafManagedRuleOverrideObject.cs

@@ -21,10 +21,10 @@
 namespace Microsoft.Azure.Commands.FrontDoor.Cmdlets
 {
     /// <summary>
-    /// Defines the New-AzFrontDoorManagedRuleOverrideObject cmdlet.
+    /// Defines the New-AzFrontDoorWafManagedRuleOverrideObject cmdlet.
     /// </summary>
-    [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorManagedRuleOverrideObject"), OutputType(typeof(PSAzureManagedRuleOverride))]
-    public class NewAzureRmFrontDoorManagedRuleOverrideObject : AzureFrontDoorCmdletBase
+    [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorWafManagedRuleOverrideObject"), OutputType(typeof(PSAzureManagedRuleOverride))]
+    public class NewAzureRmFrontDoorWafManagedRuleOverrideObject : AzureFrontDoorCmdletBase
     {
         /// <summary>
         /// Rule ID

src/FrontDoor/FrontDoor/Cmdlets/NewAzureRmFrontDoorMatchConditionObject.cs → src/FrontDoor/FrontDoor/Cmdlets/NewAzureRmFrontDoorWafMatchConditionObject.cs

@@ -22,10 +22,10 @@
 namespace Microsoft.Azure.Commands.FrontDoor.Cmdlets
 {
     /// <summary>
-    /// Defines the New-AzFrontDoorMatchConditionObject cmdlet.
+    /// Defines the New-AzFrontDoorWafMatchConditionObject cmdlet.
     /// </summary>
-    [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorMatchConditionObject"), OutputType(typeof(PSMatchCondition))]
-    public class NewAzureRmFrontDoorMatchConditionObject : AzureFrontDoorCmdletBase
+    [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorWafMatchConditionObject"), OutputType(typeof(PSMatchCondition))]
+    public class NewAzureRmFrontDoorWafMatchConditionObject : AzureFrontDoorCmdletBase
     {
 
         /// <summary>

src/FrontDoor/FrontDoor/Cmdlets/NewAzureRmFrontDoorFireWallPolicy.cs → src/FrontDoor/FrontDoor/Cmdlets/NewAzureRmFrontDoorWafPolicy.cs

@@ -27,10 +27,10 @@
 namespace Microsoft.Azure.Commands.FrontDoor.Cmdlets
 {
     /// <summary>
-    /// Defines the New-AzFrontDoorFireWallPolicy cmdlet.
+    /// Defines the New-AzFrontDoorWafPolicy cmdlet.
     /// </summary>
-    [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorFireWallPolicy", SupportsShouldProcess = true), OutputType(typeof(PSPolicy))]
-    public class NewAzureRmFrontDoorFireWallPolicy : AzureFrontDoorCmdletBase
+    [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorWafPolicy", SupportsShouldProcess = true), OutputType(typeof(PSPolicy))]
+    public class NewAzureRmFrontDoorWafPolicy : AzureFrontDoorCmdletBase
     {
         /// <summary>
         /// The resource group name.

src/FrontDoor/FrontDoor/Cmdlets/NewAzureRmFrontDoorRuleGroupOverrideObject.cs → src/FrontDoor/FrontDoor/Cmdlets/NewAzureRmFrontDoorWafRuleGroupOverrideObject.cs

@@ -20,10 +20,10 @@
 namespace Microsoft.Azure.Commands.FrontDoor.Cmdlets
 {
     /// <summary>
-    /// Defines the New-AzFrontDoorRuleGroupOverrideObject cmdlet.
+    /// Defines the New-AzFrontDoorWafRuleGroupOverrideObject cmdlet.
     /// </summary>
-    [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorRuleGroupOverrideObject"), OutputType(typeof(PSAzureRuleGroupOverride))]
-    public class NewAzureRmFrontDoorRuleGroupOverrideObject : AzureFrontDoorCmdletBase
+    [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorWafRuleGroupOverrideObject"), OutputType(typeof(PSAzureRuleGroupOverride))]
+    public class NewAzureRmFrontDoorWafRuleGroupOverrideObject : AzureFrontDoorCmdletBase
     {
         /// <summary>
         /// Rule Group Name

src/FrontDoor/FrontDoor/Cmdlets/RemoveAzureRmFrontDoorFireWallPolicy.cs → src/FrontDoor/FrontDoor/Cmdlets/RemoveAzureRmFrontDoorWafPolicy.cs

@@ -29,10 +29,10 @@
 namespace Microsoft.Azure.Commands.FrontDoor.Cmdlets
 {
     /// <summary>
-    /// Defines the Remove-AzFrontDoorFireWallPolicy cmdlet.
+    /// Defines the Remove-AzFrontDoorWafPolicy cmdlet.
     /// </summary>
-    [Cmdlet("Remove", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorFireWallPolicy", SupportsShouldProcess = true, DefaultParameterSetName = FieldsParameterSet), OutputType(typeof(bool))]
-    public class RemoveAzureRmFrontDoorFireWallPolicy : AzureFrontDoorCmdletBase
+    [Cmdlet("Remove", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorWafPolicy", SupportsShouldProcess = true, DefaultParameterSetName = FieldsParameterSet), OutputType(typeof(bool))]
+    public class RemoveAzureRmFrontDoorWafPolicy : AzureFrontDoorCmdletBase
     {
         [Parameter(Mandatory = true, ParameterSetName = FieldsParameterSet, HelpMessage = "The resource group to which the WAF policy belongs.")]
         [ValidateNotNullOrEmpty]

src/FrontDoor/FrontDoor/Cmdlets/UpdateAzureRmFrontDoorFireWallPolicy.cs → src/FrontDoor/FrontDoor/Cmdlets/UpdateAzureRmFrontDoorWafPolicy.cs

@@ -29,10 +29,10 @@
 namespace Microsoft.Azure.Commands.FrontDoor.Cmdlets
 {
     /// <summary>
-    /// Defines the Update-AzFrontDoorFireWallPolicy cmdlet.
+    /// Defines the Update-AzFrontDoorWafPolicy cmdlet.
     /// </summary>
-    [Cmdlet("Update", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorFireWallPolicy", SupportsShouldProcess = true, DefaultParameterSetName = FieldsParameterSet), OutputType(typeof(PSPolicy))]
-    public class UpdateAzureRmFrontDoorFireWallPolicy : AzureFrontDoorCmdletBase
+    [Cmdlet("Update", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FrontDoorWafPolicy", SupportsShouldProcess = true, DefaultParameterSetName = FieldsParameterSet), OutputType(typeof(PSPolicy))]
+    public class UpdateAzureRmFrontDoorWafPolicy : AzureFrontDoorCmdletBase
     {
         /// <summary>
         /// The resource group to which the FireWallPolicy belongs.