diff --git a/src/ResourceManager/Profile/Commands.Profile/AzureRmAlias/Mappings.cs b/src/ResourceManager/Profile/Commands.Profile/AzureRmAlias/Mappings.cs
index d0ad4dbcb0e9..4f5c76c0a8ac 100644
--- a/src/ResourceManager/Profile/Commands.Profile/AzureRmAlias/Mappings.cs
+++ b/src/ResourceManager/Profile/Commands.Profile/AzureRmAlias/Mappings.cs
@@ -1205,10 +1205,12 @@ public static Dictionary<string, object> GetCaseInsensitiveMapping()
                  },
     'Az.Storage':  {
                        'New-AzStorageQueueSASToken':  'New-AzureStorageQueueSASToken',
+                       'Get-AzRmStorageContainer':  'Get-AzureRmStorageContainer',
                        'Get-AzStorageFileContent':  'Get-AzureStorageFileContent',
                        'Remove-AzStorageFile':  'Remove-AzureStorageFile',
                        'Set-AzCurrentStorageAccount':  'Set-AzureRmCurrentStorageAccount',
                        'Get-AzStorageUsage':  'Get-AzureRmStorageUsage',
+                       'Enable-AzStorageStaticWebsite':  'Enable-AzureStorageStaticWebsite',
                        'Get-AzStorageQueue':  'Get-AzureStorageQueue',
                        'Enable-AzStorageDeleteRetentionPolicy':  'Enable-AzureStorageDeleteRetentionPolicy',
                        'Update-AzStorageServiceProperty':  'Update-AzureStorageServiceProperty',
@@ -1225,21 +1227,27 @@ public static Dictionary<string, object> GetCaseInsensitiveMapping()
                        'Remove-AzStorageShare':  'Remove-AzureStorageShare',
                        'Set-AzStorageShareQuota':  'Set-AzureStorageShareQuota',
                        'Get-AzStorageBlobContent':  'Get-AzureStorageBlobContent',
+                       'Update-AzRmStorageContainer':  'Update-AzureRmStorageContainer',
                        'New-AzStorageDirectory':  'New-AzureStorageDirectory',
                        'New-AzStorageTableSASToken':  'New-AzureStorageTableSASToken',
                        'Set-AzStorageAccount':  'Set-AzureRmStorageAccount',
                        'New-AzStorageQueue':  'New-AzureStorageQueue',
                        'Remove-AzStorageTable':  'Remove-AzureStorageTable',
+                       'Get-AzStorageFile':  'Get-AzureStorageFile',
                        'Get-AzStorageShareStoredAccessPolicy':  'Get-AzureStorageShareStoredAccessPolicy',
+                       'Set-AzStorageContainerAcl':  'Set-AzureStorageContainerAcl',
+                       'Remove-AzRmStorageContainer':  'Remove-AzureRmStorageContainer',
                        'Update-AzStorageAccountNetworkRuleSet':  'Update-AzureRmStorageAccountNetworkRuleSet',
                        'Set-AzStorageBlobContent':  'Set-AzureStorageBlobContent',
                        'Start-AzStorageBlobCopy':  'Start-AzureStorageBlobCopy',
                        'Set-AzStorageQueueStoredAccessPolicy':  'Set-AzureStorageQueueStoredAccessPolicy',
                        'New-AzStorageAccount':  'New-AzureRmStorageAccount',
                        'New-AzStorageAccountSASToken':  'New-AzureStorageAccountSASToken',
-                       'Get-AzStorageServiceLoggingProperty':  'Get-AzureStorageServiceLoggingProperty',
+                       'Get-AzStorageBlob':  'Get-AzureStorageBlob',
                        'New-AzStorageContainer':  'New-AzureStorageContainer',
+                       'New-AzRmStorageContainer':  'New-AzureRmStorageContainer',
                        'Get-AzStorageContainer':  'Get-AzureStorageContainer',
+                       'Get-AzStorageTableStoredAccessPolicy':  'Get-AzureStorageTableStoredAccessPolicy',
                        'New-AzStorageContext':  'New-AzureStorageContext',
                        'Enable-AzStorageSoftDelete':  'Enable-AzureStorageSoftDelete',
                        'Remove-AzStorageShareStoredAccessPolicy':  'Remove-AzureStorageShareStoredAccessPolicy',
@@ -1247,31 +1255,34 @@ public static Dictionary<string, object> GetCaseInsensitiveMapping()
                        'New-AzStorageFileSASToken':  'New-AzureStorageFileSASToken',
                        'Remove-AzStorageAccountNetworkRule':  'Remove-AzureRmStorageAccountNetworkRule',
                        'Set-AzStorageServiceLoggingProperty':  'Set-AzureStorageServiceLoggingProperty',
+                       'Get-AzRmStorageContainerImmutabilityPolicy':  'Get-AzureRmStorageContainerImmutabilityPolicy',
                        'New-AzStorageTableStoredAccessPolicy':  'New-AzureStorageTableStoredAccessPolicy',
                        'Add-AzStorageAccountNetworkRule':  'Add-AzureRmStorageAccountNetworkRule',
                        'Disable-AzStorageSoftDelete':  'Disable-AzureStorageSoftDelete',
-                       'Get-AzStorageFile':  'Get-AzureStorageFile',
+                       'Remove-AzRmStorageContainerImmutabilityPolicy':  'Remove-AzureRmStorageContainerImmutabilityPolicy',
+                       'Set-AzStorageTableStoredAccessPolicy':  'Set-AzureStorageTableStoredAccessPolicy',
                        'Remove-AzStorageQueueStoredAccessPolicy':  'Remove-AzureStorageQueueStoredAccessPolicy',
                        'Set-AzStorageContainerStoredAccessPolicy':  'Set-AzureStorageContainerStoredAccessPolicy',
                        'Remove-AzStorageAccount':  'Remove-AzureRmStorageAccount',
                        'Get-AzStorageServiceMetricsProperty':  'Get-AzureStorageServiceMetricsProperty',
-                       'New-AzStorageShareStoredAccessPolicy':  'New-AzureStorageShareStoredAccessPolicy',
                        'New-AzStorageContainerStoredAccessPolicy':  'New-AzureStorageContainerStoredAccessPolicy',
-                       'Get-AzStorageTableStoredAccessPolicy':  'Get-AzureStorageTableStoredAccessPolicy',
+                       'Disable-AzStorageStaticWebsite':  'Disable-AzureStorageStaticWebsite',
+                       'Lock-AzRmStorageContainerImmutabilityPolicy':  'Lock-AzureRmStorageContainerImmutabilityPolicy',
+                       'Add-AzRmStorageContainerLegalHold':  'Add-AzureRmStorageContainerLegalHold',
                        'Remove-AzStorageBlob':  'Remove-AzureStorageBlob',
                        'Remove-AzStorageContainerStoredAccessPolicy':  'Remove-AzureStorageContainerStoredAccessPolicy',
+                       'Remove-AzRmStorageContainerLegalHold':  'Remove-AzureRmStorageContainerLegalHold',
                        'Remove-AzStorageTableStoredAccessPolicy':  'Remove-AzureStorageTableStoredAccessPolicy',
                        'Start-AzStorageFileCopy':  'Start-AzureStorageFileCopy',
                        'New-AzStorageAccountKey':  'New-AzureRmStorageAccountKey',
-                       'Set-AzStorageTableStoredAccessPolicy':  'Set-AzureStorageTableStoredAccessPolicy',
+                       'New-AzStorageShareStoredAccessPolicy':  'New-AzureStorageShareStoredAccessPolicy',
                        'Stop-CopyAzureStorageBlob':  'Stop-CopyAzureStorageBlob',
                        'Disable-AzStorageDeleteRetentionPolicy':  'Disable-AzureStorageDeleteRetentionPolicy',
                        'Set-AzStorageServiceMetricsProperty':  'Set-AzureStorageServiceMetricsProperty',
                        'New-AzStorageContainerSASToken':  'New-AzureStorageContainerSASToken',
                        'New-AzStorageShare':  'New-AzureStorageShare',
-                       'Set-AzStorageContainerAcl':  'Set-AzureStorageContainerAcl',
+                       'Get-AzStorageServiceLoggingProperty':  'Get-AzureStorageServiceLoggingProperty',
                        'New-AzStorageQueueStoredAccessPolicy':  'New-AzureStorageQueueStoredAccessPolicy',
-                       'Get-AzStorageBlob':  'Get-AzureStorageBlob',
                        'Get-AzStorageServiceProperty':  'Get-AzureStorageServiceProperty',
                        'New-AzStorageBlobSASToken':  'New-AzureStorageBlobSASToken',
                        'Remove-AzStorageCORSRule':  'Remove-AzureStorageCORSRule',
@@ -1287,7 +1298,8 @@ public static Dictionary<string, object> GetCaseInsensitiveMapping()
                        'Remove-AzStorageContainer':  'Remove-AzureStorageContainer',
                        'Start-AzStorageBlobIncrementalCopy':  'Start-AzureStorageBlobIncrementalCopy',
                        'Get-AzStorageFileCopyState':  'Get-AzureStorageFileCopyState',
-                       'Get-AzStorageAccount':  'Get-AzureRmStorageAccount'
+                       'Get-AzStorageAccount':  'Get-AzureRmStorageAccount',
+                       'Set-AzRmStorageContainerImmutabilityPolicy':  'Set-AzureRmStorageContainerImmutabilityPolicy'
                    },
     'Az.Insights':  {
                         'Remove-AzAlertRule':  'Remove-AzureRmAlertRule',
diff --git a/tools/AliasMapping.json b/tools/AliasMapping.json
index fa58652c40f2..f5dc043dcc75 100644
Binary files a/tools/AliasMapping.json and b/tools/AliasMapping.json differ
diff --git a/tools/CreateAliasMapping.ps1 b/tools/CreateAliasMapping.ps1
index daf655673074..b0fc1217126d 100644
--- a/tools/CreateAliasMapping.ps1
+++ b/tools/CreateAliasMapping.ps1
@@ -5,59 +5,39 @@ $psd1s = Get-ChildItem -Path $PSScriptRoot/../src -Recurse | `
     -and $_.FullName -notlike "*Stack*" -and $_.FullName -notlike "*`\Package`\*" -and $_.FullName -notlike "*Test*" -and $_.FullName -notlike "*`\bin`\*" -and $_.FullName -notlike "*`\obj`\*"}
 
 $psd1s | ForEach-Object {
-    <# Will be added back for Storage name class in Storage preview 
-    if ($_.Name -eq "AzureRM.Storage.psd1")
+    $name = (($_.Name -replace "AzureRM", "Az") -replace "Azure", "Az") -replace ".psd1", ""
+    if (!($mapping.Contains($name)))
     {
-        $name = ($_.Name -replace "AzureRM", "Az") -replace "Azure", "Az"
-        if (!($mapping.Contains($name)))
+        $mapping.Add($name, @{})
+    }
+    Import-LocalizedData -BindingVariable psd1info -BaseDirectory $_.DirectoryName -FileName $_.Name
+    $psd1info.CmdletsToExport | ForEach-Object {
+        if ($_ -like "*AzureRmStorageContainer*")
         {
-            $mapping.Add($name, @{})
+            $cmdletalias = $_ -replace "-AzureRM", "-AzRm"
+            $mapping[$name].Add($cmdletalias, $_)
         }
-        Import-LocalizedData -BindingVariable psd1info -BaseDirectory $_.DirectoryName -FileName $_.Name
-        $psd1info.CmdletsToExport | ForEach-Object {
-            if ($_ -like "*Azure*")
-            {
-                $cmdletalias = ($_ -replace "AzureRM", "Azure") -replace "Azure", "AzRm"
-                $mapping[$name].Add($cmdletalias, $_)
-            }
-            else
-            {
-                Write-Warning $_
-            }
+        elseif ($_ -like "*Azure*")
+        {
+            $cmdletalias = ($_ -replace "-AzureRM", "-Azure") -replace "-Azure", "-Az"
+            $mapping[$name].Add($cmdletalias, $_)
         }
-    } 
-    else
-    { #>
-        $name = (($_.Name -replace "AzureRM", "Az") -replace "Azure", "Az") -replace ".psd1", ""
-        if (!($mapping.Contains($name)))
+        else
         {
-            $mapping.Add($name, @{})
+            Write-Warning $_
         }
-        Import-LocalizedData -BindingVariable psd1info -BaseDirectory $_.DirectoryName -FileName $_.Name
-        $psd1info.CmdletsToExport | ForEach-Object {
-            if ($_ -like "*Azure*")
-            {
-                $cmdletalias = ($_ -replace "-AzureRM", "-Azure") -replace "-Azure", "-Az"
-                $mapping[$name].Add($cmdletalias, $_)
-            }
-            else
-            {
-                Write-Warning $_
-            }
+    }
+    $psd1info.AliasesToExport | ForEach-Object {
+        if ($_ -like "*Azure*")
+        {
+            $cmdletalias = ($_ -replace "-AzureRM", "-Azure") -replace "-Azure", "-Az"
+            $mapping[$name].Add($cmdletalias, $_)
         }
-        $psd1info.AliasesToExport | ForEach-Object {
-            if ($_ -like "*Azure*")
-            {
-                $cmdletalias = ($_ -replace "-AzureRM", "-Azure") -replace "-Azure", "-Az"
-                $mapping[$name].Add($cmdletalias, $_)
-            }
-            else
-            {
-                Write-Warning $_
-            }
+        else
+        {
+            Write-Warning $_
         }
-    #}
-    
+    }
 }
 
 $json = ConvertTo-Json $mapping