diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs
index 2990c3c537bf..2543472a6148 100644
--- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs
+++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs
@@ -47,7 +47,7 @@ public static ContainerBase GetContainerModel(ServiceClientModel.ProtectionConta
                 }
                 if (protectionContainer.Properties.GetType() == typeof(ServiceClientModel.MabProtectionContainer))
                 {
-                    containerModel = new AzureRmRecoveryServicesBackupMabContainer(protectionContainer);
+                    containerModel = new MabContainer(protectionContainer);
                 }
             }
 
@@ -70,7 +70,7 @@ public static BackupEngineBase GetBackupEngineModel(ServiceClientModel.BackupEng
                 }
                 else if (backupEngine.Properties.GetType() == (typeof(ServiceClientModel.AzureBackupServerEngine)))
                 {
-                    backupEngineModel = new AzureRmRecoveryServicesBackupAzureBackupServerEngine(backupEngine);
+                    backupEngineModel = new AzureBackupServerEngine(backupEngine);
                 }
             }
 
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/BaseObjects.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/BaseObjects.cs
index 1df987d02b78..d850ea69f755 100644
--- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/BaseObjects.cs
+++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/BaseObjects.cs
@@ -70,13 +70,13 @@ public ContainerContext(string backupManagementType)
     /// <summary>
     /// Class representing backup engine context.
     /// </summary>
