diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 23b5fc947601..dbb81921537e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,9 +1,9 @@
 <!--
 
 If this issue is a bug report:
-- Upgrade to the latest version of AzureRM and verify you are able to reproduce the issue
-    - You can install the latest version of AzureRM from the PowerShell Gallery
-        - https://www.powershellgallery.com/packages/AzureRM
+- Upgrade to the latest version of Az and verify you are able to reproduce the issue
+    - You can install the latest version of Az from the PowerShell Gallery
+        - https://www.powershellgallery.com/packages/Az
     - You can also install the latest version from the Releases section
         - https://github.com/Azure/azure-powershell/releases
 - Ensure that you repro the issue with $DebugPreference = "Continue" to receive the debug stream
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index daeb78431b20..0ecf70e6118a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,11 +6,11 @@
 
 ## Checklist
 
-- [ ] I have read the [_Submitting Changes_](https://github.com/Azure/azure-powershell/blob/preview/CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](https://github.com/Azure/azure-powershell/blob/preview/CONTRIBUTING.md)
+- [ ] I have read the [_Submitting Changes_](https://github.com/Azure/azure-powershell/blob/dev/CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](https://github.com/Azure/azure-powershell/blob/dev/CONTRIBUTING.md)
 - [ ] The title of the PR is clear and informative
-- [ ] The appropriate [change log has been updated](https://github.com/Azure/azure-powershell/blob/preview/CONTRIBUTING.md#updating-the-change-log)
-- [ ] The PR does not introduce [breaking changes](https://github.com/Azure/azure-powershell/blob/preview/documentation/breaking-changes/breaking-changes-definition.md)
+- [ ] The appropriate [change log has been updated](https://github.com/Azure/azure-powershell/blob/dev/CONTRIBUTING.md#updating-the-change-log)
+- [ ] The PR does not introduce [breaking changes](https://github.com/Azure/azure-powershell/blob/dev/documentation/breaking-changes/breaking-changes-definition.md)
 - [ ] If applicable, the changes made in the PR have proper test coverage
 - [ ] For public API changes to cmdlets:
     - [ ] the changes have gone through a [cmdlet design review](https://github.com/Azure/azure-powershell-cmdlet-review-pr) (Microsoft internal partners only)
-    - [ ] the cmdlet markdown files were [generated using the `platyPS` module](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/help-generation.md)
+    - [ ] the cmdlet markdown files were [generated using the `platyPS` module](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/help-generation.md)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fe838157652d..c408dfaaf0a6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -74,7 +74,7 @@ You can find all of the pull requests that have been opened in the [Pull Request
 To open your own pull request, click [here](https://github.com/Azure/azure-powershell/compare). When creating a pull request, keep the following in mind:
 - Make sure you are pointing to the fork and branch that your changes were made in
 - Choose the correct branch you want your pull request to be merged into
-    - The **preview** branch is for active development; changes in this branch will be in the next Azure PowerShell release
+    - The **dev** branch is for active development; changes in this branch will be in the next Azure PowerShell release
     - The **master** branch contains a snapshot of the source code at the time of the last release
     - The **release-X.X.X** branch is for active development during a release
 - The pull request template that is provided **should be filled out**; this is not something that should just be deleted or ignored when the pull request is created
@@ -113,8 +113,6 @@ For ARM service projects, the change log is located at `src\ResourceManager\{{se
 
 For RDFE service projects, the change log is located at `src\ServiceManagement\ChangeLog.md`.
 
-For the Storage data plane project, this change log is located at `src\Storage\ChangeLog.md`.
-
 #### Breaking Changes
 
 Breaking changes should **not** be introduced into the repository without giving customers at least six months notice. For a description of breaking changes in Azure PowerShell and how to declare them in the code using the [various breaking change attributes](documentation/breaking-changes/breaking-changes-attribute-help.md), see [here](documentation/breaking-changes/breaking-changes-definition.md).
@@ -130,7 +128,7 @@ The following guidelines must be followed in **EVERY** pull request that is open
 - A description of the changes the pull request makes is included, and a reference to the bug/issue the pull request fixes is included, if applicable
 - All files have the Microsoft copyright header
 - Cmdlets refer to the management libraries through NuGet references - no dlls are checked in
-- The pull request does not introduce [breaking changes](https://github.com/markcowl/azure-powershell/blob/doc1/documentation/changes.md#breaking-change-definition) (unless a major version change occurs in the assembly and module)
+- The pull request does not introduce [breaking changes](https://github.com/Azure/azure-powershell/blob/dev/documentation/breaking-changes/breaking-changes-definition.md) (unless a major version change occurs in the assembly and module)
 
 #### Testing guidelines
 
@@ -153,8 +151,8 @@ The following guidelines must be followed in pull requests that add, edit, or re
     - When a verb you would like to use is not in the list of approved verbs, or to get ideas on how to use verbs, consult the [Approved Verbs for Windows PowerShell Commands](https://msdn.microsoft.com/en-us/library/ms714428\(v=vs.85\).aspx) documentation where you will find descriptions of approved verbs as well as related verbs in the comments so that you can find one appropriate for your command
 - Cmdlet noun name uses the AzureRm prefix for management cmdlets, and the Azure prefix for data plane cmdlets
 - Cmdlet specifies the `OutputType` attribute; if the cmdlet produces no output, it should have an `OutputType` of `bool` and implement a `PassThrough` parameter
-- If the cmdlet makes changes or has side effects, it should implement `ShouldProcess` and have `SupportsShouldProcess = true` specified in the cmdlet attribute. See a discussion about correct `ShouldProcess` implementation [here](https://gist.github.com/markcowl/338e16fe5c8bbf195aff9f8af0db585d#what-is-the-change).
-- Cmdlets should derive from [`AzureRmCmdlet`](src/ResourceManager/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs) class for management cmdlets, and [`AzureDataCmdlet`](src/Common/Commands.Common/AzureDataCmdlet.cs) for data cmdlets
+- If the cmdlet makes changes or has side effects, it should implement `ShouldProcess` and have `SupportsShouldProcess = true` specified in the cmdlet attribute. See a discussion about correct `ShouldProcess` implementation [here](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/should-process-confirm-impact.md).
+- Cmdlets should derive from [`AzureRmCmdlet`](https://github.com/Azure/azure-powershell-common/blob/dev/src/ResourceManager/Version2016_09_01/AzureRMCmdlet.cs) class for management cmdlets, and [`AzureDataCmdlet`](https://github.com/Azure/azure-powershell-common/blob/dev/src/Common/AzureDataCmdlet.cs) for data cmdlets
 - If multiple parameter sets are implemented, the cmdlet should specify a `DefaultParameterSetName` in its cmdlet attribute
 
 #### Cmdlet parameter guidelines
@@ -182,3 +180,4 @@ The following guidelines must be followed in pull requests that make changes to
 - No parameter is of type `object`
 - Each management cmdlet should have a parameter set that takes `ResourceGroupName` and `Name` from the pipeline by property value
 - For a given resource type, it should be possible to pipe the output of `Get` and `New` cmdlets to the input of `Set`, `Update`, `Remove` and other action cmdlets for that resource
+- More information can be found [here](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/piping-in-powershell.md)
diff --git a/README.md b/README.md
index 075e6e3029e5..3183fbd97bac 100644
--- a/README.md
+++ b/README.md
@@ -15,10 +15,9 @@ Below is a table containing the various Azure PowerShell rollup modules found in
 
 | Description                                                     | Module Name       | PowerShell Gallery Link |
 | --------------------------------------------------------------- | ----------------- | ----------------------- |
-| Rollup Module for ARM Cmdlets                                   | `AzureRM`         | [![AzureRM](https://img.shields.io/powershellgallery/v/AzureRM.svg?style=flat-square&label=AzureRM)](https://www.powershellgallery.com/packages/AzureRM/) |
-| Rollup Module for .NET Standard cmdlets                         | `Az` | [![Az](https://img.shields.io/powershellgallery/v/Az.svg?style=flat-square&label=Az)](https://www.powershellgallery.com/packages/Az/) |
+| Rollup Module for Az cmdlets                                    | `Az` | [![Az](https://img.shields.io/powershellgallery/v/Az.svg?style=flat-square&label=Az)](https://www.powershellgallery.com/packages/Az/) |
 | Rollup Module for Administrative Modules in Azure Stack         | `AzureStack`      | [![AzureStack](https://img.shields.io/powershellgallery/v/AzureStack.svg?style=flat-square&label=AzureStack)](https://www.powershellgallery.com/packages/AzureStack/) |
-| Rollup Module for Service Management Cmdlets                  | `Azure`           | [![Azure](https://img.shields.io/powershellgallery/v/Azure.svg?style=flat-square&label=Azure)](https://www.powershellgallery.com/packages/Azure/) |
+| Rollup Module for Service Management Cmdlets                    | `Azure`           | [![Azure](https://img.shields.io/powershellgallery/v/Azure.svg?style=flat-square&label=Azure)](https://www.powershellgallery.com/packages/Azure/) |
 
 ## Installation
 
@@ -26,12 +25,6 @@ For more detailed instructions on installing Azure PowerShell, please refer to t
 
 ### PowerShell Gallery
 
-Run the following command in an elevated PowerShell session to install the rollup module for Azure Resource Manager cmdlets:
-
-```powershell
-Install-Module -Name AzureRM
-```
-
 Run the following command in an elevated PowerShell session to install the new 'Az' module for ResourceManager cmdlets. This module runs on PowerShell 5.1 (with .Net Framework 4.7.2) ,  or PowerShell Core, and replaces AzureRM.  You should not install this module side-by-side with AzureRM:
 
 ```powershell
@@ -47,9 +40,6 @@ Install-Module -Name Azure
 If you have an earlier version of the Azure PowerShell modules installed from the PowerShell Gallery and would like to update to the latest version, run the following commands in an elevated PowerShell session. Update-Module installs the new version side-by-side with the old version. It does not remove the old version.
 
 ```powershell
-# Update to the latest version of AzureRM
-Update-Module -Name AzureRM
-
 # Update to the latest version of Az
 Update-Module -Name Az
 
@@ -67,7 +57,7 @@ For more detailed instructions on using Azure PowerShell, please refer to the [g
 
 ### Log in to Azure
 
-To connect to Azure, use the [`Connect-AzAccount`](https://docs.microsoft.com/en-us/powershell/module/azurerm.profile/connect-Azaccount) cmdlet.
+To connect to Azure, use the [`Connect-AzAccount`](https://github.com/Azure/azure-powershell/blob/dev/src/ResourceManager/Profile/Commands.Profile/help/Connect-AzAccount.md) cmdlet.
 
 ```powershell
 # Interactive login - you will get a dialog box asking for your Azure credentials
@@ -86,7 +76,7 @@ Connect-AzAccount -Environment AzureChinaCloud
 
 ### Getting and setting your session context
 
-To view the context you are using in the current session, which contains the subscription and tenant, use the [`Get-AzContext`](https://docs.microsoft.com/en-us/powershell/module/azurerm.profile/get-Azcontext) cmdlet:
+To view the context you are using in the current session, which contains the subscription and tenant, use the [`Get-AzContext`](https://github.com/Azure/azure-powershell/blob/dev/src/ResourceManager/Profile/Commands.Profile/help/Get-AzContext.md) cmdlet:
 
 ```powershell
 # Get the context you are currently using
@@ -96,7 +86,7 @@ Get-AzContext
 Get-AzContext -ListAvailable
 ```
 
-To get the subscriptions in a tenant, use the [`Get-AzSubscription`](https://docs.microsoft.com/en-us/powershell/module/azurerm.profile/get-azurermsubscription) cmdlet:
+To get the subscriptions in a tenant, use the [`Get-AzSubscription`](https://github.com/Azure/azure-powershell/blob/dev/src/ResourceManager/Profile/Commands.Profile/help/Get-AzSubscription.md) cmdlet:
 
 ```powershell
 # Get all of the subscriptions in your current tenant
@@ -106,7 +96,7 @@ Get-AzSubscription
 Get-AzSubscription -TenantId $TenantId
 ```
 
-To change the subscription that you are using for your current context, use the [`Set-AzContext`]() cmdlet:
+To change the subscription that you are using for your current context, use the [`Set-AzContext`](https://github.com/Azure/azure-powershell/blob/dev/src/ResourceManager/Profile/Commands.Profile/help/Set-AzContext.md) cmdlet:
 
 ```powershell
 # Set the context to a specific subscription
@@ -122,13 +112,13 @@ Use the `Get-Command` cmdlet to discover cmdlets within a specific module, or cm
 
 ```powershell
 # View all cmdlets in the AzureRM.Profile module
-Get-Command -Module AzureRM.Profile
+Get-Command -Module Az.Profile
 
 # View all cmdlets that contain "VirtualNetwork"
 Get-Command -Name "*VirtualNetwork*"
 
 # View all cmdlets that contain "VM" in the AzureRM.Compute module
-Get-Command -Module AzureRM.Compute -Name "*VM*"
+Get-Command -Module Az.Compute -Name "*VM*"
 ```
 
 ### Cmdlet help and examples
@@ -165,7 +155,7 @@ If there is a feature you would like to see in Azure PowerShell, please use the
 
 If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](https://azure.github.io/guidelines/).
 
-More information about contributing to this repo can be found in [CONTRIBUTING md](https://github.com/Azure/azure-powershell/blob/preview/CONTRIBUTING.md) and the [Azure PowerShell Developer Guide](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/azure-powershell-developer-guide.md) folder.
+More information about contributing to this repo can be found in [CONTRIBUTING md](https://github.com/Azure/azure-powershell/blob/dev/CONTRIBUTING.md) and the [Azure PowerShell Developer Guide](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/azure-powershell-developer-guide.md) folder.
 
 ## Learn More
 
diff --git a/build.proj b/build.proj
index faf967b96b0c..87a427fb7c38 100644
--- a/build.proj
+++ b/build.proj
@@ -572,7 +572,7 @@
   </Target>
 
   <Target Name="StaticAnalysisErrorMessage">
-    <Error Text="StaticAnalysis has failed.  Please follow the instructions on this doc: https://github.com/Azure/azure-powershell/blob/preview/documentation/Debugging-StaticAnalysis-Errors.md"/>
+    <Error Text="StaticAnalysis has failed.  Please follow the instructions on this doc: https://github.com/Azure/azure-powershell/blob/dev/documentation/Debugging-StaticAnalysis-Errors.md"/>
   </Target>
 
   <Target Name="ChangeLogCheck">
diff --git a/documentation/Debugging-StaticAnalysis-Errors.md b/documentation/Debugging-StaticAnalysis-Errors.md
index b57290099dab..735a3c7b4b9c 100644
--- a/documentation/Debugging-StaticAnalysis-Errors.md
+++ b/documentation/Debugging-StaticAnalysis-Errors.md
@@ -36,19 +36,19 @@ _Note_: Sometimes the error listed in the .csv file can be a false positive (for
 
 - Download the `BreakingChangeIssues.csv` file from the Jenkins build
 - Open the file using a text editor (such as VS Code) and copy each of the errors you'd like to suppress
-- Paste each of these errors into the `BreakingChangeIssues.csv` file found in their respective [module folder](../tools/StaticAnalysis/Exceptions) (_e.g._, if a breaking change is being suppressed for Compute, then you would paste the corresponding line(s) in the `tools/StaticAnalysis/Exceptions/AzureRM.Compute/BreakingChangeIssues.csv` file) using the same text editor
+- Paste each of these errors into the `BreakingChangeIssues.csv` file found in their respective [module folder](../tools/StaticAnalysis/Exceptions) (_e.g._, if a breaking change is being suppressed for Compute, then you would paste the corresponding line(s) in the `tools/StaticAnalysis/Exceptions/Az.Compute/BreakingChangeIssues.csv` file) using the same text editor
 - Push the changes to the .csv file and ensure the errors no longer show up in the `BreakingChangeIssues.csv` file output from the Jenkins build.
 
 We take breaking changes very seriously, so please be mindful about the violations that you suppress in our repo.
 
 ### Signature Issues
-Signature issues occur when your cmdlets do not follow PowerShell standards.  Please check [this page](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/azure-powershell-design-guidelines.md) to ensure you are following PowerShell guidelines.  Issues with severity 0 or 1 must be addressed, while issues with severity 2 are advisory.  If you have an issue with severity 0 or 1 that has been approved by the Azure PowerShell team, you can suppress them following these steps:
+Signature issues occur when your cmdlets do not follow PowerShell standards.  Please check [this page](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/azure-powershell-design-guidelines.md) to ensure you are following PowerShell guidelines.  Issues with severity 0 or 1 must be addressed, while issues with severity 2 are advisory.  If you have an issue with severity 0 or 1 that has been approved by the Azure PowerShell team, you can suppress them following these steps:
 
 - Download the `SignatureIssues.csv` file from the Jenkins build
 - Open the file using a text editor (such as VS Code) and copy each of the errors you'd like to suppress
-- Paste each of these errors into the `SignatureIssues.csv` file found in their respective [module folder](../tools/StaticAnalysis/Exceptions) (_e.g.,_ if a signature issue is being suppressed for Sql, then you would paste the corresponding line(s) in the `tools/StaticAnalysis/Exceptions/AzureRM.Sql/SignatureIssues.csv` file) using the same text editor
+- Paste each of these errors into the `SignatureIssues.csv` file found in their respective [module folder](../tools/StaticAnalysis/Exceptions) (_e.g.,_ if a signature issue is being suppressed for Sql, then you would paste the corresponding line(s) in the `tools/StaticAnalysis/Exceptions/Az.Sql/SignatureIssues.csv` file) using the same text editor
 - Copy each of the errors you would like to suppress directly from the SignatureIssues.csv file output in the Jenkins build
 - Push the changes to the .csv file and ensure the errors no longer show up in the `SignatureIssues.csv` file output from the Jenkins build.
 
 ### Help Issues
-Most help issues that cause StaticAnalysis to fail occur when help has not been added for a particular cmdlet.  If you have not generated help for your new cmdlets, please follow the instructions [here](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/help-generation.md). If this is not the issue, follow the steps listed under "Remediation" for each violation listed in HelpIssues.csv.
+Most help issues that cause StaticAnalysis to fail occur when help has not been added for a particular cmdlet.  If you have not generated help for your new cmdlets, please follow the instructions [here](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/help-generation.md). If this is not the issue, follow the steps listed under "Remediation" for each violation listed in HelpIssues.csv.
diff --git a/documentation/azure-powershell-modules.md b/documentation/azure-powershell-modules.md
index dda37da84d04..ddab5964d5db 100644
--- a/documentation/azure-powershell-modules.md
+++ b/documentation/azure-powershell-modules.md
@@ -4,94 +4,66 @@
 
 | Description                                                      | Module Name       | PowerShell Gallery Link |
 | ---------------------------------------------------------------- | ----------------- | ----------------------- |
-| Rollup Module for ARM Cmdlets                                    | `AzureRM`         | [![AzureRM](https://img.shields.io/powershellgallery/v/AzureRM.svg?style=flat-square&label=AzureRM)](https://www.powershellgallery.com/packages/AzureRM/) |
-| Rollup Module for .NET Core Cmdlets                              | `AzureRM.Netcore` | [![AzureRM.Netcore](https://img.shields.io/powershellgallery/v/AzureRM.Netcore.svg?style=flat-square&label=AzureRM.Netcore)](https://www.powershellgallery.com/packages/AzureRM.Netcore/) |
+| Rollup Module for ARM Cmdlets                                    | `Az`              | [![Az](https://img.shields.io/powershellgallery/v/Az.svg?style=flat-square&label=Az)](https://www.powershellgallery.com/packages/Az/) |
 | Rollup Module for Administrative Modules in Azure Stack          | `AzureStack`      | [![AzureStack](https://img.shields.io/powershellgallery/v/AzureStack.svg?style=flat-square&label=AzureStack)](https://www.powershellgallery.com/packages/AzureStack/) |
 | Rolledup Module for Service Management Cmdlets                   | `Azure`           | [![Azure](https://img.shields.io/powershellgallery/v/Azure.svg?style=flat-square&label=Azure)](https://www.powershellgallery.com/packages/Azure/) |
 
 ## Modules for ARM Cmdlets
 
-Below is a table of modules containing ARM cmdlets found in the [`AzureRM`](https://www.powershellgallery.com/packages/AzureRM/) rollup module.
+Below is a table of modules containing ARM cmdlets found in the [`Az`](https://www.powershellgallery.com/packages/Az/) rollup module.
 
 | Azure Service                         | Module Name                             | PowerShell Gallery Link |
 | ------------------------------------- | --------------------------------------- | ----------------------- |
-| Analysis Services                     | `AzureRM.AnalysisServices`              | [![Analysis Services](https://img.shields.io/powershellgallery/v/AzureRM.AnalysisServices.svg?style=flat-square&label=AzureRM.AnalysisServices)](https://www.powershellgallery.com/packages/AzureRM.AnalysisServices/) |
-| API Management                        | `AzureRM.ApiManagement`                 | [![API Management](https://img.shields.io/powershellgallery/v/AzureRM.ApiManagement.svg?style=flat-square&label=AzureRM.ApiManagement)](https://www.powershellgallery.com/packages/AzureRM.ApiManagement/) |
-| Application Insights                  | `AzureRM.ApplicationInsights`           | [![Application Insights](https://img.shields.io/powershellgallery/v/AzureRM.ApplicationInsights.svg?style=flat-square&label=AzureRM.ApplicationInsights)](https://www.powershellgallery.com/packages/AzureRM.ApplicationInsights/) |
-| Automation                            | `AzureRM.Automation`                    | [![Automation](https://img.shields.io/powershellgallery/v/AzureRM.Automation.svg?style=flat-square&label=AzureRM.Automation)](https://www.powershellgallery.com/packages/AzureRM.Automation/) |
-| Backup                                | `AzureRM.Backup`                        | [![Backup](https://img.shields.io/powershellgallery/v/AzureRM.Backup.svg?style=flat-square&label=AzureRM.Backup)](https://www.powershellgallery.com/packages/AzureRM.Backup/) 
-| Batch                                 | `AzureRM.Batch`                         | [![Batch](https://img.shields.io/powershellgallery/v/AzureRM.Batch.svg?style=flat-square&label=AzureRM.Batch)](https://www.powershellgallery.com/packages/AzureRM.Batch/) |
-| Billing                               | `AzureRM.Billing`                       | [![Billing](https://img.shields.io/powershellgallery/v/AzureRM.Billing.svg?style=flat-square&label=AzureRM.Billing)](https://www.powershellgallery.com/packages/AzureRM.Billing/) |
-| CDN                                   | `AzureRM.Cdn`                           | [![Cdn](https://img.shields.io/powershellgallery/v/AzureRM.Cdn.svg?style=flat-square&label=AzureRM.Cdn)](https://www.powershellgallery.com/packages/AzureRM.Cdn/) |
-| Cognitive Services                    | `AzureRM.CognitiveServices`             | [![Cognitive Services](https://img.shields.io/powershellgallery/v/AzureRM.CognitiveServices.svg?style=flat-square&label=AzureRM.CognitiveServices)](https://www.powershellgallery.com/packages/AzureRM.CognitiveServices/) |
-| Compute                               | `AzureRM.Compute`                       | [![Compute](https://img.shields.io/powershellgallery/v/AzureRM.Compute.svg?style=flat-square&label=AzureRM.Compute)](https://www.powershellgallery.com/packages/AzureRM.Compute/) |
-| Consumption                           | `AzureRM.Consumption`                   | [![Consumption](https://img.shields.io/powershellgallery/v/AzureRM.Consumption.svg?style=flat-square&label=AzureRM.Consumption)](https://www.powershellgallery.com/packages/AzureRM.Consumption/) |
-| Container Instance                    | `AzureRM.ContainerInstance`             | [![Container Instance](https://img.shields.io/powershellgallery/v/AzureRM.ContainerInstance.svg?style=flat-square&label=AzureRM.ContainerInstance)](https://www.powershellgallery.com/packages/AzureRM.ContainerInstance/) |
-| Container Registry                    | `AzureRM.ContainerRegistry`             | [![Container Registry](https://img.shields.io/powershellgallery/v/AzureRM.ContainerRegistry.svg?style=flat-square&label=AzureRM.ContainerRegistry)](https://www.powershellgallery.com/packages/AzureRM.ContainerRegistry/) |
-| Data Factories                        | `AzureRM.DataFactories`                 | [![Data Factories](https://img.shields.io/powershellgallery/v/AzureRM.DataFactories.svg?style=flat-square&label=AzureRM.DataFactories)](https://www.powershellgallery.com/packages/AzureRM.DataFactories/) |
-| Data Factory V2                       | `AzureRM.DataFactoryV2`                 | [![Data Factory V2](https://img.shields.io/powershellgallery/v/AzureRM.DataFactoryV2.svg?style=flat-square&label=AzureRM.DataFactoryV2)](https://www.powershellgallery.com/packages/AzureRM.DataFactoryV2/) |
-| Data Lake Analytics                   | `AzureRM.DataLakeAnalytics`             | [![Data Lake Analytics](https://img.shields.io/powershellgallery/v/AzureRM.DataLakeAnalytics.svg?style=flat-square&label=AzureRM.DataLakeAnalytics)](https://www.powershellgallery.com/packages/AzureRM.DataLakeAnalytics/) |
-| Data Lake Store                       | `AzureRM.DataLakeStore`                 | [![Data Lake Store](https://img.shields.io/powershellgallery/v/AzureRM.DataLakeStore.svg?style=flat-square&label=AzureRM.DataLakeStore)](https://www.powershellgallery.com/packages/AzureRM.DataLakeStore/) |
-| Data Migration                        | `AzureRM.DataMigration`                 | [![Data Migration](https://img.shields.io/powershellgallery/v/AzureRM.DataMigration.svg?style=flat-square&label=AzureRM.DataMigration)](https://www.powershellgallery.com/packages/AzureRM.DataMigration/) |
-| DevTest Labs                          | `AzureRM.DevTestLabs`                   | [![DevTest Labs](https://img.shields.io/powershellgallery/v/AzureRM.DevTestLabs.svg?style=flat-square&label=AzureRM.DevTestLabs)](https://www.powershellgallery.com/packages/AzureRM.DevTestLabs/) |
-| DNS                                   | `AzureRM.Dns`                           | [![DNS](https://img.shields.io/powershellgallery/v/AzureRM.Dns.svg?style=flat-square&label=AzureRM.Dns)](https://www.powershellgallery.com/packages/AzureRM.Dns/) |
-| Event Grid                            | `AzureRM.EventGrid`                     | [![Event Grid](https://img.shields.io/powershellgallery/v/AzureRM.EventGrid.svg?style=flat-square&label=AzureRM.EventGrid)](https://www.powershellgallery.com/packages/AzureRM.EventGrid/) |
-| Event Hubs                            | `AzureRM.EventHub`                      | [![Event Hubs](https://img.shields.io/powershellgallery/v/AzureRM.EventHub.svg?style=flat-square&label=AzureRM.EventHub)](https://www.powershellgallery.com/packages/AzureRM.EventHub/) 
-| HD Insight                            | `AzureRM.HDInsight`                     | [![HD Insight](https://img.shields.io/powershellgallery/v/AzureRM.HDInsight.svg?style=flat-square&label=AzureRM.HDInsight)](https://www.powershellgallery.com/packages/AzureRM.HDInsight/) |
-| Insights                              | `AzureRM.Insights`                      | [![Insights](https://img.shields.io/powershellgallery/v/AzureRM.Insights.svg?style=flat-square&label=AzureRM.Insights)](https://www.powershellgallery.com/packages/AzureRM.Insights/) |
-| IoT Hub                               | `AzureRM.IotHub`                        | [![IoT Hub](https://img.shields.io/powershellgallery/v/AzureRM.IotHub.svg?style=flat-square&label=AzureRM.IotHub)](https://www.powershellgallery.com/packages/AzureRM.IotHub/) |
-| Key Vault                             | `AzureRM.KeyVault`                      | [![Key Vault](https://img.shields.io/powershellgallery/v/AzureRM.KeyVault.svg?style=flat-square&label=AzureRM.KeyVault)](https://www.powershellgallery.com/packages/AzureRM.KeyVault/) |
-| Logic App                             | `AzureRM.LogicApp`                      | [![Logic App](https://img.shields.io/powershellgallery/v/AzureRM.LogicApp.svg?style=flat-square&label=AzureRM.LogicApp)](https://www.powershellgallery.com/packages/AzureRM.LogicApp/) |
-| Machine Learning                      | `AzureRM.MachineLearning`               | [![Machine Learning](https://img.shields.io/powershellgallery/v/AzureRM.MachineLearning.svg?style=flat-square&label=AzureRM.MachineLearning)](https://www.powershellgallery.com/packages/AzureRM.MachineLearning/) |
-| Machine Learning Compute              | `AzureRM.MachineLearningCompute`        | [![Machine Learning Compute](https://img.shields.io/powershellgallery/v/AzureRM.MachineLearningCompute.svg?style=flat-square&label=AzureRM.MachineLearningCompute)](https://www.powershellgallery.com/packages/AzureRM.MachineLearningCompute/) |
-| Marketplace Ordering                  | `AzureRM.MarketplaceOrdering`           | [![Marketplace Ordering](https://img.shields.io/powershellgallery/v/AzureRM.MarketplaceOrdering.svg?style=flat-square&label=AzureRM.MarketplaceOrdering)](https://www.powershellgallery.com/packages/AzureRM.MarketplaceOrdering/) |
-| Media                                 | `AzureRM.Media`                         | [![Media](https://img.shields.io/powershellgallery/v/AzureRM.Media.svg?style=flat-square&label=AzureRM.Media)](https://www.powershellgallery.com/packages/AzureRM.Media/) |
-| Network                               | `AzureRM.Network`                       | [![Network](https://img.shields.io/powershellgallery/v/AzureRM.Network.svg?style=flat-square&label=AzureRM.Network)](https://www.powershellgallery.com/packages/AzureRM.Network/) |
-| Notification Hubs                     | `AzureRM.NotificationHubs`              | [![Notification Hubs](https://img.shields.io/powershellgallery/v/AzureRM.NotificationHubs.svg?style=flat-square&label=AzureRM.NotificationHubs)](https://www.powershellgallery.com/packages/AzureRM.NotificationHubs/) |
-| Operational Insights                  | `AzureRM.OperationalInsights`           | [![Operational Insights](https://img.shields.io/powershellgallery/v/AzureRM.OperationalInsights.svg?style=flat-square&label=AzureRM.OperationalInsights)](https://www.powershellgallery.com/packages/AzureRM.OperationalInsights/) |
-| Policy Insights                       | `AzureRM.PolicyInsights`                | [![Policy Insights](https://img.shields.io/powershellgallery/v/AzureRM.PolicyInsights.svg?style=flat-square&label=AzureRM.PolicyInsights)](https://www.powershellgallery.com/packages/AzureRM.PolicyInsights/) |
-| Power BI Embedded                     | `AzureRM.PowerBIEmbedded`               | [![Power BI Embedded](https://img.shields.io/powershellgallery/v/AzureRM.PowerBIEmbedded.svg?style=flat-square&label=AzureRM.PowerBIEmbedded)](https://www.powershellgallery.com/packages/AzureRM.PowerBIEmbedded/) |
-| Profile                               | `AzureRM.Profile`                       | [![Profile](https://img.shields.io/powershellgallery/v/AzureRM.Profile.svg?style=flat-square&label=AzureRM.Profile)](https://www.powershellgallery.com/packages/AzureRM.Profile/) |
-| Recovery Services                     | `AzureRM.RecoveryServices`              | [![Recovery Services](https://img.shields.io/powershellgallery/v/AzureRM.RecoveryServices.svg?style=flat-square&label=AzureRM.RecoveryServices)](https://www.powershellgallery.com/packages/AzureRM.RecoveryServices/) |
-| Recovery Services - Backup            | `AzureRM.RecoveryServices.Backup`       | [![Recovery Services - Backup](https://img.shields.io/powershellgallery/v/AzureRM.RecoveryServices.Backup.svg?style=flat-square&label=AzureRM.RecoveryServices.Backup)](https://www.powershellgallery.com/packages/AzureRM.RecoveryServices.Backup/) |
-| Recovery Services - Site Recovery     | `AzureRM.RecoveryServices.SiteRecovery` | [![Recovery Services - Site Recovery](https://img.shields.io/powershellgallery/v/AzureRM.RecoveryServices.SiteRecovery.svg?style=flat-square&label=AzureRM.RecoveryServices.SiteRecovery)](https://www.powershellgallery.com/packages/AzureRM.RecoveryServices.SiteRecovery/) |
-| Redis Cache                           | `AzureRM.RedisCache`                    | [![Redis Cache](https://img.shields.io/powershellgallery/v/AzureRM.RedisCache.svg?style=flat-square&label=AzureRM.RedisCache)](https://www.powershellgallery.com/packages/AzureRM.RedisCache/) |
-| Relay                                 | `AzureRM.Relay`                         | [![Relay](https://img.shields.io/powershellgallery/v/AzureRM.Relay.svg?style=flat-square&label=AzureRM.Relay)](https://www.powershellgallery.com/packages/AzureRM.Relay/) |
-| Reservations                          | `AzureRM.Reservations`                  | [![Reservations](https://img.shields.io/powershellgallery/v/AzureRM.Reservations.svg?style=flat-square&label=AzureRM.Reservations)](https://www.powershellgallery.com/packages/AzureRM.Reservations/) |
-| Resources                             | `AzureRM.Resources`                     | [![Resources](https://img.shields.io/powershellgallery/v/AzureRM.Resources.svg?style=flat-square&label=AzureRM.Resources)](https://www.powershellgallery.com/packages/AzureRM.Resources/) |
-| Scheduler                             | `AzureRM.Scheduler`                     | [![Scheduler](https://img.shields.io/powershellgallery/v/AzureRM.Scheduler.svg?style=flat-square&label=AzureRM.Scheduler)](https://www.powershellgallery.com/packages/AzureRM.Scheduler/) |
-| Service Bus                           | `AzureRM.ServiceBus`                    | [![Service Bus](https://img.shields.io/powershellgallery/v/AzureRM.ServiceBus.svg?style=flat-square&label=AzureRM.ServiceBus)](https://www.powershellgallery.com/packages/AzureRM.ServiceBus/) |
-| Service Fabric                        | `AzureRM.ServiceFabric`                 | [![Service Fabric](https://img.shields.io/powershellgallery/v/AzureRM.ServiceFabric.svg?style=flat-square&label=AzureRM.ServiceFabric)](https://www.powershellgallery.com/packages/AzureRM.ServiceFabric/) |
-| Sql                                   | `AzureRM.Sql`                           | [![Sql](https://img.shields.io/powershellgallery/v/AzureRM.Sql.svg?style=flat-square&label=AzureRM.Sql)](https://www.powershellgallery.com/packages/AzureRM.Sql/) |
-| Storage                               | `AzureRM.Storage`                       | [![Storage](https://img.shields.io/powershellgallery/v/AzureRM.Storage.svg?style=flat-square&label=AzureRM.Storage)](https://www.powershellgallery.com/packages/AzureRM.Storage/) |
-| Stream Analytics                      | `AzureRM.StreamAnalytics`               | [![Stream Analytics](https://img.shields.io/powershellgallery/v/AzureRM.StreamAnalytics.svg?style=flat-square&label=AzureRM.StreamAnalytics)](https://www.powershellgallery.com/packages/AzureRM.StreamAnalytics/) |
-| Tags                                  | `AzureRM.Tags`                          | [![Tags](https://img.shields.io/powershellgallery/v/AzureRM.Tags.svg?style=flat-square&label=AzureRM.Tags)](https://www.powershellgallery.com/packages/AzureRM.Tags/) |
-| Traffic Manager                       | `AzureRM.TrafficManager`                | [![Traffic Manager](https://img.shields.io/powershellgallery/v/AzureRM.TrafficManager.svg?style=flat-square&label=AzureRM.TrafficManager)](https://www.powershellgallery.com/packages/AzureRM.TrafficManager/) |
-| Usage Aggregates                      | `AzureRM.UsageAggregates`               | [![Usage Aggregates](https://img.shields.io/powershellgallery/v/AzureRM.UsageAggregates.svg?style=flat-square&label=AzureRM.UsageAggregates)](https://www.powershellgallery.com/packages/AzureRM.UsageAggregates/) |
-| Websites                              | `AzureRM.Websites`                      | [![Websites](https://img.shields.io/powershellgallery/v/AzureRM.Websites.svg?style=flat-square&label=AzureRM.Websites)](https://www.powershellgallery.com/packages/AzureRM.Websites/) |
-
-## Modules for Data Plane Cmdlets
-
-Below is a table of modules containing data plane cmdlets found in the [`AzureRM`](https://www.powershellgallery.com/packages/AzureRM/) rollup module.
-
-| Azure Service     | Module Name                       | PowerShell Gallery Link |
-| ----------------- | --------------------------------- | ----------------------- |
-| Analysis Services | `Azure.AnalysisServices`          | [![Analysis Services (Data Plane)](https://img.shields.io/powershellgallery/v/Azure.AnalysisServices.svg?style=flat-square&label=Azure.AnalysisServices)](https://www.powershellgallery.com/packages/Azure.AnalysisServices/) |
-| Storage           | `Azure.Storage`                   | [![Storage](https://img.shields.io/powershellgallery/v/Azure.Storage.svg?style=flat-square&label=Azure.Storage)](https://www.powershellgallery.com/packages/Azure.Storage/) |
-
-## Modules for .NET Core Cmdlets
-
-Below is a table of modules containing .NET Core compatible cmdlets found in the [`AzureRM.Netcore`](https://www.powershellgallery.com/packages/AzureRM.Netcore/) rollup module.
-
-| Azure Service | Module Name                 | PowerShell Gallery Link |
-| ------------- | --------------------------- | ----------------------- |
-| Compute       | `AzureRM.Compute.Netcore`   | [![Compute.Netcore](https://img.shields.io/powershellgallery/v/AzureRM.Compute.Netcore.svg?style=flat-square&label=AzureRM.Compute.Netcore)](https://www.powershellgallery.com/packages/AzureRM.Compute.Netcore/) |
-| Network       | `AzureRM.Network.Netcore`   | [![Network.Netcore](https://img.shields.io/powershellgallery/v/AzureRM.Network.Netcore.svg?style=flat-square&label=AzureRM.Network.Netcore)](https://www.powershellgallery.com/packages/AzureRM.Network.Netcore/) |
-| Profile       | `AzureRM.Profile.Netcore`   | [![Profile.Netcore](https://img.shields.io/powershellgallery/v/AzureRM.Profile.Netcore.svg?style=flat-square&label=AzureRM.Profile.Netcore)](https://www.powershellgallery.com/packages/AzureRM.Profile.Netcore/) |
-| Resources     | `AzureRM.Resources.Netcore` | [![Resources.Netcore](https://img.shields.io/powershellgallery/v/AzureRM.Resources.Netcore.svg?style=flat-square&label=AzureRM.Resources.Netcore)](https://www.powershellgallery.com/packages/AzureRM.Resources.Netcore/) |
-| Storage       | `AzureRM.Storage.Netcore`   | [![Storage.Netcore](https://img.shields.io/powershellgallery/v/AzureRM.Storage.Netcore.svg?style=flat-square&label=AzureRM.Storage.Netcore)](https://www.powershellgallery.com/packages/AzureRM.Storage.Netcore/) |
-| Tags          | `AzureRM.Tags.Netcore`      | [![Tags.Netcore](https://img.shields.io/powershellgallery/v/AzureRM.Tags.Netcore.svg?style=flat-square&label=AzureRM.Tags.Netcore)](https://www.powershellgallery.com/packages/AzureRM.Tags.Netcore/) |
-| Websites      | `AzureRM.Websites.Netcore`  | [![Websites.Netcore](https://img.shields.io/powershellgallery/v/AzureRM.Websites.Netcore.svg?style=flat-square&label=AzureRM.Websites.Netcore)](https://www.powershellgallery.com/packages/AzureRM.Websites.Netcore/) |
+| Analysis Services                     | `Az.AnalysisServices`              | [![Analysis Services](https://img.shields.io/powershellgallery/v/Az.AnalysisServices.svg?style=flat-square&label=Az.AnalysisServices)](https://www.powershellgallery.com/packages/Az.AnalysisServices/) |
+| API Management                        | `Az.ApiManagement`                 | [![API Management](https://img.shields.io/powershellgallery/v/Az.ApiManagement.svg?style=flat-square&label=Az.ApiManagement)](https://www.powershellgallery.com/packages/Az.ApiManagement/) |
+| Application Insights                  | `Az.ApplicationInsights`           | [![Application Insights](https://img.shields.io/powershellgallery/v/Az.ApplicationInsights.svg?style=flat-square&label=Az.ApplicationInsights)](https://www.powershellgallery.com/packages/Az.ApplicationInsights/) |
+| Automation                            | `Az.Automation`                    | [![Automation](https://img.shields.io/powershellgallery/v/Az.Automation.svg?style=flat-square&label=Az.Automation)](https://www.powershellgallery.com/packages/Az.Automation/) |
+| Batch                                 | `Az.Batch`                         | [![Batch](https://img.shields.io/powershellgallery/v/Az.Batch.svg?style=flat-square&label=Az.Batch)](https://www.powershellgallery.com/packages/Az.Batch/) |
+| Billing                               | `Az.Billing`                       | [![Billing](https://img.shields.io/powershellgallery/v/Az.Billing.svg?style=flat-square&label=Az.Billing)](https://www.powershellgallery.com/packages/Az.Billing/) |
+| CDN                                   | `Az.Cdn`                           | [![Cdn](https://img.shields.io/powershellgallery/v/Az.Cdn.svg?style=flat-square&label=Az.Cdn)](https://www.powershellgallery.com/packages/Az.Cdn/) |
+| Cognitive Services                    | `Az.CognitiveServices`             | [![Cognitive Services](https://img.shields.io/powershellgallery/v/Az.CognitiveServices.svg?style=flat-square&label=Az.CognitiveServices)](https://www.powershellgallery.com/packages/Az.CognitiveServices/) |
+| Compute                               | `Az.Compute`                       | [![Compute](https://img.shields.io/powershellgallery/v/Az.Compute.svg?style=flat-square&label=Az.Compute)](https://www.powershellgallery.com/packages/Az.Compute/) |
+| Consumption                           | `Az.Consumption`                   | [![Consumption](https://img.shields.io/powershellgallery/v/Az.Consumption.svg?style=flat-square&label=Az.Consumption)](https://www.powershellgallery.com/packages/Az.Consumption/) |
+| Container Instance                    | `Az.ContainerInstance`             | [![Container Instance](https://img.shields.io/powershellgallery/v/Az.ContainerInstance.svg?style=flat-square&label=Az.ContainerInstance)](https://www.powershellgallery.com/packages/Az.ContainerInstance/) |
+| Container Registry                    | `Az.ContainerRegistry`             | [![Container Registry](https://img.shields.io/powershellgallery/v/Az.ContainerRegistry.svg?style=flat-square&label=Az.ContainerRegistry)](https://www.powershellgallery.com/packages/Az.ContainerRegistry/) |
+| Data Factories                        | `Az.DataFactories`                 | [![Data Factories](https://img.shields.io/powershellgallery/v/Az.DataFactories.svg?style=flat-square&label=Az.DataFactories)](https://www.powershellgallery.com/packages/Az.DataFactories/) |
+| Data Factory V2                       | `Az.DataFactoryV2`                 | [![Data Factory V2](https://img.shields.io/powershellgallery/v/Az.DataFactoryV2.svg?style=flat-square&label=Az.DataFactoryV2)](https://www.powershellgallery.com/packages/Az.DataFactoryV2/) |
+| Data Lake Analytics                   | `Az.DataLakeAnalytics`             | [![Data Lake Analytics](https://img.shields.io/powershellgallery/v/Az.DataLakeAnalytics.svg?style=flat-square&label=Az.DataLakeAnalytics)](https://www.powershellgallery.com/packages/Az.DataLakeAnalytics/) |
+| Data Lake Store                       | `Az.DataLakeStore`                 | [![Data Lake Store](https://img.shields.io/powershellgallery/v/Az.DataLakeStore.svg?style=flat-square&label=Az.DataLakeStore)](https://www.powershellgallery.com/packages/Az.DataLakeStore/) |
+| Data Migration                        | `Az.DataMigration`                 | [![Data Migration](https://img.shields.io/powershellgallery/v/Az.DataMigration.svg?style=flat-square&label=Az.DataMigration)](https://www.powershellgallery.com/packages/Az.DataMigration/) |
+| DevTest Labs                          | `Az.DevTestLabs`                   | [![DevTest Labs](https://img.shields.io/powershellgallery/v/Az.DevTestLabs.svg?style=flat-square&label=Az.DevTestLabs)](https://www.powershellgallery.com/packages/Az.DevTestLabs/) |
+| DNS                                   | `Az.Dns`                           | [![DNS](https://img.shields.io/powershellgallery/v/Az.Dns.svg?style=flat-square&label=Az.Dns)](https://www.powershellgallery.com/packages/Az.Dns/) |
+| Event Grid                            | `Az.EventGrid`                     | [![Event Grid](https://img.shields.io/powershellgallery/v/Az.EventGrid.svg?style=flat-square&label=Az.EventGrid)](https://www.powershellgallery.com/packages/Az.EventGrid/) |
+| Event Hubs                            | `Az.EventHub`                      | [![Event Hubs](https://img.shields.io/powershellgallery/v/Az.EventHub.svg?style=flat-square&label=Az.EventHub)](https://www.powershellgallery.com/packages/Az.EventHub/) 
+| HD Insight                            | `Az.HDInsight`                     | [![HD Insight](https://img.shields.io/powershellgallery/v/Az.HDInsight.svg?style=flat-square&label=Az.HDInsight)](https://www.powershellgallery.com/packages/Az.HDInsight/) |
+| Insights                              | `Az.Insights`                      | [![Insights](https://img.shields.io/powershellgallery/v/Az.Insights.svg?style=flat-square&label=Az.Insights)](https://www.powershellgallery.com/packages/Az.Insights/) |
+| IoT Hub                               | `Az.IotHub`                        | [![IoT Hub](https://img.shields.io/powershellgallery/v/Az.IotHub.svg?style=flat-square&label=Az.IotHub)](https://www.powershellgallery.com/packages/Az.IotHub/) |
+| Key Vault                             | `Az.KeyVault`                      | [![Key Vault](https://img.shields.io/powershellgallery/v/Az.KeyVault.svg?style=flat-square&label=Az.KeyVault)](https://www.powershellgallery.com/packages/Az.KeyVault/) |
+| Logic App                             | `Az.LogicApp`                      | [![Logic App](https://img.shields.io/powershellgallery/v/Az.LogicApp.svg?style=flat-square&label=Az.LogicApp)](https://www.powershellgallery.com/packages/Az.LogicApp/) |
+| Machine Learning                      | `Az.MachineLearning`               | [![Machine Learning](https://img.shields.io/powershellgallery/v/Az.MachineLearning.svg?style=flat-square&label=Az.MachineLearning)](https://www.powershellgallery.com/packages/Az.MachineLearning/) |
+| Machine Learning Compute              | `Az.MachineLearningCompute`        | [![Machine Learning Compute](https://img.shields.io/powershellgallery/v/Az.MachineLearningCompute.svg?style=flat-square&label=Az.MachineLearningCompute)](https://www.powershellgallery.com/packages/Az.MachineLearningCompute/) |
+| Marketplace Ordering                  | `Az.MarketplaceOrdering`           | [![Marketplace Ordering](https://img.shields.io/powershellgallery/v/Az.MarketplaceOrdering.svg?style=flat-square&label=Az.MarketplaceOrdering)](https://www.powershellgallery.com/packages/Az.MarketplaceOrdering/) |
+| Media                                 | `Az.Media`                         | [![Media](https://img.shields.io/powershellgallery/v/Az.Media.svg?style=flat-square&label=Az.Media)](https://www.powershellgallery.com/packages/Az.Media/) |
+| Network                               | `Az.Network`                       | [![Network](https://img.shields.io/powershellgallery/v/Az.Network.svg?style=flat-square&label=Az.Network)](https://www.powershellgallery.com/packages/Az.Network/) |
+| Notification Hubs                     | `Az.NotificationHubs`              | [![Notification Hubs](https://img.shields.io/powershellgallery/v/Az.NotificationHubs.svg?style=flat-square&label=Az.NotificationHubs)](https://www.powershellgallery.com/packages/Az.NotificationHubs/) |
+| Operational Insights                  | `Az.OperationalInsights`           | [![Operational Insights](https://img.shields.io/powershellgallery/v/Az.OperationalInsights.svg?style=flat-square&label=Az.OperationalInsights)](https://www.powershellgallery.com/packages/Az.OperationalInsights/) |
+| Policy Insights                       | `Az.PolicyInsights`                | [![Policy Insights](https://img.shields.io/powershellgallery/v/Az.PolicyInsights.svg?style=flat-square&label=Az.PolicyInsights)](https://www.powershellgallery.com/packages/Az.PolicyInsights/) |
+| Power BI Embedded                     | `Az.PowerBIEmbedded`               | [![Power BI Embedded](https://img.shields.io/powershellgallery/v/Az.PowerBIEmbedded.svg?style=flat-square&label=Az.PowerBIEmbedded)](https://www.powershellgallery.com/packages/Az.PowerBIEmbedded/) |
+| Profile                               | `Az.Profile`                       | [![Profile](https://img.shields.io/powershellgallery/v/Az.Profile.svg?style=flat-square&label=Az.Profile)](https://www.powershellgallery.com/packages/Az.Profile/) |
+| Recovery Services                     | `Az.RecoveryServices`              | [![Recovery Services](https://img.shields.io/powershellgallery/v/Az.RecoveryServices.svg?style=flat-square&label=Az.RecoveryServices)](https://www.powershellgallery.com/packages/Az.RecoveryServices/) |
+| Redis Cache                           | `Az.RedisCache`                    | [![Redis Cache](https://img.shields.io/powershellgallery/v/Az.RedisCache.svg?style=flat-square&label=Az.RedisCache)](https://www.powershellgallery.com/packages/Az.RedisCache/) |
+| Relay                                 | `Az.Relay`                         | [![Relay](https://img.shields.io/powershellgallery/v/Az.Relay.svg?style=flat-square&label=Az.Relay)](https://www.powershellgallery.com/packages/Az.Relay/) |
+| Reservations                          | `Az.Reservations`                  | [![Reservations](https://img.shields.io/powershellgallery/v/Az.Reservations.svg?style=flat-square&label=Az.Reservations)](https://www.powershellgallery.com/packages/Az.Reservations/) |
+| Resources                             | `Az.Resources`                     | [![Resources](https://img.shields.io/powershellgallery/v/Az.Resources.svg?style=flat-square&label=Az.Resources)](https://www.powershellgallery.com/packages/Az.Resources/) |
+| Service Bus                           | `Az.ServiceBus`                    | [![Service Bus](https://img.shields.io/powershellgallery/v/Az.ServiceBus.svg?style=flat-square&label=Az.ServiceBus)](https://www.powershellgallery.com/packages/Az.ServiceBus/) |
+| Service Fabric                        | `Az.ServiceFabric`                 | [![Service Fabric](https://img.shields.io/powershellgallery/v/Az.ServiceFabric.svg?style=flat-square&label=Az.ServiceFabric)](https://www.powershellgallery.com/packages/Az.ServiceFabric/) |
+| Sql                                   | `Az.Sql`                           | [![Sql](https://img.shields.io/powershellgallery/v/Az.Sql.svg?style=flat-square&label=Az.Sql)](https://www.powershellgallery.com/packages/Az.Sql/) |
+| Storage                               | `Az.Storage`                       | [![Storage](https://img.shields.io/powershellgallery/v/Az.Storage.svg?style=flat-square&label=Az.Storage)](https://www.powershellgallery.com/packages/Az.Storage/) |
+| Stream Analytics                      | `Az.StreamAnalytics`               | [![Stream Analytics](https://img.shields.io/powershellgallery/v/Az.StreamAnalytics.svg?style=flat-square&label=Az.StreamAnalytics)](https://www.powershellgallery.com/packages/Az.StreamAnalytics/) |
+| Tags                                  | `Az.Tags`                          | [![Tags](https://img.shields.io/powershellgallery/v/Az.Tags.svg?style=flat-square&label=Az.Tags)](https://www.powershellgallery.com/packages/Az.Tags/) |
+| Traffic Manager                       | `Az.TrafficManager`                | [![Traffic Manager](https://img.shields.io/powershellgallery/v/Az.TrafficManager.svg?style=flat-square&label=Az.TrafficManager)](https://www.powershellgallery.com/packages/Az.TrafficManager/) |
+| Usage Aggregates                      | `Az.UsageAggregates`               | [![Usage Aggregates](https://img.shields.io/powershellgallery/v/Az.UsageAggregates.svg?style=flat-square&label=Az.UsageAggregates)](https://www.powershellgallery.com/packages/Az.UsageAggregates/) |
+| Websites                              | `Az.Websites`                      | [![Websites](https://img.shields.io/powershellgallery/v/Az.Websites.svg?style=flat-square&label=Az.Websites)](https://www.powershellgallery.com/packages/Az.Websites/) |
 
 ## Modules for Azure Stack Cmdlets
 
@@ -101,12 +73,3 @@ Below is a table of modules containing administrative cmdlets found in the [`Azu
 | ------------------- | --------------------------- | ----------------------- |
 | Azure Stack Admin   | `AzureRM.AzureStackAdmin`   | [![Azure Stack Admin](https://img.shields.io/powershellgallery/v/AzureRM.AzureStackAdmin.svg?style=flat-square&label=AzureRM.AzureStackAdmin)](https://www.powershellgallery.com/packages/AzureRM.AzureStackAdmin/) |
 | Azure Stack Storage | `AzureRM.AzureStackStorage` | [![Azure Stack Storage](https://img.shields.io/powershellgallery/v/AzureRM.AzureStackStorage.svg?style=flat-square&label=AzureRM.AzureStackStorage)](https://www.powershellgallery.com/packages/AzureRM.AzureStackStorage/) |
-
-## Modules for Experiment Cmdlets
-
-Below is a table of modules containing experimentation cmdlets.
-
-| Azure Service | Module Name                    | PowerShell Gallery Link |
-| ------------- | ------------------------------ | ----------------------- |
-| Compute       | `AzureRM.Compute.Experiments`  |  [![Compute Experiments](https://img.shields.io/powershellgallery/v/AzureRM.Compute.Experiments.svg?style=flat-square&label=AzureRM.Compute.Experiments)](https://www.powershellgallery.com/packages/AzureRM.Compute.Experiments/) |
-| Websites      | `AzureRM.Websites.Experiments` |  [![Websites Experiments](https://img.shields.io/powershellgallery/v/AzureRM.Websites.Experiments.svg?style=flat-square&label=AzureRM.Websites.Experiments)](https://www.powershellgallery.com/packages/AzureRM.Websites.Experiments/) |
diff --git a/documentation/breaking-changes/breaking-changes-tool-help.md b/documentation/breaking-changes/breaking-changes-tool-help.md
index 1f13a77e6ef7..a1ca5363b3d7 100644
--- a/documentation/breaking-changes/breaking-changes-tool-help.md
+++ b/documentation/breaking-changes/breaking-changes-tool-help.md
@@ -385,7 +385,7 @@ _Add the parameter '`<parameter>`' back to the cmdlet '`<cmdlet>`', or add an al
 To add an alias to the original parameter name, use the `Alias` attribute for the parameter.
 
 ```cs
-[Cmdlet(VerbsCommunications.Connect, "AzureRmAccount")]
+[Cmdlet(VerbsCommunications.Connect, "AzAccount")]
 public class ConnectAzureRmAccount : Cmdlet
 {
     [Alias("Domain")]
diff --git a/documentation/development-docs/azure-powershell-design-guidelines.md b/documentation/development-docs/azure-powershell-design-guidelines.md
index d606272cc52b..d4b561ce2802 100644
--- a/documentation/development-docs/azure-powershell-design-guidelines.md
+++ b/documentation/development-docs/azure-powershell-design-guidelines.md
@@ -64,7 +64,7 @@ From the [Strongly Encouraged Development Guidelines](https://msdn.microsoft.com
 
 #### Noun Prefix
 
-For ARM cmdlets, the noun must be prefixed with `AzureRm`. For RDFE and data plane cmdlets, the noun must be prefixed with `Azure`.
+For ARM cmdlets, the noun must be prefixed with `Az`. For RDFE and data plane cmdlets, the noun must be prefixed with `Azure`.
 
 #### Specific Noun
 
@@ -274,7 +274,7 @@ $job | Wait-Job
 $subcriptions = $job | Receive-Job
 ````
 
-To set a custom job name, please use [SetBackgroupJobDescription(string name)](https://github.com/Azure/azure-powershell/blob/preview/src/Common/Commands.Common/AzurePSCmdlet.cs#L761).  The default job description is: "Long Running Operation for '{cmdlet name}' on resource '{resource name}'"
+To set a custom job name, please use [SetBackgroupJobDescription(string name)](https://github.com/Azure/azure-powershell-common/blob/dev/src/Common/AzurePSCmdlet.cs#L810).  The default job description is: "Long Running Operation for '{cmdlet name}' on resource '{resource name}'"
 
 ## Argument Completers
 
diff --git a/documentation/development-docs/azure-powershell-developer-guide.md b/documentation/development-docs/azure-powershell-developer-guide.md
index b816397b68b7..cecffb34267a 100644
--- a/documentation/development-docs/azure-powershell-developer-guide.md
+++ b/documentation/development-docs/azure-powershell-developer-guide.md
@@ -52,7 +52,7 @@ The following prerequisites should be completed before contributing to the Azure
 
 - Install [Visual Studio 2017](https://www.visualstudio.com/downloads/)
 - Install the latest version of [Git](https://git-scm.com/downloads)
-- Install the [`platyPS` module](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/help-generation.md#installing-platyps)
+- Install the [`platyPS` module](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/help-generation.md#installing-platyps)
 - Set the PowerShell [execution policy](https://technet.microsoft.com/en-us/library/ee176961.aspx) to **Unrestricted** for the following versions of PowerShell:
     - `C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe`
     - `C:\Windows\SysWOW64\WindowsPowerShell\v1.0\powershell.exe`
@@ -85,10 +85,10 @@ You now be able to create your own branches, commit changes, and push commits to
 git remote add upstream https://github.com/Azure/azure-powershell.git
 ```
 
-Then, to pull changes from the **preview** branch in _Azure/azure-powershell_ into your local working branch, run the following command:
+Then, to pull changes from the **dev** branch in _Azure/azure-powershell_ into your local working branch, run the following command:
 
 ```
-git pull upstream preview
+git pull upstream dev
 ```
 
 ## Building the Environment
@@ -174,9 +174,9 @@ Add a new folder under `src/ResourceManager` with your service specific name (_e
 
  Once created, right click on the `Commands.<SERVICE>` project in the `Solution Explorer` and select `Unload project`. Right click on the unloaded project and select `Edit Commands.<SERVICE>.csproj`. Once opened, ensure that the following things are changed:
  - The `RootNamespace` and `AssemblyNamespace` attributes of the project _must_ be changed to `Microsoft.Azure.Commands.<SERVICE>`. If these changes are not made, then the assembly produced from this project is not be signed and results in errors when users try to use your module.
- - Under the `Debug|AnyCPU` property group, change the `OutputPath` attribute to `..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.<SERVICE>`
+ - Under the `Debug|AnyCPU` property group, change the `OutputPath` attribute to `..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Az.<SERVICE>`
  - Under the `Release|AnyCPU` property group, make the following changes:
-    - Change the `OutputPath` attribute to `..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.<SERVICE>`
+    - Change the `OutputPath` attribute to `..\..\..\Package\Release\ResourceManager\AzureResourceManager\Az.<SERVICE>`
     - Add the constant `SIGN` to the `DefineConstants` attribute
     - Add `<SignAssembly>true</SignAssembly>`
     - Add `<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>`, making sure to copy the `MSSharedLibKey.snk` file from another project into the `Commands.<SERVICE>` folder
@@ -246,7 +246,7 @@ To import modules automatically when debug has started, follow the below steps:
 
 - In the **Debug** tab mentioned previously, go to **Start Options**
 - Import the Profile module, along with the module you are testing, by pasting the following in the **Command line arguments** box (_note_: you have to update the <PATH_TO_REPO> and <SERVICE> values provided below):
-    - `-NoExit -Command "Import-Module <PATH_TO_REPO>/src/Package/Debug/ResourceManager/AzureResourceManager/AzureRM.Profile/AzureRM.Profile.psd1;Import-Module <PATH_TO_REPO>/src/Package/Debug/ResourceManager/AzureResourceManager/AzureRM.<SERVICE>/AzureRM.<SERVICE>.psd1;$VerbosePreference='Continue'"`
+    - `-NoExit -Command "Import-Module <PATH_TO_REPO>/src/Package/Debug/ResourceManager/AzureResourceManager/Az.Profile/Az.Profile.psd1;Import-Module <PATH_TO_REPO>/src/Package/Debug/ResourceManager/AzureResourceManager/Az.<SERVICE>/Az.<SERVICE>.psd1;$VerbosePreference='Continue'"`
     
 - **Note**: if you do not see all of the changes you made to the cmdlets when importing your module in a PowerShell session (_e.g.,_ a cmdlet you added is not recognized as a cmdlet), you may need to delete any existing Azure PowerShell modules that you have on your machine (installed either through the PowerShell Gallery or by Web Platform Installer) before you import your module.
 
@@ -369,7 +369,7 @@ Create these environment variables for the AD scenario tests:
 
 # After Development
 
-Once all of your cmdlets have been created and the appropriate tests have been added, you can open a pull request in the Azure PowerShell repository to have your cmdlets added to the next release. Please make sure to read [CONTRIBUTING.md](https://github.com/Azure/azure-powershell/blob/preview/CONTRIBUTING.md) for more information on how to open a pull request, clean up commits, make sure appropriate files have been added/changed, and more.
+Once all of your cmdlets have been created and the appropriate tests have been added, you can open a pull request in the Azure PowerShell repository to have your cmdlets added to the next release. Please make sure to read [CONTRIBUTING.md](https://github.com/Azure/azure-powershell/blob/dev/CONTRIBUTING.md) for more information on how to open a pull request, clean up commits, make sure appropriate files have been added/changed, and more.
 
 # Misc
 
@@ -401,7 +401,7 @@ $subcriptions = $job | Receive-Job
 
 ## Argument Completers
 
-PowerShell uses Argument Completers to provide tab completion for users.  At the moment, Azure PowerShell has two specific argument completers that should be applied to relevant parameters, and one generic argument completer that can be used to tab complete with a given list of values.  To test the completers, run a complete build after you have added the completers (``` msbuild build.proj ```) and ensure that the psm1 file (AzureRM.\<Service\>.psm1) has been added to the psd1 file found in src/Package/Debug/ResourceManager/AzureResourceManager/AzureRM.\<Service\>/AzureRM.\<Service\>.psd1 under "Root Module".
+PowerShell uses Argument Completers to provide tab completion for users.  At the moment, Azure PowerShell has two specific argument completers that should be applied to relevant parameters, and one generic argument completer that can be used to tab complete with a given list of values.  To test the completers, run a complete build after you have added the completers (``` msbuild build.proj ```) and ensure that the psm1 file (Az.\<Service\>.psm1) has been added to the psd1 file found in src/Package/Debug/ResourceManager/AzureResourceManager/Az.\<Service\>/Az.\<Service\>.psd1 under "Root Module".
 
 ### Resource Group Completer
 
diff --git a/documentation/development-docs/generate-format.ps1xml-file.md b/documentation/development-docs/generate-format.ps1xml-file.md
index eee4ee3ca822..56b1dfaa57f4 100644
--- a/documentation/development-docs/generate-format.ps1xml-file.md
+++ b/documentation/development-docs/generate-format.ps1xml-file.md
@@ -14,14 +14,14 @@ Our team trends to make the cmdlets output more convenient and consistent across
 
 # How table view output works by default.
 
- As an example let's consider [Get-AzSubscription](https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Profile/Commands.Profile/Subscription/GetAzureRMSubscription.cs) cmdlet. 
+ As an example let's consider [Get-AzSubscription](https://github.com/Azure/azure-powershell/blob/dev/src/ResourceManager/Profile/Commands.Profile/Subscription/GetAzureRMSubscription.cs) cmdlet. 
 
 The cmdlet class specifies the ```PSAzureSubscription``` class as an output type with the **OutputType attribute**:
 
 ```Cs
 namespace Microsoft.Azure.Commands.Profile
 {
-    [Cmdlet(VerbsCommon.Get, "AzureRmSubscription", DefaultParameterSetName = ListByIdInTenantParameterSet),
+    [Cmdlet(VerbsCommon.Get, "AzSubscription", DefaultParameterSetName = ListByIdInTenantParameterSet),
         OutputType(typeof(PSAzureSubscription))]
     public class GetAzureRMSubscriptionCommand : AzureRmLongRunningCmdlet
     {
@@ -31,7 +31,7 @@ namespace Microsoft.Azure.Commands.Profile
 // omitted for brevity the rest of the definition.
 ```
 
-The [PSAzureSubscription](https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Common/Commands.Common.Authentication.ResourceManager/Models/PSAzureSubscription.cs) class contains several public properties. 
+The [PSAzureSubscription](https://github.com/Azure/azure-powershell-common/blob/dev/src/Authentication.ResourceManager/Models/PSAzureSubscription.cs) class contains several public properties. 
 
 * Id
 * Name
@@ -115,14 +115,14 @@ To provide a better PowerShell Azure cmdlets output experience we worked out a m
 2. Run the New-FormatPs1Xml cmdlet to generate the format.ps1xml file.
 
 ---
- We presume that for the [output type](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/azure-powershell-design-guidelines.md#output-type) you created a new class that, for example,  wraps a returning .NET SDK type, rather than PSObject.
+ We presume that for the [output type](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/azure-powershell-design-guidelines.md#output-type) you created a new class that, for example,  wraps a returning .NET SDK type, rather than PSObject.
 
 ---
 
 
 #  Ps1XmlAttribute attribute.
 
-The key element of the mechanism is the **Ps1XmlAttribute** attribute located in the [Commands.Common](https://github.com/Azure/azure-powershell/blob/preview/src/Common/Commands.Common/Attributes/Ps1XmlAttribute.cs) project. Below is the attribute definition:
+The key element of the mechanism is the **Ps1XmlAttribute** attribute located in the [Commands.Common](https://github.com/Azure/azure-powershell-common/blob/dev/src/Common/Attributes/Ps1XmlAttribute.cs) project. Below is the attribute definition:
 
 ```Cs
 namespace Microsoft.WindowsAzure.Commands.Common.Attributes
@@ -223,7 +223,7 @@ namespace Microsoft.Azure.Commands.Profile.Models
   ```
 * If **Label** is not specified - the property name will be used. 
 
-* Since the **Ps1Xml attribute** definition is located in the [Commands.Common](https://github.com/Azure/azure-powershell/tree/preview/src/Common/Commands.Common) project and the Command.Common project is likely referenced from your project - to make the attribute visible - you only need to add ```using Microsoft.WindowsAzure.Commands.Common.Attributes;``` statement.
+* Since the **Ps1Xml attribute** definition is located in the [Commands.Common](https://github.com/Azure/azure-powershell-common/tree/dev/src/Common) project and the Command.Common project is likely referenced from your project - to make the attribute visible - you only need to add ```using Microsoft.WindowsAzure.Commands.Common.Attributes;``` statement.
 
 ## Properties of complex types.
 
@@ -309,7 +309,7 @@ This will place the column at the very beginning of the table.
 
 # How to generate format.ps1xml file.
 
-1. First of all you need to [build](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/azure-powershell-developer-guide.md#building-the-environment) PowerShell Azure:
+1. First of all you need to [build](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/azure-powershell-developer-guide.md#building-the-environment) PowerShell Azure:
 
 ```Powershell
 PS E:\git\azure-powershell> msbuild build.proj /p:SkipHelp=true
@@ -329,8 +329,8 @@ Mode                LastWriteTime         Length Name
 d-----        4/25/2018   4:37 PM                ResourceManager
 d-----        4/25/2018   4:35 PM                ServiceManagement
 d-----        4/25/2018   4:35 PM                Storage
--a----        4/25/2018   4:31 PM          11384 AzureRM.psd1
--a----        4/25/2018   4:50 PM           8708 AzureRM.psm1
+-a----        4/25/2018   4:31 PM          11384 Az.psd1
+-a----        4/25/2018   4:50 PM           8708 Az.psm1
 
 ```
 
@@ -340,15 +340,15 @@ d-----        4/25/2018   4:35 PM                Storage
 PS E:\git\azure-powershell> Import-Module E:\git\azure-powershell\tools\RepoTasks\RepoTasks.Cmdlets\bin\Debug\RepoTasks.Cmdlets.dll
 ```
 3. Run the **New-FormatPs1Xml** cmdlet. 
-* The cmdlet has one required argument **-ModulePath** - a path to a module manifest (psd1) file. Since in our example we are using the Get-AzSubscription cmdlet from the AzureRM.Profile module we need to specify path to the AzureRm.Profile module manifest which is 
+* The cmdlet has one required argument **-ModulePath** - a path to a module manifest (psd1) file. Since in our example we are using the Get-AzSubscription cmdlet from the Az.Profile module we need to specify path to the Az.Profile module manifest which is 
 ```
-E:\git\azure-powershell\src\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1 
+E:\git\azure-powershell\src\Package\Debug\ResourceManager\AzureResourceManager\Az.Profile\Az.Profile.psd1 
 ``` 
 * Also with the cmdlet we need to use **-OnlyMarkedProperties** switch.
 * You may also want to specify an output path for the generated file with the **-OutputPath** argument. If not specified this is current folder.
 
 ```
-PS E:\git\azure-powershell> New-FormatPs1Xml -ModulePath .\src\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1 -OnlyMarkedProperties
+PS E:\git\azure-powershell> New-FormatPs1Xml -ModulePath .\src\Package\Debug\ResourceManager\AzureResourceManager\Az.Profile\Az.Profile.psd1 -OnlyMarkedProperties
 
 E:\git\azure-powershell\Microsoft.Azure.Commands.Profile.generated.format.ps1xml
 ```
@@ -360,13 +360,13 @@ E:\git\azure-powershell\Microsoft.Azure.Commands.Profile.generated.format.ps1xml
 
 1. **Copy** the generated format.ps1xml file to the built module folder (this is where your module manifest file psd1 is located). In our example the module folder is 
 ```
-E:\git\azure-powershell\src\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Profile
+E:\git\azure-powershell\src\Package\Debug\ResourceManager\AzureResourceManager\Az.Profile
 ```
 
 2. Modify your module manifest file. 
-* In our example the module manifest is AzureRM.Profile.psd1: 
+* In our example the module manifest is Az.Profile.psd1: 
 ```
-E:\git\azure-powershell\src\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1 
+E:\git\azure-powershell\src\Package\Debug\ResourceManager\AzureResourceManager\Az.Profile\Az.Profile.psd1 
 ``` 
 
 * In the module manifest file there is a variable called **FormatsToProcess** to reference format.ps1xml files.
@@ -387,9 +387,9 @@ FunctionsToExport = @()
 
 # script omitted for brevity
 ```
-3. Open a **PowerShell window** and **import** your module. In our example it is AzureRm.Profile:
+3. Open a **PowerShell window** and **import** your module. In our example it is Az.Profile:
 ```Powershell
-PS C:\> Import-Module E:\git\azure-powershell\src\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1
+PS C:\> Import-Module E:\git\azure-powershell\src\Package\Debug\ResourceManager\AzureResourceManager\Az.Profile\Az.Profile.psd1
 ```
 
 4. Try your cmdlet out. In our example it is Get-AuzreRmSubsription:
@@ -409,9 +409,9 @@ c9cbd920-c00c-427c-852b-c329e824c3a8 Azure SDK Powershell Test Enabled 72f988bf-
 **Note:** All the paths used in the example in the section are under **_azure-powershell/src/ResourceManager/Profile_**
 
 
-1. Copy the generated file into your project source folder. In our example this is [src/ResourceManager/Profile/Commands.Profile](https://github.com/Azure/azure-powershell/tree/preview/src/ResourceManager/Profile/Commands.Profile) folder.
+1. Copy the generated file into your project source folder. In our example this is [src/ResourceManager/Profile/Commands.Profile](https://github.com/Azure/azure-powershell/tree/dev/src/ResourceManager/Profile/Commands.Profile) folder.
 
-2. Reference the generated format.ps1xml file form your project. In our example this is [Commands.Profile.csproj](https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj) file:
+2. Reference the generated format.ps1xml file form your project. In our example this is [Commands.Profile.csproj](https://github.com/Azure/azure-powershell/blob/dev/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj) file:
 
 ```Xml
   <ItemGroup>
@@ -438,7 +438,7 @@ c9cbd920-c00c-427c-852b-c329e824c3a8 Azure SDK Powershell Test Enabled 72f988bf-
     </None>
   </ItemGroup>
 ```
-3. Add the generated format.ps1xml file to your source module manifest **FormatsToProcess** variable. In our example this is [src/ResourceManager/Profile/AzureRM.Profile.psd1](https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Profile/AzureRM.Profile.psd1) file:
+3. Add the generated format.ps1xml file to your source module manifest **FormatsToProcess** variable. In our example this is [src/ResourceManager/Profile/Az.Profile.psd1](https://github.com/Azure/azure-powershell/blob/dev/src/ResourceManager/Profile/Az.Profile.psd1) file:
 ```Powershell
 # script omitted for brevity
 
diff --git a/documentation/development-docs/help-generation.md b/documentation/development-docs/help-generation.md
index 9953ee122a5f..250b20f46852 100644
--- a/documentation/development-docs/help-generation.md
+++ b/documentation/development-docs/help-generation.md
@@ -27,7 +27,7 @@ Register-PSRepository -Name PSGallery -SourceLocation https://www.powershellgall
 
 Before you run the `platyPS` cmdlets to update your markdown help files, you will need to first import the module containing the changes that you have made to your cmdlets into your current PowerShell session. Once you have built your project (either through Visual Studio or with `msbuild`), you can locate the module manifest that you will need to import in the `src/Package/Debug` folder of your local repository.
 
-For example, if you have made changes to the `Profile` module, you will find the corresponding module manifest in `src/Package/Debug/ResourceManager/AzureResourceManager/AzureRM.Profile/AzureRM.Profile.psd1`.
+For example, if you have made changes to the `Profile` module, you will find the corresponding module manifest in `src/Package/Debug/ResourceManager/AzureResourceManager/Az.Profile/Az.Profile.psd1`.
 
 Once you have located the module manifest, you can import it in your current PowerShell session by running the following command:
 
@@ -67,9 +67,9 @@ Update-MarkdownHelpModule -Path $PathToHelpFolder -RefreshModulePage -Alphabetic
 
 If you would like to update the inputs/outputs for a markdown file, please run this cmdlet with the -UpdateInputOutput parameter.  Keep in mind that this will overwrite any customized descriptions of inputs and outputs, so you will need to add these descriptions back if still relevant.
 
-This will update all of the markdown files with public interface changes made to corresponding cmdlets, add markdown files for any new cmdlets, remove markdown files for any deleted cmdlets, and update the module page (_e.g.,_ `AzureRM.Profile.md`) with any added or removed cmdlets.
+This will update all of the markdown files with public interface changes made to corresponding cmdlets, add markdown files for any new cmdlets, remove markdown files for any deleted cmdlets, and update the module page (_e.g.,_ `Az.Profile.md`) with any added or removed cmdlets.
 
-_This seems to work better when run from within the `help` folder itself (For e.g. to generate the help files for the [`Network`](https://github.com/Azure/azure-powershell/tree/preview/src/ResourceManager/Network) module run the cmd from under [`Commands.Network/help`](https://github.com/Azure/azure-powershell/tree/preview/src/ResourceManager/Network/Commands.Network/help)). Also, you will have to import the profile module from under <Repo base path>/src/Package/Debug/ResourceManager/AzureResourceManager/AzureRM.Profile/AzureRM.Profile.psd1_
+_This seems to work better when run from within the `help` folder itself (For e.g. to generate the help files for the [`Network`](https://github.com/Azure/azure-powershell/tree/dev/src/ResourceManager/Network) module run the cmd from under [`Commands.Network/help`](https://github.com/Azure/azure-powershell/tree/dev/src/ResourceManager/Network/Commands.Network/help)). Also, you will have to import the profile module from under <Repo base path>/src/Package/Debug/ResourceManager/AzureResourceManager/Az.Profile/Az.Profile.psd1_
 
 #### Updating a single markdown file
 
diff --git a/documentation/development-docs/patterns-for-standard-cmdlets.md b/documentation/development-docs/patterns-for-standard-cmdlets.md
index a78b140a159b..c31fc399532d 100644
--- a/documentation/development-docs/patterns-for-standard-cmdlets.md
+++ b/documentation/development-docs/patterns-for-standard-cmdlets.md
@@ -43,7 +43,7 @@ The first parameter set has an optional `-ResourceGroupName` parameter, which al
 ```cs
 namespace Microsoft.Azure.Commands.Foo
 {
-    [Cmdlet(VerbsCommon.Get, "AzureRmFoo", DefaultParameterSetName = ListParameterSet), OutputType(typeof(PSFoo))]
+    [Cmdlet(VerbsCommon.Get, "AzFoo", DefaultParameterSetName = ListParameterSet), OutputType(typeof(PSFoo))]
     public class GetFooCommand : FooBaseCmdlet
     {
         private const string ListParameterSet = "ListParameterSet";
@@ -120,7 +120,7 @@ This parameter set has required `-ResourceGroupName` and `-Name` parameters to s
 ```cs
 namespace Microsoft.Azure.Commands.Foo
 {
-    [Cmdlet(VerbsCommon.New, "AzureRmFoo", DefaultParameterSetName = CreateParameterSet, SupportsShouldProcess = true), OutputType(typeof(PSFoo))]
+    [Cmdlet(VerbsCommon.New, "AzFoo", DefaultParameterSetName = CreateParameterSet, SupportsShouldProcess = true), OutputType(typeof(PSFoo))]
     public class NewFooCommand : FooBaseCmdlet
     {
         private const string CreateParameterSet = "CreateParameterSet";
@@ -207,7 +207,7 @@ The first parameter set has required `-ResourceGroupName` and `-Name` parameters
 ```cs
 namespace Microsoft.Azure.Commands.Foo
 {
-    [Cmdlet(VerbsCommon.Remove, "AzureRmFoo", DefaultParameterSetName = DeleteByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(bool))]
+    [Cmdlet(VerbsCommon.Remove, "AzFoo", DefaultParameterSetName = DeleteByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(bool))]
     public class RemoveFooCommand : FooBaseCmdlet
     {
         private const string DeleteByNameParameterSet = "DeleteByNameParameterSet";
@@ -291,7 +291,7 @@ The first parameter set has required `-ResourceGroupName` and `-Name` parameters
 ```cs
 namespace Microsoft.Azure.Commands.Foo
 {
-    [Cmdlet(VerbsCommon.Set, "AzureRmFoo", DefaultParameterSet = SetByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(PSFoo))]
+    [Cmdlet(VerbsCommon.Set, "AzFoo", DefaultParameterSet = SetByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(PSFoo))]
     public class SetFooCommand : FooBaseCmdlet
     {
         private const string SetByNameParameterSet = "SetByNameParameterSet";
@@ -405,7 +405,7 @@ The first parameter set has required `-ResourceGroupName` and `-Name` parameters
 ```cs
 namespace Microsoft.Azure.Commands.Foo
 {
-    [Cmdlet(VerbsData.Update, "AzureRmFoo", DefaultParameterSet = UpdateByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(PSFoo))]
+    [Cmdlet(VerbsData.Update, "AzFoo", DefaultParameterSet = UpdateByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(PSFoo))]
     public class UpdateFooCommand : FooBaseCmdlet
     {
         private const string UpdateByNameParameterSet = "UpdateByNameParameterSet";
@@ -512,7 +512,7 @@ The first parameter set has mandatory `-ResourceGroupName` and `-FooName` parame
 ```cs
 namespace Microsoft.Azure.Commands.Foo
 {
-    [Cmdlet(VerbsCommon.Get, "AzureRmChildFoo", DefaultParameterSetName = GetByNameParameterSet), OutputType(typeof(PSChildFoo))]
+    [Cmdlet(VerbsCommon.Get, "AzChildFoo", DefaultParameterSetName = GetByNameParameterSet), OutputType(typeof(PSChildFoo))]
     public class GetChildFooCommand : FooBaseCmdlet
     {
         private const string GetByNameParameterSet = "GetByNameParameterSet";
@@ -601,7 +601,7 @@ The first parameter set has required `-ResourceGroupName`, `-FooName` and `-Name
 ```cs
 namespace Microsoft.Azure.Commands.Foo
 {
-    [Cmdlet(VerbsCommon.New, "AzureRmChildFoo", DefaultParameterSetName = CreateByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(PSChildFoo))]
+    [Cmdlet(VerbsCommon.New, "AzChildFoo", DefaultParameterSetName = CreateByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(PSChildFoo))]
     public class NewChildFooCommand : FooBaseCmdlet
     {
         private const string CreateByNameParameterSet = "CreateByNameParameterSet";
@@ -706,7 +706,7 @@ The first parameter set has required `-ResourceGroupName`, `-FooName` and `-Name
 ```cs
 namespace Microsoft.Azure.Commands.Foo
 {
-    [Cmdlet(VerbsCommon.Remove, "AzureRmChildFoo", DefaultParameterSetName = DeleteByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(bool))]
+    [Cmdlet(VerbsCommon.Remove, "AzChildFoo", DefaultParameterSetName = DeleteByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(bool))]
     public class RemoveChildFooCommand : FooBaseCmdlet
     {
         private const string DeleteByNameParameterSet = "DeleteByNameParameterSet";
@@ -810,7 +810,7 @@ The first parameter set has required `-ResourceGroupName`, `-FooName` and `-Name
 ```cs
 namespace Microsoft.Azure.Commands.Foo
 {
-    [Cmdlet(VerbsCommon.Set, "AzureRmChildFoo", DefaultParameterSet = SetByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(PSChildFoo))]
+    [Cmdlet(VerbsCommon.Set, "AzChildFoo", DefaultParameterSet = SetByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(PSChildFoo))]
     public class SetChildFooCommand : FooBaseCmdlet
     {
         private const string SetByNameParameterSet = "SetByNameParameterSet";
@@ -944,7 +944,7 @@ The first parameter set has required `-ResourceGroupName`, `-FooName` and `-Name
 ```cs
 namespace Microsoft.Azure.Commands.Foo
 {
-    [Cmdlet(VerbsData.Update, "AzureRmChildFoo", DefaultParameterSet = UpdateByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(PSChildFoo))]
+    [Cmdlet(VerbsData.Update, "AzChildFoo", DefaultParameterSet = UpdateByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(PSChildFoo))]
     public class UpdateChildFooCommand : FooBaseCmdlet
     {
         private const string UpdateByNameParameterSet = "UpdateByNameParameterSet";
diff --git a/documentation/development-docs/piping-in-powershell.md b/documentation/development-docs/piping-in-powershell.md
index 6c6e13cbece2..1e0134e48ff1 100644
--- a/documentation/development-docs/piping-in-powershell.md
+++ b/documentation/development-docs/piping-in-powershell.md
@@ -82,7 +82,7 @@ Get/New-Az<ExampleResource> -ParentResourceId <string (accepts ResourceId of the
 
 ### Long explanation
 
-In this scenario, we are using the generic cmdlets found in the `AzureRM.Resources` module. These cmdlets, `Find-AzResource` and `Get-AzResource`, return a `PSCustomObject` that has a `ResourceId` property, which is the unique identifier for the given resource. Since this identifier can parsed to get the name and resource group name for a top-level resource, we can create a parameter set that has a `ResourceId` parameter that accepts its value from the pipeline by property name, allowing us to accept piping from these generic cmdlets.
+In this scenario, we are using the generic cmdlets found in the `Az.Resources` module. These cmdlets, `Find-AzResource` and `Get-AzResource`, return a `PSCustomObject` that has a `ResourceId` property, which is the unique identifier for the given resource. Since this identifier can parsed to get the name and resource group name for a top-level resource, we can create a parameter set that has a `ResourceId` parameter that accepts its value from the pipeline by property name, allowing us to accept piping from these generic cmdlets.
 
 ```powershell
 # --- Piping scenario ---
@@ -107,7 +107,7 @@ Find-AzResource -ResourceType Microsoft.Foo/foo -ResourceGroupEquals "RG" | ForE
 Find-AzResource -ResourceGroupEquals "RG" -ResourceNameEquals "FooName" | ForEach-Object { Remove-AzFoo -ResourceId $_.ResourceId }
 ```
 
-To implement this scenario, please see the [`ResourceIdentifier`](https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Common/Commands.ResourceManager.Common/Utilities/Models/ResourceIdentifier.cs) class in the `Commands.ResourceManager.Common` project. This class will allow you to create a `ResourceIdentifier` object that accepts a `ResourceId` string in its constructor and has properties `ResourceName`, `ResourceGroupName`, and others.
+To implement this scenario, please see the [`ResourceIdentifier`](https://github.com/Azure/azure-powershell/blob/dev/src/ResourceManager/Common/Commands.ResourceManager.Common/Utilities/Models/ResourceIdentifier.cs) class in the `Commands.ResourceManager.Common` project. This class will allow you to create a `ResourceIdentifier` object that accepts a `ResourceId` string in its constructor and has properties `ResourceName`, `ResourceGroupName`, and others.
 
 ## Summary
 For all Remove/Set/Update cmdlets (and any other cmdlet where an existing resource is being operated on), you will have three parameter sets (and potentially a multiple of three if you have initially have multiple parameter sets):
diff --git a/documentation/development-docs/vm-for-partners.md b/documentation/development-docs/vm-for-partners.md
index 1931edfc2d7d..0cbb20fde480 100644
--- a/documentation/development-docs/vm-for-partners.md
+++ b/documentation/development-docs/vm-for-partners.md
@@ -1,10 +1,10 @@
-If you need an Azure Virtual Machine with all the [prerequisites](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/azure-powershell-developer-guide.md#prerequisites) installed and ready to build and test Powershell Azure - follow the steps below. 
+If you need an Azure Virtual Machine with all the [prerequisites](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/azure-powershell-developer-guide.md#prerequisites) installed and ready to build and test Powershell Azure - follow the steps below. 
 
 # Copy the PowerShell Azure VHD blob to your subscription and create a VM from it.
 
-1. Make sure that you have the version 4.5.0 or above of the AzureRM.Compute PowerShell module. Run the following command to install it. This version has the "easy VM create" cmdlet that we are going to use in the script below to create a VM.
+1. Make sure that you have the version 4.5.0 or above of the Az.Compute PowerShell module. Run the following command to install it. This version has the "easy VM create" cmdlet that we are going to use in the script below to create a VM.
     ```PowerShell
-    Install-Module AzureRM.Compute --MinimumVersion  4.5.0
+    Install-Module Az.Compute --MinimumVersion  4.5.0
     ```
 2. Email azdevxps@microsoft.com to obtain a VHD SAS URI, and assign that unique URI to the variable below.
     ```PowerShell
@@ -134,7 +134,7 @@ git config --global user.email "<Your email on GitHub>"
 ```
 git config --global user.name "<Your name>"
 ```
-Next, you will need to follow the steps [here](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/azure-powershell-developer-guide.md#environment-setup) to set up your local fork of Azure/azure-powershell.
+Next, you will need to follow the steps [here](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/azure-powershell-developer-guide.md#environment-setup) to set up your local fork of Azure/azure-powershell.
 
 # Building and Running Tests
-This image has been set up to build and run tests immediately. To build the project, run msbuild build.proj in the Developer Command Prompt for VS2015. Once this has completed, you can open your module in Visual Studio and start development there. To record tests, follow the instructions [here](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/azure-powershell-developer-guide.md#recordingrunning-tests).
+This image has been set up to build and run tests immediately. To build the project, run msbuild build.proj in the Developer Command Prompt for VS2015. Once this has completed, you can open your module in Visual Studio and start development there. To record tests, follow the instructions [here](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/azure-powershell-developer-guide.md#recordingrunning-tests).
diff --git a/documentation/testing-docs/using-azure-test-framework.md b/documentation/testing-docs/using-azure-test-framework.md
index 69312e4c00f2..1b27cb76971e 100644
--- a/documentation/testing-docs/using-azure-test-framework.md
+++ b/documentation/testing-docs/using-azure-test-framework.md
@@ -157,7 +157,7 @@ AZURE_TEST_MODE=Record
 
 ## Record or Playback Tests
 
-- [Run the tests](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/azure-powershell-developer-guide.md#recordingrunning-tests) and make sure that you got a generated `.json` file that matches the test name in the bin folder under the `SessionRecords` folder
+- [Run the tests](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/azure-powershell-developer-guide.md#recordingrunning-tests) and make sure that you got a generated `.json` file that matches the test name in the bin folder under the `SessionRecords` folder
 - Copy the `SessionRecords` folder inside the test project and add all `*.json` files in Visual Studio setting "Copy to Output Directory" property to "Copy if newer"
 - To assure that the records work fine, delete the connection string (default mode is Playback mode) OR change HttpRecorderMode within the connection string to "Playback" and run the tests
 
diff --git a/documentation/troubleshoot-ci.md b/documentation/troubleshoot-ci.md
index 78e6d689fdd9..859bfe2b6076 100644
--- a/documentation/troubleshoot-ci.md
+++ b/documentation/troubleshoot-ci.md
@@ -10,24 +10,24 @@ To get even more detailed data click "Console Output" and look for keywords like
 
 ### Message
 
-> c:\workspace\powershell\build.proj(278,5): error MSB3073: The command ""C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe" -NonInteractive -NoLogo -NoProfile -Command "$ProgressPreference = 'SilentlyContinue';. c:\workspace\powershell\tools\\**GenerateHelp.ps1** -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig Debug -FilteredModules 'AzureRM.Network;AzureRM.Profile' "" exited with code -1.
+> c:\workspace\powershell\build.proj(278,5): error MSB3073: The command ""C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe" -NonInteractive -NoLogo -NoProfile -Command "$ProgressPreference = 'SilentlyContinue';. c:\workspace\powershell\tools\\**GenerateHelp.ps1** -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig Debug -FilteredModules 'Az.Network;Az.Profile' "" exited with code -1.
 
 This means there are issues with your help files.
 
 ### Reasons:
 
-- Cmdlet was changed while .md help files were not regenerated [this way](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/help-generation.md) or there is no help files at all.
+- Cmdlet was changed while .md help files were not regenerated [this way](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/help-generation.md) or there is no help files at all.
 - Help files were re-generated, however they weren't filled with real data. I.e. help generator leaves templates like this `"{{Description there}}"` and they need to be manually filled by developer with descriptions, examples, etc.
 
 ### Solution
 
-Regenerate MD help files [this way](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/help-generation.md) and update "{{\*}}" placeholders
+Regenerate MD help files [this way](https://github.com/Azure/azure-powershell/blob/dev/documentation/development-docs/help-generation.md) and update "{{\*}}" placeholders
 
 ## Code analysis failures
 
 ### Message
 
-> c:\workspace\powershell\build.proj(597,5): error MSB3073: The command "c:\workspace\powershell\src\Package\\**StaticAnalysis.exe** -p c:\workspace\powershell\src\Package\Debug -r c:\workspace\powershell\src\Package  -m AzureRM.Network" exited with code 255.c:\workspace\powershell\build.proj(609,5): error : StaticAnalysis has failed.  Please follow the instructions on this doc: [https://github.com/Azure/azure-powershell/blob/preview/documentation/Debugging-StaticAnalysis-Errors.md](https://github.com/Azure/azure-powershell/blob/preview/documentation/Debugging-StaticAnalysis-Errors.md)
+> c:\workspace\powershell\build.proj(597,5): error MSB3073: The command "c:\workspace\powershell\src\Package\\**StaticAnalysis.exe** -p c:\workspace\powershell\src\Package\Debug -r c:\workspace\powershell\src\Package  -m Az.Network" exited with code 255.c:\workspace\powershell\build.proj(609,5): error : StaticAnalysis has failed.  Please follow the instructions on this doc: [https://github.com/Azure/azure-powershell/blob/dev/documentation/Debugging-StaticAnalysis-Errors.md](https://github.com/Azure/azure-powershell/blob/dev/documentation/Debugging-StaticAnalysis-Errors.md)
 
 ### Reasons
 
@@ -35,7 +35,7 @@ Something that is considered as unacceptable was added with your PR e.g. breakin
 
 ### Solution
 
-According to the [link above](https://github.com/Azure/azure-powershell/blob/preview/documentation/Debugging-StaticAnalysis-Errors.md) you would need to investigate .csv files in the build artifacts.
+According to the [link above](https://github.com/Azure/azure-powershell/blob/dev/documentation/Debugging-StaticAnalysis-Errors.md) you would need to investigate .csv files in the build artifacts.
 
 There are several ways to act:
 
@@ -43,13 +43,13 @@ There are several ways to act:
 
 2. In case changes could be improved without affecting functionality (e.g. signature is incorrect, but you could adjust it to suit requirements), try to fix.
 
-3. In case messages in csv files describe expected changes, add them to [exclusions](https://github.com/Azure/azure-powershell/blob/preview/documentation/Debugging-StaticAnalysis-Errors.md#breaking-changes).
+3. In case messages in csv files describe expected changes, add them to [exclusions](https://github.com/Azure/azure-powershell/blob/dev/documentation/Debugging-StaticAnalysis-Errors.md#breaking-changes).
 
 ### Example:
 
 One of the often reasons are BreakingChangesIssues.
 
-If collected Breaking Changes issues are expected (e.g. cmdlet was really changed), you would need to update Exclusions file [like this](https://github.com/Azure/azure-powershell/blob/preview/documentation/Debugging-StaticAnalysis-Errors.md#breaking-changes) to bypass CI build.
+If collected Breaking Changes issues are expected (e.g. cmdlet was really changed), you would need to update Exclusions file [like this](https://github.com/Azure/azure-powershell/blob/dev/documentation/Debugging-StaticAnalysis-Errors.md#breaking-changes) to bypass CI build.
 
 ## Test failures
 
diff --git a/documentation/troubleshoot-module-load.md b/documentation/troubleshoot-module-load.md
index 4227d4f00e9b..77c19bd215ed 100644
--- a/documentation/troubleshoot-module-load.md
+++ b/documentation/troubleshoot-module-load.md
@@ -1,8 +1,8 @@
 # Troubleshooting Module Version Incompatibilities With Azure PowerShell
 
-Azure PowerShell consists of multiple modules, each of which has a dependency on specific version of the central authentication module 'AzureRM.Profile'. If all versions of Azure PowerShell modules are kept up to date, and all are installed to the same scope, there should never be any incompatibility issues.
+Azure PowerShell consists of multiple modules, each of which has a dependency on specific version of the central authentication module 'Az.Profile'. If all versions of Azure PowerShell modules are kept up to date, and all are installed to the same scope, there should never be any incompatibility issues.
 
-However, if some Azure PowerShell modules on a user's machine are updated while others or not, or if modules are installed to different scopes, or if an older version of the AzureRM.Profile module is imported in the current PowerShell session, then incompatibilities can occur.  This document describes how to determine if there is a potential module incompatibility on a user machine, and how to resolve the incompatibility, including the following potential problems:
+However, if some Azure PowerShell modules on a user's machine are updated while others or not, or if modules are installed to different scopes, or if an older version of the Az.Profile module is imported in the current PowerShell session, then incompatibilities can occur.  This document describes how to determine if there is a potential module incompatibility on a user machine, and how to resolve the incompatibility, including the following potential problems:
 
 - [Prompt for Login when a cmdlet is executed after a previous login](#symptom-prompt-for-login-when-a-cmdlet-is-executed-after-a-previous-login)
 - [Error when loading an Azure PowerShell module](#symptom-error-when-importing-an-azure-powershell-module)
@@ -12,12 +12,12 @@ However, if some Azure PowerShell modules on a user's machine are updated while
 After logging in, and executing a cmdlet, an error like the following is displayed, prompting for a second login:
 
 ```powershell
-PS C:\> Get-AzureRmResourceGroup
-Get-AzureRmResourceGroup : Run Login-AzureRmAccount to login.
+PS C:\> Get-AzResourceGroup
+Get-AzResourceGroup : Run Login-AzAccount to login.
 At line:1 char:1
-+ Get-AzureRmResourceGroup
++ Get-AzResourceGroup
 + ~~~~~~~~~~~~~~~~~~~~~~~~
-    + CategoryInfo          : CloseError: (:) [Get-AzureRmResourceGroup], PSInvalidOperationException
+    + CategoryInfo          : CloseError: (:) [Get-AzResourceGroup], PSInvalidOperationException
     + FullyQualifiedErrorId : Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation.GetAzureResourceGroupCmd
    let
 ```
@@ -28,7 +28,7 @@ PowerShell allows installing multiple versions of modules.  Normally, PowerShell
 
 For example, if the PSModulePath contains directory A followed by directory B, and if Directory A contains version 1 of a module, and Directory B contains version 2 of the module, PowerShell will *always* load version 1, unless the entire path to the later module in directory B is provided when importing the module.
 
-To determine if this problem occurs on your machine, run ```Get-Module -ListAvailable``` and check for duplicate entries for AzureRM.Profile in different directories in the ```PSModulePath```.  For example:
+To determine if this problem occurs on your machine, run ```Get-Module -ListAvailable``` and check for duplicate entries for Az.Profile in different directories in the ```PSModulePath```.  For example:
 
 ```powershell
 c:\> Get-Module -ListAvailable
@@ -38,7 +38,7 @@ c:\> Get-Module -ListAvailable
 
 ModuleType Version    Name                                ExportedCommands
 ---------- -------    ----                                ----------------
-Script     3.4.0      AzureRM.profile                     {Disable-AzureRmDataCollection, Disable-AzureRmContextAuto...
+Script     3.4.0      Az.profile                     {Disable-AzDataCollection, Disable-AzContextAuto...
 
 
     Directory: C:\Program Files\WindowsPowerShell\Modules
@@ -46,19 +46,19 @@ Script     3.4.0      AzureRM.profile                     {Disable-AzureRmDataCo
 
 ModuleType Version    Name                                ExportedCommands
 ---------- -------    ----                                ----------------
-Script     4.0.0      AzureRM.profile                     {Disable-AzureRmDataCollection, Disable-AzureRmContextAuto...
+Script     4.0.0      Az.profile                     {Disable-AzDataCollection, Disable-AzContextAuto...
 
 ```
 
-In this case, the earlier version of AzureRM.Profile (3.4.0) will *always* be loaded because the directory containing this version appears first in the module path.  This means that newer versions of Azure PowerShell modules will be unable to use the authentication provided when logging in using the cmdlets from this module.  IN other words, logging in using AzureRM.Profile version 3.4.0 will not provide authentication for modules that depend on a  later version of AzureRM.Profile (like 3.4.1).
+In this case, the earlier version of Az.Profile (3.4.0) will *always* be loaded because the directory containing this version appears first in the module path.  This means that newer versions of Azure PowerShell modules will be unable to use the authentication provided when logging in using the cmdlets from this module.  IN other words, logging in using Az.Profile version 3.4.0 will not provide authentication for modules that depend on a  later version of Az.Profile (like 3.4.1).
 
-To resolve this problem, simply remove all versions of Azure PowerShell cmdlets not in the global scope ```%ProgramFiles%\WindowsPowerShell\Modules```.  You can remove modules by physically removing the module directory (for example ```c:\users\<myuser>\Documents\WindowsPowerShell\Modules\AzureRM.Profile```).
+To resolve this problem, simply remove all versions of Azure PowerShell cmdlets not in the global scope ```%ProgramFiles%\WindowsPowerShell\Modules```.  You can remove modules by physically removing the module directory (for example ```c:\users\<myuser>\Documents\WindowsPowerShell\Modules\Az.Profile```).
 
 ### Potential Reason 2: Older / Newer version of Azure Module Installed
 
-Additionally, because the Azure and AzureRM modules are installed separately, they are not always updated at the same time.  If the 'Azure' module is updated without updating any installed AzureRM modules, then a version of AzureRM.profile that is compatible with the new 'Azure' module, but not compatible with the older 'AzureRM' modules may be loaded by default, and authentication will not work for AzureRM modules.
+Additionally, because the Azure and Az modules are installed separately, they are not always updated at the same time.  If the 'Azure' module is updated without updating any installed Az modules, then a version of Az.profile that is compatible with the new 'Azure' module, but not compatible with the older 'Az' modules may be loaded by default, and authentication will not work for Az modules.
 
-To detect this problem, run ```Get-Module -ListAvailable``` and look for multiple versions of ```Azure``` and ```AzureRm.Profile``` in the same directory in the module path, but fewer versions of other AzureRM Modules.
+To detect this problem, run ```Get-Module -ListAvailable``` and look for multiple versions of ```Azure``` and ```Az.Profile``` in the same directory in the module path, but fewer versions of other Az Modules.
 
 For example:
 
@@ -75,14 +75,14 @@ ModuleType Version    Name                                ExportedCommands
 ---------- -------    ----                                ----------------
 Script     5.0.0      Azure                               {Add-AzureAccount, Set-AzureSubscription, New...
 Script     4.4.1      Azure                               {Add-AzureAccount, Set-AzureSubscription, New...
-Script     3.4.1      AzureRM.Compute                     {Remove-AzureRmAvailabilitySet, Get-AzureRmAvailabilitySet...
-Script     4.0.0      AzureRM.profile                     {Disable-AzureRmDataCollection, Disable-AzureRmContextAuto...
-Script     3.4.1      AzureRM.profile                     {Disable-AzureRmDataCollection, Disable-AzureRmContextAuto...
+Script     3.4.1      Az.Compute                     {Remove-AzAvailabilitySet, Get-AzAvailabilitySet...
+Script     4.0.0      Az.profile                     {Disable-AzDataCollection, Disable-AzContextAuto...
+Script     3.4.1      Az.profile                     {Disable-AzDataCollection, Disable-AzContextAuto...
 ```
 
-As shown above, the 'Azure' module was updated without updating AzureRM.Compute, resulting in log in problems when using compute cmdlets.
+As shown above, the 'Azure' module was updated without updating Az.Compute, resulting in log in problems when using compute cmdlets.
 
-To resolve the issues, update all AzureRM modules (for example ```Update-Module AzureRM.Compute```), or remove the later versions of 'Azure'.
+To resolve the issues, update all Az modules (for example ```Update-Module Az.Compute```), or remove the later versions of 'Azure'.
 
 Naturally, this problem can occur when any installed Azure PowerShell module is updated without updating others.
 
@@ -93,48 +93,48 @@ Note that this problem is permanently resolved staring with version 5.0.0 of Azu
 When importing an Azure PowerShell module into the current PowerShell Session, you see a message like the following:
 
 ```powershell
-PS C:\WINDOWS\system32> Import-Module AzureRM.Compute
-C:\Program Files\WindowsPowerShell\Modules\AzureRM.Compute\4.0.0\AzureRM.Compute.psm1 : This module requires
-AzureRM.Profile version 4.0.0. An earlier version of AzureRM.Profile is imported in the current PowerShell session. Please
+PS C:\WINDOWS\system32> Import-Module Az.Compute
+C:\Program Files\WindowsPowerShell\Modules\Az.Compute\4.0.0\Az.Compute.psm1 : This module requires
+Az.Profile version 4.0.0. An earlier version of Az.Profile is imported in the current PowerShell session. Please
 open a new session before importing this module. This error could indicate that multiple incompatible versions of the
 Azure PowerShell cmdlets are installed on your system. Please see aka.ms/azps-version-error for troubleshooting
 information.
 At line:1 char:1
-+ Import-Module AzureRM.Compute
++ Import-Module Az.Compute
 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     + CategoryInfo          : NotSpecified: (:) [Write-Error], WriteErrorException
-    + FullyQualifiedErrorId : Microsoft.PowerShell.Commands.WriteErrorException,AzureRM.Compute.psm1
+    + FullyQualifiedErrorId : Microsoft.PowerShell.Commands.WriteErrorException,Az.Compute.psm1
 
-Import-Module : The module to process 'AzureRM.Compute.psm1', listed in field 'ModuleToProcess/RootModule' of module
-manifest 'C:\Program Files\WindowsPowerShell\Modules\AzureRM.Compute\4.0.0\AzureRM.Compute.psd1' was not processed
+Import-Module : The module to process 'Az.Compute.psm1', listed in field 'ModuleToProcess/RootModule' of module
+manifest 'C:\Program Files\WindowsPowerShell\Modules\Az.Compute\4.0.0\Az.Compute.psd1' was not processed
 because no valid module was found in any module directory.
 At line:1 char:1
-+ Import-Module AzureRM.Compute
++ Import-Module Az.Compute
 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    + CategoryInfo          : ResourceUnavailable: (AzureRM.Compute:String) [Import-Module], PSInvalidOperationExcepti
+    + CategoryInfo          : ResourceUnavailable: (Az.Compute:String) [Import-Module], PSInvalidOperationExcepti
    on
     + FullyQualifiedErrorId : Modules_ModuleFileNotFound,Microsoft.PowerShell.Commands.ImportModuleCommand
 ```
 
-###  Reason: Older Version of AzureRM.Profile Loaded in Session
+###  Reason: Older Version of Az.Profile Loaded in Session
 
-If an existing PowerShell session has loaded a version of AzureRM.Profile, then that version cannot be replaced with an updated version.  If you receive an error like the one mentioned above, you can determine if this is the issue by looking at the currently imported modules using ```Get-Module```:
+If an existing PowerShell session has loaded a version of Az.Profile, then that version cannot be replaced with an updated version.  If you receive an error like the one mentioned above, you can determine if this is the issue by looking at the currently imported modules using ```Get-Module```:
 
 ```powershell
 PS C:\WINDOWS\system32> Get-Module
 
 ModuleType Version    Name                                ExportedCommands
 ---------- -------    ----                                ----------------
-Script     3.4.1      AzureRM.Profile                     {Add-AzureRmAccount, Add-AzureRmEnvironment, Clear-AzureRm...
+Script     3.4.1      Az.Profile                     {Add-AzAccount, Add-AzEnvironment, Clear-Az...
 Manifest   3.1.0.0    Microsoft.PowerShell.Utility        {Add-Member, Add-Type, Clear-Variable, Compare-Object...}
 Script     1.2        PSReadline                          {Get-PSReadlineKeyHandler, Get-PSReadlineOption, Remove-PS...
 
 ```
 
-If you see a version of AzureRM.Profile installed in the session, you can resolve this issue, by ensuring that all AzureRM modules are up to date as shown [above](#potential-reason-1-older-version-stored-in-user-or-global-scope) and closing the PowerShell session.
+If you see a version of Az.Profile installed in the session, you can resolve this issue, by ensuring that all Az modules are up to date as shown [above](#potential-reason-1-older-version-stored-in-user-or-global-scope) and closing the PowerShell session.
 
 ## Why Are Incompatibilities Possible
 
-Azure PowerShell is a set of binary modules, meaning that cmdlets are defined and implemented in .Net code.  PowerShell loads cmdlet assemblies into a single AppDomain, and these assemblies cannot be unloaded, even if the module is removed.  Therefore a module assembly and all its dependent assemblies remain loaded in the PowerShell session once it is imported until the PowerShell session is closed.  Additionally, the types defined in a .Net assembly are strongly tied to the assembly version, so that the types from version A and version B of the same assembly will appear as different types in the PowerShell session.  When these types are used in common by multiple assemblies (as in the authentication types in AzureRM.Profile), then the types that are meant to be common are actually different for each module version.  This causes problems when authentication information is instantiated using types from version X of AzureRM.Profile, but an assembly requires version Y of these types.
+Azure PowerShell is a set of binary modules, meaning that cmdlets are defined and implemented in .Net code.  PowerShell loads cmdlet assemblies into a single AppDomain, and these assemblies cannot be unloaded, even if the module is removed.  Therefore a module assembly and all its dependent assemblies remain loaded in the PowerShell session once it is imported until the PowerShell session is closed.  Additionally, the types defined in a .Net assembly are strongly tied to the assembly version, so that the types from version A and version B of the same assembly will appear as different types in the PowerShell session.  When these types are used in common by multiple assemblies (as in the authentication types in Az.Profile), then the types that are meant to be common are actually different for each module version.  This causes problems when authentication information is instantiated using types from version X of Az.Profile, but an assembly requires version Y of these types.
 
-This underlying problem is resolved in version 5.0 of AzureRM, as all authentication types used by the modules are assured to be fully backward compatible.
\ No newline at end of file
+This underlying problem is resolved in version 5.0 of Az, as all authentication types used by the modules are assured to be fully backward compatible.
\ No newline at end of file