diff --git a/src/ResourceManager/Insights/Commands.Insights/Microsoft.Azure.Commands.Insights.dll-Help.xml b/src/ResourceManager/Insights/Commands.Insights/Microsoft.Azure.Commands.Insights.dll-Help.xml
index 91af89cb7735..acd79f8bd2c1 100644
--- a/src/ResourceManager/Insights/Commands.Insights/Microsoft.Azure.Commands.Insights.dll-Help.xml
+++ b/src/ResourceManager/Insights/Commands.Insights/Microsoft.Azure.Commands.Insights.dll-Help.xml
@@ -3575,7 +3575,7 @@ The value must be earlier than StartTime, but not more than 15 days.</maml:para>
 	<command:details>
 		<command:name>Get-AzureRMResourceProviderLog</command:name>
 		<maml:description>
-			<maml:para>Gets the operations associated with a Resource Provider (RP) for Azure Resource Manager (ARM). You can use the Get-AzureRMProvider command to list out the ARM Resource Providers that are available. By default, this command retrieves Resource Provider log entries for the last hour, however you can specify custom start and end times to get log entries from a specific time period.</maml:para>
+			<maml:para>Gets the operations associated with a Resource Provider (RP) for Azure Resource Manager (ARM). You can use the Get-AzureRMResourceProvider command to list out the ARM Resource Providers that are available. By default, this command retrieves Resource Provider log entries for the last hour, however you can specify custom start and end times to get log entries from a specific time period.</maml:para>
 		</maml:description>
 		<maml:copyright>
 			<maml:para />
@@ -3593,7 +3593,7 @@ The value must be earlier than StartTime, but not more than 15 days.</maml:para>
 			<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="0">
 				<maml:name>ResourceProvider</maml:name>
 				<maml:description>
-					<maml:para>Specifies a filter by ResourceProvider. This parameter is mandatory. To discover a list of Resource Providers, use the Get-AzureRMProvider command.</maml:para>
+					<maml:para>Specifies a filter by ResourceProvider. This parameter is mandatory. To discover a list of Resource Providers, use the Get-AzureRMResourceProvider command.</maml:para>
 				</maml:description>
 				<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
 			</command:parameter>
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Microsoft.Azure.Commands.OperationalInsights.dll-Help.xml b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Microsoft.Azure.Commands.OperationalInsights.dll-Help.xml
index 28979b1af4d5..57da874b200a 100644
--- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Microsoft.Azure.Commands.OperationalInsights.dll-Help.xml
+++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Microsoft.Azure.Commands.OperationalInsights.dll-Help.xml
@@ -2053,7 +2053,7 @@
 <command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10" xmlns:MSHelp="http://msdn.microsoft.com/mshelp">
 <!--Generated by PS Cmdlet Help Editor-->
 	<command:details>
-		<command:name>Get-AzureRMProvider</command:name>
+		<command:name>Get-AzureRMResourceProvider</command:name>
 		<maml:description>
 			<maml:para />
 		</maml:description>
diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/MoveResourceTest.ps1 b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/MoveResourceTest.ps1
index 2e37fc7d9fa1..86911a1342ed 100644
--- a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/MoveResourceTest.ps1
+++ b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/MoveResourceTest.ps1
@@ -27,7 +27,7 @@ function Test-MoveAzureResource
     $providerNamespace = "Providers.Test"
     $resourceType = $providerNamespace + "/statefulResources"
 
-    Register-AzureRMProvider -ProviderNamespace $providerNamespace -Force
+    Register-AzureRMResourceProvider -ProviderNamespace $providerNamespace -Force
     New-AzureRMResourceGroup -Name $sourceResourceGroupName -Location $location -Force
     New-AzureRMResourceGroup -Name $destinationResourceGroupName -Location $location -Force
     $resource1 = New-AzureRMResource -Name $testResourceName1 -Location $location -Tags @{Name = "testtag"; Value = "testval"} -ResourceGroupName $sourceResourceGroupName -ResourceType $resourceType -PropertyObject @{"administratorLogin" = "adminuser"; "administratorLoginPassword" = "P@ssword1"} -ApiVersion $apiversion -Force
diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ProviderTests.ps1 b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ProviderTests.ps1
index 1d6f9aeefb7f..f4f05f3f7a4e 100644
--- a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ProviderTests.ps1
+++ b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ProviderTests.ps1
@@ -18,33 +18,33 @@
 #>
 function Test-AzureProvider
 {
-    $defaultProviders = Get-AzureRMProvider
+    $defaultProviders = Get-AzureRMResourceProvider
 
     Assert-True { $defaultProviders.Length -gt 0 }
 
-    $allProviders = Get-AzureRMProvider -ListAvailable
+    $allProviders = Get-AzureRMResourceProvider -ListAvailable
 
     Assert-True { $allProviders.Length -gt $defaultProviders.Length }
 
-    Register-AzureRMProvider -ProviderName "Microsoft.ApiManagement" -Force
+    Register-AzureRMResourceProvider -ProviderName "Microsoft.ApiManagement" -Force
 
     $endTime = [DateTime]::UtcNow.AddMinutes(5)
 
-    while ([DateTime]::UtcNow -lt $endTime -and @(Get-AzureRMProvider -ProviderName "Microsoft.ApiManagement").RegistrationState -ne "Registered")
+    while ([DateTime]::UtcNow -lt $endTime -and @(Get-AzureRMResourceProvider -ProviderName "Microsoft.ApiManagement").RegistrationState -ne "Registered")
     {
         [Microsoft.WindowsAzure.Commands.Utilities.Common.TestMockSupport]::Delay(1000)
     }
 
-    Assert-True { @(Get-AzureRMProvider -ProviderName "Microsoft.ApiManagement").RegistrationState -eq "Registered" }
+    Assert-True { @(Get-AzureRMResourceProvider -ProviderName "Microsoft.ApiManagement").RegistrationState -eq "Registered" }
 
-    Unregister-AzureRMProvider -ProviderName "Microsoft.ApiManagement" -Force
+    Unregister-AzureRMResourceProvider -ProviderName "Microsoft.ApiManagement" -Force
 
-    while ([DateTime]::UtcNow -lt $endTime -and @(Get-AzureRMProvider -ProviderName "Microsoft.ApiManagement").RegistrationState -ne "Unregistered")
+    while ([DateTime]::UtcNow -lt $endTime -and @(Get-AzureRMResourceProvider -ProviderName "Microsoft.ApiManagement").RegistrationState -ne "Unregistered")
     {
         [Microsoft.WindowsAzure.Commands.Utilities.Common.TestMockSupport]::Delay(1000)
     }
 
-    Assert-True { @(Get-AzureRMProvider -ProviderName "Microsoft.ApiManagement").RegistrationState -eq "Unregistered" }
+    Assert-True { @(Get-AzureRMResourceProvider -ProviderName "Microsoft.ApiManagement").RegistrationState -eq "Unregistered" }
  }
 
  <#
diff --git a/src/ResourceManager/Resources/Commands.Resources/Microsoft.Azure.Commands.Resources.dll-Help.xml b/src/ResourceManager/Resources/Commands.Resources/Microsoft.Azure.Commands.Resources.dll-Help.xml
index f648db724c10..0be1c4bf3606 100644
--- a/src/ResourceManager/Resources/Commands.Resources/Microsoft.Azure.Commands.Resources.dll-Help.xml
+++ b/src/ResourceManager/Resources/Commands.Resources/Microsoft.Azure.Commands.Resources.dll-Help.xml
@@ -1043,7 +1043,7 @@ C:\&gt;New-AzureRMResource -Name MyWebSite -Location &apos;North Central US&apos
 <command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10" xmlns:MSHelp="http://msdn.microsoft.com/mshelp">
 <!--Generated by PS Cmdlet Help Editor-->
 	<command:details>
