diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/AddAzureKeyVaultKey.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/AddAzureKeyVaultKey.cs
index 947528113132..254ef0f98653 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/AddAzureKeyVaultKey.cs
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/AddAzureKeyVaultKey.cs
@@ -34,7 +34,7 @@ namespace Microsoft.Azure.Commands.KeyVault
     /// 4 .Create a HSM or software key by importing key material with given key 
     /// attributes
     /// </summary>
-    [Cmdlet(VerbsCommon.Add, "AzureRmKeyVaultKey",
+    [Cmdlet(VerbsCommon.Add, "AzureKeyVaultKey",
         DefaultParameterSetName = CreateParameterSet, 
         HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(KeyBundle))]
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/BackupAzureKeyVaultKey.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/BackupAzureKeyVaultKey.cs
index 93fcf472b4cc..29f82674b41d 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/BackupAzureKeyVaultKey.cs
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/BackupAzureKeyVaultKey.cs
@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.KeyVault
     /// <summary>
     /// Requests that a backup of the specified key be downloaded and stored to a file
     /// </summary>
-    [Cmdlet(VerbsData.Backup, "AzureRmKeyVaultKey", HelpUri = Constants.KeyVaultHelpUri)]
+    [Cmdlet(VerbsData.Backup, "AzureKeyVaultKey", HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(String))]
     public class BackupAzureKeyVaultKey : KeyVaultCmdletBase
     {
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVaultKey.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVaultKey.cs
index 79a1966e4bac..2623d9579d52 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVaultKey.cs
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVaultKey.cs
@@ -21,7 +21,7 @@
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
-    [Cmdlet(VerbsCommon.Get, "AzureRmKeyVaultKey",
+    [Cmdlet(VerbsCommon.Get, "AzureKeyVaultKey",
         DefaultParameterSetName = ByVaultNameParameterSet, 
         HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(List<KeyIdentityItem>), typeof(KeyBundle))]
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVaultSecret.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVaultSecret.cs
index 4a486c192cf3..3a3911e875f1 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVaultSecret.cs
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVaultSecret.cs
@@ -21,7 +21,7 @@
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
-    [Cmdlet(VerbsCommon.Get, "AzureRmKeyVaultSecret",
+    [Cmdlet(VerbsCommon.Get, "AzureKeyVaultSecret",
         DefaultParameterSetName = ByVaultNameParameterSet, 
         HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(List<SecretIdentityItem>), typeof(Secret))]
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVaultKey.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVaultKey.cs
index ea8c2c8cc4dd..fd55f20be13b 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVaultKey.cs
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVaultKey.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
-    [Cmdlet(VerbsCommon.Remove, "AzureRmKeyVaultKey", 
+    [Cmdlet(VerbsCommon.Remove, "AzureKeyVaultKey", 
         SupportsShouldProcess = true,
         ConfirmImpact = ConfirmImpact.High, 
         HelpUri = Constants.KeyVaultHelpUri)]
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVaultSecret.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVaultSecret.cs
index d28d73f0d7f6..746f637e5f8a 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVaultSecret.cs
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVaultSecret.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
-    [Cmdlet(VerbsCommon.Remove, "AzureRmKeyVaultSecret",
+    [Cmdlet(VerbsCommon.Remove, "AzureKeyVaultSecret",
         SupportsShouldProcess = true,
         ConfirmImpact = ConfirmImpact.High, 
         HelpUri = Constants.KeyVaultHelpUri)]
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RestoreAzureKeyVaultKey.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RestoreAzureKeyVaultKey.cs
index c76614d9c3e2..46f33f0cf538 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RestoreAzureKeyVaultKey.cs
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RestoreAzureKeyVaultKey.cs
@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.KeyVault
     /// <summary>
     /// Restores the backup key into a vault 
     /// </summary>
-    [Cmdlet(VerbsData.Restore, "AzureRmKeyVaultKey", HelpUri = Constants.KeyVaultHelpUri)]
+    [Cmdlet(VerbsData.Restore, "AzureKeyVaultKey", HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(KeyBundle))]
     public class RestoreAzureKeyVaultKey : KeyVaultCmdletBase
     {
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultKeyAttribute.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultKeyAttribute.cs
index 79d154332aa5..f4fb3f25f1db 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultKeyAttribute.cs
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultKeyAttribute.cs
@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.KeyVault
     /// Update attribute of a key vault key.
     /// </summary>
     [Alias("Set-AzureKeyVaultKey")]
-    [Cmdlet(VerbsCommon.Set, "AzureRmKeyVaultKeyAttribute", HelpUri = Constants.KeyVaultHelpUri)]
+    [Cmdlet(VerbsCommon.Set, "AzureKeyVaultKeyAttribute", HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(KeyBundle))]
     public class SetAzureKeyVaultKeyAttribute : KeyVaultCmdletBase
     {
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultSecret.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultSecret.cs
index 55c175558b42..fe9d92a37a24 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultSecret.cs
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultSecret.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
-    [Cmdlet(VerbsCommon.Set, "AzureRmKeyVaultSecret", HelpUri = Constants.KeyVaultHelpUri)]
+    [Cmdlet(VerbsCommon.Set, "AzureKeyVaultSecret", HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(Secret))]
     public class SetAzureKeyVaultSecret : KeyVaultCmdletBase
     {
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultSecretAttribute.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultSecretAttribute.cs
index c67b068df682..a7c77837308a 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultSecretAttribute.cs
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultSecretAttribute.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
-    [Cmdlet(VerbsCommon.Set, "AzureRmKeyVaultSecretAttribute", HelpUri = Constants.KeyVaultHelpUri)]
+    [Cmdlet(VerbsCommon.Set, "AzureKeyVaultSecretAttribute", HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(Secret))]
     public class SetAzureKeyVaultSecretAttribute : KeyVaultCmdletBase
     {
diff --git a/src/ResourceManager/Profile/Commands.Profile/Context/SetAzureRMContext.cs b/src/ResourceManager/Profile/Commands.Profile/Context/SetAzureRMContext.cs
index dc3e1a7eee56..b5476c8a08eb 100644
--- a/src/ResourceManager/Profile/Commands.Profile/Context/SetAzureRMContext.cs
+++ b/src/ResourceManager/Profile/Commands.Profile/Context/SetAzureRMContext.cs
@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.Profile
     /// <summary>
     /// Cmdlet to change current Azure context. 
     /// </summary>
-    [Cmdlet(VerbsCommon.Set, "AzureRMContext", DefaultParameterSetName =TenantIdAndSubscriptionIdParameterSet)]
+    [Cmdlet(VerbsCommon.Set, "AzureRmContext", DefaultParameterSetName =TenantIdAndSubscriptionIdParameterSet)]
     [Alias("Select-AzureRmSubscription")]
     [OutputType(typeof(PSAzureContext))]
     public class SetAzureRMContextCommand : AzureRMCmdlet
diff --git a/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml b/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml
index 04ff1058f9c1..cae9dfa3e623 100644
--- a/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml
+++ b/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml
@@ -1760,7 +1760,7 @@ Subscription Name: Contoso Subscription 1</maml:para>
   <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>Save-AzureRMProfile</command:name>
+      <command:name>Save-AzureRmProfile</command:name>
       <maml:description>
         <maml:para>Save the current authentication information for use in other PowerShell sessions.</maml:para>
       </maml:description>
@@ -1768,7 +1768,7 @@ Subscription Name: Contoso Subscription 1</maml:para>
         <maml:para />
       </maml:copyright>
       <command:verb>Save</command:verb>
-      <command:noun>AzureRMProfile</command:noun>
+      <command:noun>AzureRmProfile</command:noun>
       <dev:version />
     </command:details>
     <maml:description>
@@ -1776,13 +1776,13 @@ Subscription Name: Contoso Subscription 1</maml:para>
     </maml:description>
     <command:syntax>
       <command:syntaxItem>
-        <maml:name>Save-AzureRMProfile</maml:name>
+        <maml:name>Save-AzureRmProfile</maml:name>
         <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="0">
           <maml:name>Profile</maml:name>
           <maml:description>
             <maml:para>If provided, saves the given profile to the provided path.  If no profile is provided, the currently active profile will be saved.</maml:para>
           </maml:description>
-          <command:parameterValue required="true" variableLength="false">AzureRMProfile</command:parameterValue>
+          <command:parameterValue required="true" variableLength="false">AzureRmProfile</command:parameterValue>
         </command:parameter>
         <command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="1">
           <maml:name>Path</maml:name>
@@ -1813,9 +1813,9 @@ Subscription Name: Contoso Subscription 1</maml:para>
         <maml:description>
           <maml:para>If provided, saves the given profile to the provided path.  If no profile is provided, the currently active profile will be saved.</maml:para>
         </maml:description>
-        <command:parameterValue required="true" variableLength="false">AzureRMProfile</command:parameterValue>
+        <command:parameterValue required="true" variableLength="false">AzureRmProfile</command:parameterValue>
         <dev:type>
-          <maml:name>AzureRMProfile</maml:name>
+          <maml:name>AzureRmProfile</maml:name>
           <maml:uri />
         </dev:type>
         <dev:defaultValue>
@@ -1919,7 +1919,7 @@ Subscription Name: Contoso Subscription 1</maml:para>
   <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>Select-AzureRMProfile</command:name>
+      <command:name>Select-AzureRmProfile</command:name>
       <maml:description>
         <maml:para>Load authentication information from the given file.  This sets the current context and azure environment metadata used by all cmdlets in the current session.</maml:para>
       </maml:description>
@@ -1927,7 +1927,7 @@ Subscription Name: Contoso Subscription 1</maml:para>
         <maml:para />
       </maml:copyright>
       <command:verb>Select</command:verb>
-      <command:noun>AzureRMProfile</command:noun>
+      <command:noun>AzureRmProfile</command:noun>
       <dev:version />
     </command:details>
     <maml:description>
@@ -1935,13 +1935,13 @@ Subscription Name: Contoso Subscription 1</maml:para>
     </maml:description>
     <command:syntax>
       <command:syntaxItem>
-        <maml:name>Select-AzureRMProfile</maml:name>
+        <maml:name>Select-AzureRmProfile</maml:name>
         <command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="0">
           <maml:name>Profile</maml:name>
           <maml:description>
             <maml:para>The profile to select as the current profile in the given session.</maml:para>
           </maml:description>
-          <command:parameterValue required="true" variableLength="false">AzureRMProfile</command:parameterValue>
+          <command:parameterValue required="true" variableLength="false">AzureRmProfile</command:parameterValue>
         </command:parameter>
         <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
           <maml:name>InformationAction</maml:name>
@@ -1959,7 +1959,7 @@ Subscription Name: Contoso Subscription 1</maml:para>
         </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
-        <maml:name>Select-AzureRMProfile</maml:name>
+        <maml:name>Select-AzureRmProfile</maml:name>
         <command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="0">
           <maml:name>Path</maml:name>
           <maml:description>
@@ -1989,9 +1989,9 @@ Subscription Name: Contoso Subscription 1</maml:para>
         <maml:description>
           <maml:para>The profile to select as the current profile in the given session.</maml:para>
         </maml:description>
-        <command:parameterValue required="true" variableLength="false">AzureRMProfile</command:parameterValue>
+        <command:parameterValue required="true" variableLength="false">AzureRmProfile</command:parameterValue>
         <dev:type>
-          <maml:name>AzureRMProfile</maml:name>
+          <maml:name>AzureRmProfile</maml:name>
           <maml:uri />
         </dev:type>
         <dev:defaultValue>
@@ -2085,7 +2085,7 @@ Subscription Name: Contoso Subscription 1</maml:para>
   <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>Set-AzureRMContext</command:name>
+      <command:name>Set-AzureRmContext</command:name>
       <maml:description>
         <maml:para>Set the tenant, subscription, and environment to be used by cmdlets in this session.</maml:para>
       </maml:description>
@@ -2093,7 +2093,7 @@ Subscription Name: Contoso Subscription 1</maml:para>
         <maml:para />
       </maml:copyright>
       <command:verb>Set</command:verb>
-      <command:noun>AzureRMContext</command:noun>
+      <command:noun>AzureRmContext</command:noun>
       <dev:version />
     </command:details>
     <maml:description>
@@ -2101,7 +2101,7 @@ Subscription Name: Contoso Subscription 1</maml:para>
     </maml:description>
     <command:syntax>
       <command:syntaxItem>
-        <maml:name>Set-AzureRMContext</maml:name>
+        <maml:name>Set-AzureRmContext</maml:name>
         <command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
           <maml:name>TenantId</maml:name>
           <maml:description>
@@ -2132,7 +2132,7 @@ Subscription Name: Contoso Subscription 1</maml:para>
         </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
-        <maml:name>Set-AzureRMContext</maml:name>
+        <maml:name>Set-AzureRmContext</maml:name>
         <command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
           <maml:name>TenantId</maml:name>
           <maml:description>
@@ -2156,7 +2156,7 @@ Subscription Name: Contoso Subscription 1</maml:para>
         </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
-        <maml:name>Set-AzureRMContext</maml:name>
+        <maml:name>Set-AzureRmContext</maml:name>
         <command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
           <maml:name>SubscriptionId</maml:name>
           <maml:description>
@@ -2180,7 +2180,7 @@ Subscription Name: Contoso Subscription 1</maml:para>
         </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
-        <maml:name>Set-AzureRMContext</maml:name>
+        <maml:name>Set-AzureRmContext</maml:name>
         <command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
           <maml:name>Tenant</maml:name>
           <maml:description>
diff --git a/src/ResourceManager/Profile/Commands.Profile/Profile/SaveAzureRMProfile.cs b/src/ResourceManager/Profile/Commands.Profile/Profile/SaveAzureRMProfile.cs
index ef1aec4e42ef..ecaddc706af0 100644
--- a/src/ResourceManager/Profile/Commands.Profile/Profile/SaveAzureRMProfile.cs
+++ b/src/ResourceManager/Profile/Commands.Profile/Profile/SaveAzureRMProfile.cs
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.Profile
     /// <summary>
     /// Saves Microsoft Azure profile.
     /// </summary>
-    [Cmdlet(VerbsData.Save, "AzureRMProfile"), OutputType(typeof(PSAzureProfile))]
+    [Cmdlet(VerbsData.Save, "AzureRmProfile"), OutputType(typeof(PSAzureProfile))]
     public class SaveAzureRMProfileCommand : AzureRMCmdlet
     {
         [Parameter(Mandatory = false, Position = 0, ValueFromPipelineByPropertyName = true)]
diff --git a/src/ResourceManager/Profile/Commands.Profile/Profile/SelectAzureRMProfile.cs b/src/ResourceManager/Profile/Commands.Profile/Profile/SelectAzureRMProfile.cs
index 58060fa9f06c..410aa662d539 100644
--- a/src/ResourceManager/Profile/Commands.Profile/Profile/SelectAzureRMProfile.cs
+++ b/src/ResourceManager/Profile/Commands.Profile/Profile/SelectAzureRMProfile.cs
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.Profile
     /// <summary>
     /// Selects Microsoft Azure profile.
     /// </summary>
-    [Cmdlet(VerbsCommon.Select, "AzureRMProfile"), OutputType(typeof(PSAzureProfile))]
+    [Cmdlet(VerbsCommon.Select, "AzureRmProfile"), OutputType(typeof(PSAzureProfile))]
     public class SelectAzureRMProfileCommand : AzureRMCmdlet
     {
         internal const string InMemoryProfileParameterSet = "InMemoryProfile";