diff --git a/src/DesktopVirtualization/Az.DesktopVirtualization.psd1 b/src/DesktopVirtualization/Az.DesktopVirtualization.psd1
index bb788ad9191d..17c77a8a86ab 100644
--- a/src/DesktopVirtualization/Az.DesktopVirtualization.psd1
+++ b/src/DesktopVirtualization/Az.DesktopVirtualization.psd1
@@ -12,7 +12,7 @@
 RootModule = './Az.DesktopVirtualization.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.0.0'
+ModuleVersion = '2.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
diff --git a/src/DesktopVirtualization/ChangeLog.md b/src/DesktopVirtualization/ChangeLog.md
index 6b366f0562ef..466607ee049d 100644
--- a/src/DesktopVirtualization/ChangeLog.md
+++ b/src/DesktopVirtualization/ChangeLog.md
@@ -18,6 +18,9 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+
+
+## Version 2.0.0
 * Require Location property for creating top level arm objects.
 * Made `ApplicationGroupType` required for `New-AzWvdApplicationGroup`.
 * Made `HostPoolArmPath` required for `New-AzWvdApplicationGroup`.
diff --git a/src/DesktopVirtualization/Properties/AssemblyInfo.cs b/src/DesktopVirtualization/Properties/AssemblyInfo.cs
index 8d00e8d0f74a..2bab8c893670 100644
--- a/src/DesktopVirtualization/Properties/AssemblyInfo.cs
+++ b/src/DesktopVirtualization/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("5FAC4032-09B2-4E1D-A7CB-078DEA39CAF1")]
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyVersion("2.0.0")]
+[assembly: AssemblyFileVersion("2.0.0")]
diff --git a/tools/ExpandModules.ps1 b/tools/ExpandModules.ps1
index 953a624f94a6..7aad5ef448af 100644
--- a/tools/ExpandModules.ps1
+++ b/tools/ExpandModules.ps1
@@ -35,7 +35,7 @@ $tmp = Join-Path -Path (Get-Item $Artifacts).FullName -ChildPath "tmp"
 
 try {
     foreach ($artifact in (Get-ChildItem -Path $Artifacts -Filter "*.nupkg").FullName) {
-        $module_name = (((Get-Item -Path $artifact).Name) -split("\.([0-9])+"))[0]
+        $module_name = (Get-Item -Path $artifact).Name
         $zip_artifact = Join-Path -Path (Get-Item $Artifacts).FullName -ChildPath $module_name".zip"
 
         Write-Output "Renaming package $artifact to zip archive $zip_artifact"
diff --git a/tools/PackModules.ps1 b/tools/PackModules.ps1
index d0f25155ba3f..e883fc6c2645 100644
--- a/tools/PackModules.ps1
+++ b/tools/PackModules.ps1
@@ -112,11 +112,20 @@ if (!(Test-Path -Path $tmp)) {
 
 try {
     foreach ($artifact in Get-ChildItem $tmp -Directory) {
-        $module_name = ($artifact).Name
-        Write-Output "Repackaging $module_name"
-        Update-NugetPackage -TempRepoPath (Get-Item $Artifacts).FullName -ModuleName $module_name -DirPath $tmp"\"$module_name -NugetExe $NugetExe
-        Write-Output "Removing $tmp\$module_name"
-        Remove-Item -Recurse $tmp"\"$module_name -Force -ErrorAction Stop  
+        $artifactDir = ($artifact).Name
+        $tokens = $artifactDir.split(".")
+        if($tokens.length -gt 1) {
+            # Az.n.n.n.nuget or Az.module.n.n.n.nuget
+            if($tokens.length -gt 5) {
+                $module_name = $tokens[0]+"."+$tokens[1]
+            } else {
+                $module_name = $tokens[0]
+            }
+        } else {
+            $module_name = $artifactDir
+        }
+        Write-Output "Repackaging $module_name under $artifactDir"
+        Update-NugetPackage -TempRepoPath (Get-Item $Artifacts).FullName -ModuleName $module_name -DirPath $tmp"\"$artifactDir -NugetExe $NugetExe
     } 
 } catch {
     $Errors = $_