-		<command:name>Get-AzureRMProvider</command:name>
+		<command:name>Get-AzureRMResourceProvider</command:name>
 		<maml:description>
 			<maml:para />
 		</maml:description>
@@ -1051,7 +1051,7 @@ C:\&gt;New-AzureRMResource -Name MyWebSite -Location &apos;North Central US&apos
 			<maml:para />
 		</maml:copyright>
 		<command:verb>Get</command:verb>
-		<command:noun>AzureProvider</command:noun>
+		<command:noun>AzureRMResourceProvider</command:noun>
 		<dev:version />
 	</command:details>
 	<maml:description>
@@ -1059,7 +1059,7 @@ C:\&gt;New-AzureRMResource -Name MyWebSite -Location &apos;North Central US&apos
 	</maml:description>
 	<command:syntax>
 		<command:syntaxItem>
-			<maml:name>Get-AzureRMProvider</maml:name>
+			<maml:name>Get-AzureRMResourceProvider</maml:name>
 			<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
 				<maml:name>ListAvailable</maml:name>
 				<maml:description>
@@ -1076,7 +1076,7 @@ C:\&gt;New-AzureRMResource -Name MyWebSite -Location &apos;North Central US&apos
 			</command:parameter>
 		</command:syntaxItem>
 		<command:syntaxItem>
-			<maml:name>Get-AzureRMProvider</maml:name>
+			<maml:name>Get-AzureRMResourceProvider</maml:name>
 			<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
 				<maml:name>ProviderNamespace</maml:name>
 				<maml:description>
@@ -6906,7 +6906,7 @@ PS C:\&gt; New-AzureRMRoleDefinition -Role $roleDef</dev:code>
 <command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10" xmlns:MSHelp="http://msdn.microsoft.com/mshelp">
 <!--Generated by PS Cmdlet Help Editor-->
 	<command:details>
-		<command:name>Register-AzureRMProvider</command:name>
+		<command:name>Register-AzureRMResourceProvider</command:name>
 		<maml:description>
 			<maml:para />
 		</maml:description>
@@ -6914,7 +6914,7 @@ PS C:\&gt; New-AzureRMRoleDefinition -Role $roleDef</dev:code>
 			<maml:para />
 		</maml:copyright>
 		<command:verb>Register</command:verb>
-		<command:noun>AzureProvider</command:noun>
+		<command:noun>AzureRMResourceProvider</command:noun>
 		<dev:version />
 	</command:details>
 	<maml:description>
@@ -6922,7 +6922,7 @@ PS C:\&gt; New-AzureRMRoleDefinition -Role $roleDef</dev:code>
 	</maml:description>
 	<command:syntax>
 		<command:syntaxItem>
-			<maml:name>Register-AzureRMProvider</maml:name>
+			<maml:name>Register-AzureRMResourceProvider</maml:name>
 			<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
 				<maml:name>ProviderNamespace</maml:name>
 				<maml:description>
@@ -10530,7 +10530,7 @@ PS C:\&gt;Test-AzureResourceGroupTemplate -ResourceGroupName ContosoLabsRG -Gall
 <command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10" xmlns:MSHelp="http://msdn.microsoft.com/mshelp">
 <!--Generated by PS Cmdlet Help Editor-->
 	<command:details>
-		<command:name>Unregister-AzureRMProvider</command:name>
+		<command:name>Unregister-AzureRMResourceProvider</command:name>
 		<maml:description>
 			<maml:para />
 		</maml:description>
@@ -10538,7 +10538,7 @@ PS C:\&gt;Test-AzureResourceGroupTemplate -ResourceGroupName ContosoLabsRG -Gall
 			<maml:para />
 		</maml:copyright>
 		<command:verb>Unregister</command:verb>
-		<command:noun>AzureProvider</command:noun>
+		<command:noun>AzureRMResourceProvider</command:noun>
 		<dev:version />
 	</command:details>
 	<maml:description>