-    public class AzureRmRecoveryServicesBackupEngineContext : ManagementContext
+    public class BackupEngineContext : ManagementContext
     {
         public string BackupEngineType { get; set; }
 
-        public AzureRmRecoveryServicesBackupEngineContext() { }
+        public BackupEngineContext() { }
 
-        public AzureRmRecoveryServicesBackupEngineContext(string backupEngineType, string backupManagementType)
+        public BackupEngineContext(string backupEngineType, string backupManagementType)
             : base(backupManagementType)
         {
             BackupEngineType = backupEngineType;
@@ -104,7 +104,7 @@ public ContainerBase(ServiceClientModel.ProtectionContainerResource protectionCo
     /// <summary>
     /// Base class for backup engine.
     /// </summary>
-    public class BackupEngineBase : AzureRmRecoveryServicesBackupEngineContext
+    public class BackupEngineBase : BackupEngineContext
     {
         /// <summary>
         /// Container Name
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Commands.RecoveryServices.Backup.Models.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Commands.RecoveryServices.Backup.Models.csproj
index 98e725fc4006..094eea454185 100644
--- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Commands.RecoveryServices.Backup.Models.csproj
+++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Commands.RecoveryServices.Backup.Models.csproj
@@ -55,7 +55,7 @@
     <Compile Include="AzureVmModels\AzureVmItem.cs" />
     <Compile Include="AzureVmModels\AzureVmContainer.cs" />
     <Compile Include="DpmModels\DpmBackupEngine.cs" />
-    <Compile Include="MabModels\AzureRmRecoveryServicesMabContainer.cs" />
+    <Compile Include="MabModels\MabContainer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <DependentUpon>Resources.resx</DependentUpon>
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/DpmModels/DpmBackupEngine.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/DpmModels/DpmBackupEngine.cs
index 61255f371846..8c9d795b0744 100644
--- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/DpmModels/DpmBackupEngine.cs
+++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/DpmModels/DpmBackupEngine.cs
@@ -48,7 +48,7 @@ public DpmBackupEngine(ServiceClientModel.BackupEngineResource backupEngine)
     /// <summary>
     /// Azure backup specific backup server engine class.
     /// </summary>
-    public class AzureRmRecoveryServicesBackupAzureBackupServerEngine : BackupEngineBase
+    public class AzureBackupServerEngine : BackupEngineBase
     {
         /// <summary>
         /// Friendly name of the container
@@ -60,7 +60,7 @@ public class AzureRmRecoveryServicesBackupAzureBackupServerEngine : BackupEngine
         /// </summary>
         public string Status { get; set; }
 
-        public AzureRmRecoveryServicesBackupAzureBackupServerEngine(ServiceClientModel.BackupEngineResource backupEngine)
+        public AzureBackupServerEngine(ServiceClientModel.BackupEngineResource backupEngine)
             : base(backupEngine)
         {
             ServiceClientModel.AzureBackupServerEngine azureBackupServerEngine = (ServiceClientModel.AzureBackupServerEngine)backupEngine.Properties;
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/MabModels/AzureRmRecoveryServicesMabContainer.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/MabModels/MabContainer.cs
similarity index 90%
rename from src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/MabModels/AzureRmRecoveryServicesMabContainer.cs
rename to src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/MabModels/MabContainer.cs
index 133c699cc822..15be327f563c 100644
--- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/MabModels/AzureRmRecoveryServicesMabContainer.cs
+++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/MabModels/MabContainer.cs
@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
     /// <summary>
     /// MAB specific container class.
     /// </summary>
-    public class AzureRmRecoveryServicesBackupMabContainer : ContainerBase
+    public class MabContainer : ContainerBase
     {
         /// <summary>
         /// Friendly name of the container
@@ -36,7 +36,7 @@ public class AzureRmRecoveryServicesBackupMabContainer : ContainerBase
         /// </summary>
         public ContainerRegistrationStatus Status { get; set; }
 
-        public AzureRmRecoveryServicesBackupMabContainer(ProtectionContainerResource protectionContainer)
+        public MabContainer(ProtectionContainerResource protectionContainer)
             : base(protectionContainer)
         {
             MabProtectionContainer mabProtectionContainer = (MabProtectionContainer)protectionContainer.Properties;
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupContainer.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupContainer.cs
index ea370b2db4fd..f8347efb9ddf 100644
--- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupContainer.cs
+++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupContainer.cs
@@ -49,8 +49,8 @@ public override void ExecuteCmdlet()
                     throw new ArgumentException(String.Format(Resources.UnsupportedContainerException, 
                         Container.ContainerType, Container.BackupManagementType));
                 }
-                AzureRmRecoveryServicesBackupMabContainer mabContainer = 
-                    Container as AzureRmRecoveryServicesBackupMabContainer;
+                MabContainer mabContainer = 
+                    Container as MabContainer;
                 string containerName = mabContainer.Name;
                 ServiceClientAdapter.UnregisterContainers(containerName);
             });
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml
index 66d5ab1e7c07..a5bc7b0b9a1e 100644
--- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml
+++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml
@@ -2,9 +2,9 @@
 <Configuration>
   <ViewDefinitions>
 	  <View>
-		  <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupEngineBase</Name>
+		  <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupEngineBase</Name>
 		  <ViewSelectedBy>
-			  <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupEngineBase</TypeName>
+			  <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupEngineBase</TypeName>
 		  </ViewSelectedBy>
 		  <TableControl>
 			  <TableHeaders>
@@ -32,9 +32,9 @@
 		  </TableControl>
 	  </View>
 	  <View>
-		  <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupMabContainer</Name>
+		  <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.MabContainer</Name>
 		  <ViewSelectedBy>
-			  <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupMabContainer</TypeName>
+			  <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.MabContainer</TypeName>
 		  </ViewSelectedBy>
 		  <TableControl>
 			  <TableHeaders>
@@ -69,9 +69,9 @@
 		  </TableControl>
 	  </View>
     <View>
-      <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmPolicy</Name>
+      <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmPolicy</Name>
       <ViewSelectedBy>
-        <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmPolicy</TypeName>
+        <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmPolicy</TypeName>
       </ViewSelectedBy>
       <TableControl>
         <TableHeaders>
@@ -120,9 +120,9 @@
       </TableControl>
     </View>
     <View>
-      <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupJobBase</Name>
+      <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.JobBase</Name>
       <ViewSelectedBy>
-        <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupJobBase</TypeName>
+        <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.JobBase</TypeName>
       </ViewSelectedBy>
       <TableControl>
         <TableHeaders>
@@ -178,9 +178,9 @@
       </TableControl>
     </View>
     <View>
-      <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmContainer</Name>
+      <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmContainer</Name>
       <ViewSelectedBy>
-        <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmContainer</TypeName>
+        <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmContainer</TypeName>
       </ViewSelectedBy>
       <TableControl>
         <TableHeaders>
@@ -222,9 +222,9 @@
       </TableControl>
     </View>
     <View>
-      <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmItem</Name>
+      <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmItem</Name>
       <ViewSelectedBy>
-        <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmItem</TypeName>
+        <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmItem</TypeName>
       </ViewSelectedBy>
       <TableControl>
         <TableHeaders>
@@ -273,9 +273,9 @@
       </TableControl>
     </View>
 	  <View>
-		  <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmRecoveryPoint</Name>
+		  <Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmRecoveryPoint</Name>
 		  <ViewSelectedBy>
-			  <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmRecoveryPoint</TypeName>
+			  <TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmRecoveryPoint</TypeName>
 		  </ViewSelectedBy>
 		  <TableControl>
 			  <TableHeaders>
diff --git a/src/ResourceManager/RecoveryServices.Backup/RecoveryServices.Backup.sln b/src/ResourceManager/RecoveryServices.Backup/RecoveryServices.Backup.sln
index c4c4ecedc02c..ada394cf37f1 100644
--- a/src/ResourceManager/RecoveryServices.Backup/RecoveryServices.Backup.sln
+++ b/src/ResourceManager/RecoveryServices.Backup/RecoveryServices.Backup.sln
@@ -1,4 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -96,4 +97,4 @@ Global
 		{65E15D74-1E24-4600-8671-D0B420524B17} = {54815A13-6BFB-406A-BEFC-44C31CABAFB4}
 		{3436A126-EDC9-4060-8952-9A1BE34CDD95} = {54815A13-6BFB-406A-BEFC-44C31CABAFB4}
 	EndGlobalSection
-EndGlobal
\ No newline at end of file
+EndGlobal
diff --git a/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1 b/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1
index 6d939e058e67..79dcb37f9b88 100644
--- a/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1
+++ b/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1
@@ -82,8 +82,7 @@ FormatsToProcess = @(
     '.\AzureRM.UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml',
     '.\AzureRM.Sql\Microsoft.Azure.Commands.Sql.format.ps1xml',
 	'.\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.DataLakeAnalytics.format.ps1xml',
-	'.\AzureRM.DataLakeStore\Microsoft.Azure.Commands.DataLakeStoreFileSystem.format.ps1xml',
-    '.\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml'
+	'.\AzureRM.DataLakeStore\Microsoft.Azure.Commands.DataLakeStoreFileSystem.format.ps1xml'
 )  
   
 # Modules to import as nested modules of the module specified in ModuleToProcess  
@@ -118,7 +117,6 @@ NestedModules = @(
     '.\AzureRM.DataLakeStore',
     '.\AzureRM.Intune',
     '.\AzureRM.RecoveryServices',
-    '.\AzureRM.RecoveryServices.Backup',
     '.\AzureRM.AzureStackAdmin',
     '.\AzureRM.AzureStackStorage'
 )