@@ -10546,7 +10546,7 @@ PS C:\&gt;Test-AzureResourceGroupTemplate -ResourceGroupName ContosoLabsRG -Gall
 	</maml:description>
 	<command:syntax>
 		<command:syntaxItem>
-			<maml:name>Unregister-AzureRMProvider</maml:name>
+			<maml:name>Unregister-AzureRMResourceProvider</maml:name>
 			<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
 				<maml:name>ProviderNamespace</maml:name>
 				<maml:description>
diff --git a/src/ResourceManager/Resources/Commands.Resources/Providers/GetAzureProviderCmdlet.cs b/src/ResourceManager/Resources/Commands.Resources/Providers/GetAzureProviderCmdlet.cs
index 7079bdf36d6c..23e59a197904 100644
--- a/src/ResourceManager/Resources/Commands.Resources/Providers/GetAzureProviderCmdlet.cs
+++ b/src/ResourceManager/Resources/Commands.Resources/Providers/GetAzureProviderCmdlet.cs
@@ -21,7 +21,7 @@ namespace Microsoft.Azure.Commands.Providers
     /// <summary>
     /// Get an existing resource.
     /// </summary>
-    [Cmdlet(VerbsCommon.Get, "AzureRMProvider", DefaultParameterSetName = GetAzureProviderCmdlet.ListAvailableParameterSet), OutputType(typeof(PSResourceProvider))]
+    [Cmdlet(VerbsCommon.Get, "AzureRMResourceProvider", DefaultParameterSetName = GetAzureProviderCmdlet.ListAvailableParameterSet), OutputType(typeof(PSResourceProvider))]
     public class GetAzureProviderCmdlet : ResourcesBaseCmdlet
     {
         /// <summary>
diff --git a/src/ResourceManager/Resources/Commands.Resources/Providers/RegisterAzureProviderCmdlet.cs b/src/ResourceManager/Resources/Commands.Resources/Providers/RegisterAzureProviderCmdlet.cs
index 44accef2c5fd..2c4427dc7dd7 100644
--- a/src/ResourceManager/Resources/Commands.Resources/Providers/RegisterAzureProviderCmdlet.cs
+++ b/src/ResourceManager/Resources/Commands.Resources/Providers/RegisterAzureProviderCmdlet.cs
@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Commands.Resources
     /// <summary>
     /// Register the previewed features of a certain azure resource provider.
     /// </summary>
-    [Cmdlet(VerbsLifecycle.Register, "AzureRMProvider"), OutputType(typeof(PSResourceProvider))]
+    [Cmdlet(VerbsLifecycle.Register, "AzureRMResourceProvider"), OutputType(typeof(PSResourceProvider))]
     public class RegisterAzureProviderCmdlet : ResourcesBaseCmdlet
     {
         /// <summary>
diff --git a/src/ResourceManager/Resources/Commands.Resources/Providers/UnregisterAzureProviderCmdlet.cs b/src/ResourceManager/Resources/Commands.Resources/Providers/UnregisterAzureProviderCmdlet.cs
index 8fd85e82d5b2..5d6bf49f42df 100644
--- a/src/ResourceManager/Resources/Commands.Resources/Providers/UnregisterAzureProviderCmdlet.cs
+++ b/src/ResourceManager/Resources/Commands.Resources/Providers/UnregisterAzureProviderCmdlet.cs
@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Commands.Resources
     /// <summary>
     /// Un-registers the resource provider from the current subscription.
     /// </summary>
-    [Cmdlet(VerbsLifecycle.Unregister, "AzureRMProvider"), OutputType(typeof(List<PSResourceProvider>))]
+    [Cmdlet(VerbsLifecycle.Unregister, "AzureRMResourceProvider"), OutputType(typeof(List<PSResourceProvider>))]
     public class UnregisterAzureProviderCmdlet : ResourcesBaseCmdlet
     {
         /// <summary>