diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index f95f6b5f..87c37218 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!--
 Your feedback and support is greatly appreciated, thanks for contributing!
 
-Please prefix the issue title with the resource name, i.e. 'xDisk: Short description of my issue'
+Please prefix the issue title with the resource name, i.e. 'Disk: Short description of my issue'
 Please provide the following information regarding your issue (place N/A if the fields that don't apply to your issue):
 -->
 **Details of the scenario you tried and the problem that is occurring:**
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 051c2306..62fe5d56 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,8 @@
 <!--
 Thanks for submitting a Pull Request (PR) to this project. Your contribution to this project is greatly appreciated!
 
-Please prefix the PR title with the resource name, i.e. 'xDisk: My short description'
-If this is a breaking change, then also prefix the PR title with 'BREAKING CHANGE:', i.e. 'BREAKING CHANGE: xDisk: My short description'
+Please prefix the PR title with the resource name, i.e. 'Disk: My short description'
+If this is a breaking change, then also prefix the PR title with 'BREAKING CHANGE:', i.e. 'BREAKING CHANGE: Disk: My short description'
 
 To aid community reviewers in reviewing and merging your PR, please take the time to run through the below checklist.
 Change to [x] for each task in the task list that applies to this PR.
diff --git a/.gitignore b/.gitignore
index f9366636..a834ef1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,8 @@
 .sln
 DscResource.Tests
 DscResource.Tests/*
-Modules/xStorage/DscResource.Tests
-Modules/xStorage/DscResource.Tests/*
+Modules/StorageDsc/DscResource.Tests
+Modules/StorageDsc/DscResource.Tests/*
 node_modules
 node_modules/*
 markdownissues.txt
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1310545..294ddb9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 ## Unreleased
 
+## 4.0.0.0
+
+- BREAKING CHANGE:
+  - Renamed xStorage to StorageDsc
+  - Renamed MSFT_xDisk to MSFT_Disk
+  - Renamed MSFT_xDiskAccessPath to MSFT_DiskAccessPath
+  - Renamed MSFT_xMountImage to MSFT_MountImage
+  - Renamed MSFT_xOpticalDiskDriveLetter to MSFT_OpticalDiskDriveLetter
+  - Renamed MSFT_xWaitForDisk to MSFT_WaitForDisk
+  - Renamed MSFT_xWaitForVolume to MSFT_WaitforVolume
+  - Deleted xStorage folder under StorageDsc/Modules
+  - See [Issue 129](https://github.com/PowerShell/xStorage/issues/129)
+
 ## 3.4.0.0
 
 - xDisk:
@@ -13,7 +26,6 @@
   - Added new contexts to integration tests improve clarity.
   - Fix bug when size not specified and disk partitioned and
     formatted but not assigned to path - See [Issue 103](https://github.com/PowerShell/xStorage/issues/103).
-- Updated tests to meet Pester V4 guidelines - fixes [Issue #120](https://github.com/PowerShell/xStorage/issues/120).
 
 ## 3.3.0.0
 
@@ -41,6 +53,7 @@
   [issue #116](https://github.com/PowerShell/xStorage/issues/116).
 - Prevent unit tests from DSCResource.Tests from running during test
   execution - fixes [Issue #118](https://github.com/PowerShell/xStorage/issues/118).
+- Updated tests to meet Pester V4 guidelines - fixes [Issue #120](https://github.com/PowerShell/xStorage/issues/120).
 
 ## 3.2.0.0
 
diff --git a/Modules/xStorage/DSCResources/MSFT_xDisk/MSFT_xDisk.psm1 b/Modules/StorageDsc/DSCResources/MSFT_Disk/MSFT_Disk.psm1
similarity index 99%
rename from Modules/xStorage/DSCResources/MSFT_xDisk/MSFT_xDisk.psm1
rename to Modules/StorageDsc/DSCResources/MSFT_Disk/MSFT_Disk.psm1
index ca25277d..f66c9006 100644
--- a/Modules/xStorage/DSCResources/MSFT_xDisk/MSFT_xDisk.psm1
+++ b/Modules/StorageDsc/DSCResources/MSFT_Disk/MSFT_Disk.psm1
@@ -17,7 +17,7 @@ Import-Module -Name (Join-Path -Path $modulePath `
 
 # Import Localization Strings
 $localizedData = Get-LocalizedData `
-    -ResourceName 'MSFT_xDisk' `
+    -ResourceName 'MSFT_Disk' `
     -ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path)
 
 <#
diff --git a/Modules/xStorage/DSCResources/MSFT_xDisk/MSFT_xDisk.schema.mof b/Modules/StorageDsc/DSCResources/MSFT_Disk/MSFT_Disk.schema.mof
similarity index 93%
rename from Modules/xStorage/DSCResources/MSFT_xDisk/MSFT_xDisk.schema.mof
rename to Modules/StorageDsc/DSCResources/MSFT_Disk/MSFT_Disk.schema.mof
index 642c3ff8..0b0c77aa 100644
--- a/Modules/xStorage/DSCResources/MSFT_xDisk/MSFT_xDisk.schema.mof
+++ b/Modules/StorageDsc/DSCResources/MSFT_Disk/MSFT_Disk.schema.mof
@@ -1,6 +1,6 @@
 
-[ClassVersion("1.0.0.0"), FriendlyName("xDisk")]
-class MSFT_xDisk : OMI_BaseResource
+[ClassVersion("1.0.0.0"), FriendlyName("Disk")]
+class MSFT_Disk : OMI_BaseResource
 {
     [Key, Description("Specifies the identifier for which disk to modify.")] String DriveLetter;
     [Required, Description("Specifies the disk identifier for the disk to modify.")] String DiskId;
diff --git a/Modules/xStorage/DSCResources/MSFT_xDisk/README.md b/Modules/StorageDsc/DSCResources/MSFT_Disk/README.md
similarity index 100%
rename from Modules/xStorage/DSCResources/MSFT_xDisk/README.md
rename to Modules/StorageDsc/DSCResources/MSFT_Disk/README.md
diff --git a/Modules/xStorage/DSCResources/MSFT_xDisk/en-us/MSFT_xDisk.strings.psd1 b/Modules/StorageDsc/DSCResources/MSFT_Disk/en-us/MSFT_Disk.strings.psd1
similarity index 100%
rename from Modules/xStorage/DSCResources/MSFT_xDisk/en-us/MSFT_xDisk.strings.psd1
rename to Modules/StorageDsc/DSCResources/MSFT_Disk/en-us/MSFT_Disk.strings.psd1
diff --git a/Modules/xStorage/DSCResources/MSFT_xDiskAccessPath/MSFT_xDiskAccessPath.psm1 b/Modules/StorageDsc/DSCResources/MSFT_DiskAccessPath/MSFT_DiskAccessPath.psm1
similarity index 99%
rename from Modules/xStorage/DSCResources/MSFT_xDiskAccessPath/MSFT_xDiskAccessPath.psm1
rename to Modules/StorageDsc/DSCResources/MSFT_DiskAccessPath/MSFT_DiskAccessPath.psm1
index ca60ae01..724dd417 100644
--- a/Modules/xStorage/DSCResources/MSFT_xDiskAccessPath/MSFT_xDiskAccessPath.psm1
+++ b/Modules/StorageDsc/DSCResources/MSFT_DiskAccessPath/MSFT_DiskAccessPath.psm1
@@ -17,7 +17,7 @@ Import-Module -Name (Join-Path -Path $modulePath `
 
 # Import Localization Strings
 $localizedData = Get-LocalizedData `
-    -ResourceName 'MSFT_xDiskAccessPath' `
+    -ResourceName 'MSFT_DiskAccessPath' `
     -ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path)
 
 <#
diff --git a/Modules/xStorage/DSCResources/MSFT_xDiskAccessPath/MSFT_xDiskAccessPath.schema.mof b/Modules/StorageDsc/DSCResources/MSFT_DiskAccessPath/MSFT_DiskAccessPath.schema.mof
similarity index 88%
rename from Modules/xStorage/DSCResources/MSFT_xDiskAccessPath/MSFT_xDiskAccessPath.schema.mof
rename to Modules/StorageDsc/DSCResources/MSFT_DiskAccessPath/MSFT_DiskAccessPath.schema.mof
index 7e88a969..3e49fd07 100644
--- a/Modules/xStorage/DSCResources/MSFT_xDiskAccessPath/MSFT_xDiskAccessPath.schema.mof
+++ b/Modules/StorageDsc/DSCResources/MSFT_DiskAccessPath/MSFT_DiskAccessPath.schema.mof
@@ -1,6 +1,6 @@
 
-[ClassVersion("1.0.0.0"), FriendlyName("xDiskAccessPath")]
-class MSFT_xDiskAccessPath : OMI_BaseResource
+[ClassVersion("1.0.0.0"), FriendlyName("DiskAccessPath")]
+class MSFT_DiskAccessPath : OMI_BaseResource
 {
     [Key, Description("Specifies the access path folder to the assign the disk volume to.")] String AccessPath;
     [Required, Description("Specifies the disk identifier for the disk to modify.")] String DiskId;
diff --git a/Modules/xStorage/DSCResources/MSFT_xDiskAccessPath/README.md b/Modules/StorageDsc/DSCResources/MSFT_DiskAccessPath/README.md
similarity index 100%
rename from Modules/xStorage/DSCResources/MSFT_xDiskAccessPath/README.md
rename to Modules/StorageDsc/DSCResources/MSFT_DiskAccessPath/README.md
diff --git a/Modules/xStorage/DSCResources/MSFT_xDiskAccessPath/en-us/MSFT_xDiskAccessPath.strings.psd1 b/Modules/StorageDsc/DSCResources/MSFT_DiskAccessPath/en-us/MSFT_DiskAccessPath.strings.psd1
similarity index 100%
rename from Modules/xStorage/DSCResources/MSFT_xDiskAccessPath/en-us/MSFT_xDiskAccessPath.strings.psd1
rename to Modules/StorageDsc/DSCResources/MSFT_DiskAccessPath/en-us/MSFT_DiskAccessPath.strings.psd1
diff --git a/Modules/xStorage/DSCResources/MSFT_xMountImage/MSFT_xMountImage.psm1 b/Modules/StorageDsc/DSCResources/MSFT_MountImage/MSFT_MountImage.psm1
similarity index 99%
rename from Modules/xStorage/DSCResources/MSFT_xMountImage/MSFT_xMountImage.psm1
rename to Modules/StorageDsc/DSCResources/MSFT_MountImage/MSFT_MountImage.psm1
index 061857c4..eb41b7a6 100644
--- a/Modules/xStorage/DSCResources/MSFT_xMountImage/MSFT_xMountImage.psm1
+++ b/Modules/StorageDsc/DSCResources/MSFT_MountImage/MSFT_MountImage.psm1
@@ -19,7 +19,7 @@ Import-Module -Name (Join-Path -Path $modulePath `
 
 # Import Localization Strings
 $localizedData = Get-LocalizedData `
-    -ResourceName 'MSFT_xMountImage' `
+    -ResourceName 'MSFT_MountImage' `
     -ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path)
 
 <#
diff --git a/Modules/xStorage/DSCResources/MSFT_xMountImage/MSFT_xMountImage.schema.mof b/Modules/StorageDsc/DSCResources/MSFT_MountImage/MSFT_MountImage.schema.mof
similarity index 90%
rename from Modules/xStorage/DSCResources/MSFT_xMountImage/MSFT_xMountImage.schema.mof
rename to Modules/StorageDsc/DSCResources/MSFT_MountImage/MSFT_MountImage.schema.mof
index 84c67135..59ca6bbb 100644
--- a/Modules/xStorage/DSCResources/MSFT_xMountImage/MSFT_xMountImage.schema.mof
+++ b/Modules/StorageDsc/DSCResources/MSFT_MountImage/MSFT_MountImage.schema.mof
@@ -1,6 +1,6 @@
 
-[ClassVersion("1.0.0.0"), FriendlyName("xMountImage")]
-class MSFT_xMountImage : OMI_BaseResource
+[ClassVersion("1.0.0.0"), FriendlyName("MountImage")]
+class MSFT_MountImage : OMI_BaseResource
 {
     [Key, Description("Specifies the path of the VHD or ISO file.")] String ImagePath;
     [Write, Description("Specifies the drive letter to mount this VHD or ISO to.")] String DriveLetter;
diff --git a/Modules/xStorage/DSCResources/MSFT_xMountImage/README.md b/Modules/StorageDsc/DSCResources/MSFT_MountImage/README.md
similarity index 100%
rename from Modules/xStorage/DSCResources/MSFT_xMountImage/README.md
rename to Modules/StorageDsc/DSCResources/MSFT_MountImage/README.md
diff --git a/Modules/xStorage/DSCResources/MSFT_xMountImage/en-us/MSFT_xMountImage.strings.psd1 b/Modules/StorageDsc/DSCResources/MSFT_MountImage/en-us/MSFT_MountImage.strings.psd1
similarity index 100%
rename from Modules/xStorage/DSCResources/MSFT_xMountImage/en-us/MSFT_xMountImage.strings.psd1
rename to Modules/StorageDsc/DSCResources/MSFT_MountImage/en-us/MSFT_MountImage.strings.psd1
diff --git a/Modules/StorageDsc/DSCResources/MSFT_OpticalDiskDriveLetter/MSFT_OpticalDiskDriveLetter.psm1 b/Modules/StorageDsc/DSCResources/MSFT_OpticalDiskDriveLetter/MSFT_OpticalDiskDriveLetter.psm1
new file mode 100644
index 00000000..1248cb7f
--- /dev/null
+++ b/Modules/StorageDsc/DSCResources/MSFT_OpticalDiskDriveLetter/MSFT_OpticalDiskDriveLetter.psm1
@@ -0,0 +1,373 @@
+# Suppressed as per PSSA Rule Severity guidelines for unit/integration tests:
+# https://github.com/PowerShell/DscResources/blob/master/PSSARuleSeverities.md
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '')]
+param ()
+
+$modulePath = Join-Path -Path (Split-Path -Path (Split-Path -Path $PSScriptRoot -Parent) -Parent) -ChildPath 'Modules'
+
+# Import the Storage Common Modules
+Import-Module -Name (Join-Path -Path $modulePath `
+        -ChildPath (Join-Path -Path 'StorageDsc.Common' `
+            -ChildPath 'StorageDsc.Common.psm1'))
+
+# Import the Storage Resource Helper Module
+Import-Module -Name (Join-Path -Path $modulePath `
+        -ChildPath (Join-Path -Path 'StorageDsc.ResourceHelper' `
+            -ChildPath 'StorageDsc.ResourceHelper.psm1'))
+
+# Import Localization Strings
+$localizedData = Get-LocalizedData `
+    -ResourceName 'MSFT_OpticalDiskDriveLetter' `
+    -ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path)
+
+<#
+    .SYNOPSIS
+        This helper function returns a hashtable containing the current
+        drive letter assigned to the optical disk in the system matching
+        the disk number.
+
+        If the drive exists but is not mounted to a drive letter then
+        the DriveLetter will be empty, but the DeviceId will contain the
+        DeviceId representing the optical disk.
+
+        If there are no optical disks found in the system an exception
+        will be thrown.
+
+    .PARAMETER DiskId
+        Specifies the optical disk number for the disk to return the drive
+        letter of.
+
+    .NOTES
+        The Caption and DeviceID properties are checked to avoid
+        mounted ISO images in Windows 2012+ and Windows 10. The
+        device ID is required because a CD/DVD in a Hyper-V virtual
+        machine has the same caption as a mounted ISO.
+
+        Example DeviceID for a virtual drive in a Hyper-V VM - SCSI\CDROM&VEN_MSFT&PROD_VIRTUAL_DVD-ROM\000006
+        Example DeviceID for a mounted ISO   in a Hyper-V VM - SCSI\CDROM&VEN_MSFT&PROD_VIRTUAL_DVD-ROM\2&1F4ADFFE&0&000002
+#>
+function Get-OpticalDiskDriveLetter
+{
+    [CmdletBinding()]
+    [OutputType([System.Collections.Hashtable])]
+    param
+    (
+        [Parameter(Mandatory = $true)]
+        [System.String]
+        $DiskId
+    )
+
+    $driveLetter = $null
+
+    Write-Verbose -Message ( @(
+            "$($MyInvocation.MyCommand): "
+            $($localizedData.UsingGetCimInstanceToFetchDriveLetter -f $DiskId)
+        ) -join '' )
+
+    # Get the optical disk matching the Id
+    $opticalDisks = Get-CimInstance -ClassName Win32_CDROMDrive |
+        Where-Object -FilterScript {
+        -not (
+            $_.Caption -eq 'Microsoft Virtual DVD-ROM' -and
+            ($_.DeviceID.Split('\')[-1]).Length -gt 10
+        )
+    }
+
+    $deviceId = ''
+
+    if ($opticalDisks)
+    {
+        <#
+            To behave in a similar fashion to the other xStorage resources the
+            DiskId represents the number of the optical disk in the system.
+            However as these are returned as an array of 0..x elements then
+            subtract one from the DiskId to get the actual optical disk number
+            that is required.
+        #>
+        $opticalDisk = $opticalDisks[$DiskId - 1]
+
+        if ($opticalDisk)
+        {
+            try
+            {
+                # Make sure the current DriveLetter is an actual drive letter
+                $driveLetter = Assert-DriveLetterValid -DriveLetter $opticalDisk.Drive -Colon
+            }
+            catch
+            {
+                # Optical drive exists but is not mounted to a drive letter
+                $driveLetter = ''
+
+                Write-Verbose -Message ( @(
+                        "$($MyInvocation.MyCommand): "
+                        $($localizedData.OpticalDiskNotAssignedDriveLetter -f $DiskId)
+                    ) -join '' )
+            }
+            $deviceId = $opticalDisk.Drive
+        }
+    }
+
+    if ($null -eq $driveLetter)
+    {
+        New-InvalidArgumentException `
+            -Message ($localizedData.NoOpticalDiskDriveError -f $DiskId) `
+            -ArgumentName 'DiskId'
+    }
+
+    return @{
+        DriveLetter = $driveLetter
+        DeviceId    = $deviceId
+    }
+}
+
+<#
+    .SYNOPSIS
+        Returns the current drive letter assigned to the optical disk.
+
+    .PARAMETER DiskId
+        Specifies the optical disk number for the disk to assign the drive
+        letter to.
+
+    .PARAMETER DriveLetter
+        Specifies the drive letter to assign to the optical disk. Can be a
+        single letter, optionally followed by a colon. This value is ignored
+        if Ensure is set to Absent.
+#>
+function Get-TargetResource
+{
+    [CmdletBinding()]
+    [OutputType([System.Collections.Hashtable])]
+    param
+    (
+        [Parameter(Mandatory = $true)]
+        [System.String]
+        $DiskId,
+
+        [Parameter(Mandatory = $true)]
+        [System.String]
+        $DriveLetter
+    )
+
+    $ensure = 'Absent'
+
+    # Get the drive letter assigned to the optical disk
+    $currentDriveInfo = Get-OpticalDiskDriveLetter -DiskId $DiskId
+    $currentDriveLetter = $currentDriveInfo.DriveLetter
+
+    if ([System.String]::IsNullOrWhiteSpace($currentDriveLetter))
+    {
+        Write-Verbose -Message ( @(
+                "$($MyInvocation.MyCommand): "
+                $($localizedData.OpticalDiskNotAssignedDriveLetter -f $DiskId)
+            ) -join '' )
+    }
+    else
+    {
+        Write-Verbose -Message ( @(
+                "$($MyInvocation.MyCommand): "
+                $($localizedData.OpticalDiskAssignedDriveLetter -f $DiskId, $DriveLetter)
+            ) -join '' )
+
+        $Ensure = 'Present'
+    }
+
+    $returnValue += @{
+        DiskId      = $DiskId
+        DriveLetter = $currentDriveLetter
+        Ensure      = $ensure
+    }
+
+    return $returnValue
+} # Get-TargetResource
+
+<#
+    .SYNOPSIS
+        Sets the drive letter of an optical disk.
+
+    .PARAMETER DiskId
+        Specifies the optical disk number for the disk to assign the drive
+        letter to.
+
+    .PARAMETER DriveLetter
+        Specifies the drive letter to assign to the optical disk. Can be a
+        single letter, optionally followed by a colon. This value is ignored
+        if Ensure is set to Absent.
+
+    .PARAMETER Ensure
+        Determines whether a drive letter should be assigned to the
+        optical disk. Defaults to 'Present'.
+#>
+function Set-TargetResource
+{
+    [CmdletBinding()]
+    param
+    (
+        [Parameter(Mandatory = $true)]
+        [System.String]
+        $DiskId,
+
+        [Parameter(Mandatory = $true)]
+        [System.String]
+        $DriveLetter,
+
+        [Parameter()]
+        [ValidateSet('Present', 'Absent')]
+        [System.String]
+        $Ensure = 'Present'
+    )
+
+    # Allow use of drive letter without colon
+    $DriveLetter = Assert-DriveLetterValid -DriveLetter $DriveLetter -Colon
+
+    # Get the drive letter assigned to the optical disk
+    $currentDriveInfo = Get-OpticalDiskDriveLetter -DiskId $DiskId
+    $currentDriveLetter = $currentDriveInfo.DriveLetter
+
+    if ([System.String]::IsNullOrWhiteSpace($currentDriveLetter))
+    {
+        <#
+            If the current drive letter is empty then the volume must be looked up by DeviceId
+            The DeviceId in the volume will show as \\?\Volume{bba1802b-e7a1-11e3-824e-806e6f6e6963}\
+            So we need to change the currentDriveLetter to match this value when we set the drive letter
+        #>
+        $deviceId = $currentDriveInfo.DeviceId
+
+        $volume = Get-CimInstance `
+            -ClassName Win32_Volume `
+            -Filter "DeviceId = '\\\\?\\$deviceId\\'"
+    }
+    else
+    {
+        $volume = Get-CimInstance `
+            -ClassName Win32_Volume `
+            -Filter "DriveLetter = '$currentDriveLetter'"
+    }
+
+    # Does the Drive Letter need to be added or removed
+    if ($Ensure -eq 'Absent')
+    {
+        Write-Verbose -Message ( @(
+            "$($MyInvocation.MyCommand): "
+            $($localizedData.AttemptingToRemoveDriveLetter -f $diskId, $currentDriveLetter)
+        ) -join '' )
+
+        $volume | Set-CimInstance -Property @{ DriveLetter = $null }
+    }
+    else
+    {
+        Write-Verbose -Message ( @(
+            "$($MyInvocation.MyCommand): "
+            $($localizedData.AttemptingToSetDriveLetter -f $diskId, $currentDriveLetter, $DriveLetter)
+        ) -join '' )
+
+        $volume | Set-CimInstance -Property @{ DriveLetter = $DriveLetter }
+    }
+} # Set-TargetResource
+
+<#
+    .SYNOPSIS
+        Tests the disk letter assigned to an optical disk is correct.
+
+    .PARAMETER DiskId
+        Specifies the optical disk number for the disk to assign the drive
+        letter to.
+
+    .PARAMETER DriveLetter
+        Specifies the drive letter to assign to the optical disk. Can be a
+        single letter, optionally followed by a colon. This value is ignored
+        if Ensure is set to Absent.
+
+    .PARAMETER Ensure
+        Determines whether a drive letter should be assigned to the
+        optical disk. Defaults to 'Present'.
+#>
+function Test-TargetResource
+{
+    [CmdletBinding()]
+    [OutputType([System.Boolean])]
+    param
+    (
+        [Parameter(Mandatory = $true)]
+        [System.String]
+        $DiskId,
+
+        [Parameter(Mandatory = $true)]
+        [System.String]
+        $DriveLetter,
+
+        [Parameter()]
+        [ValidateSet('Present', 'Absent')]
+        [System.String]
+        $Ensure = 'Present'
+    )
+
+    $desiredConfigurationMatch = $true
+
+    # Allow use of drive letter without colon
+    $DriveLetter = Assert-DriveLetterValid -DriveLetter $DriveLetter -Colon
+
+    # Get the drive letter assigned to the optical disk
+    $currentDriveInfo = Get-OpticalDiskDriveLetter -DiskId $DiskId
+    $currentDriveLetter = $currentDriveInfo.DriveLetter
+
+    if ($Ensure -eq 'Absent')
+    {
+        # The Drive Letter should be absent from the optical disk
+        if ([System.String]::IsNullOrWhiteSpace($currentDriveLetter))
+        {
+            Write-Verbose -Message ( @(
+                    "$($MyInvocation.MyCommand): "
+                    $($localizedData.DriveLetterDoesNotExistAndShouldNot -f $DiskId)
+                ) -join '' )
+        }
+        else
+        {
+            # The Drive Letter needs to be dismounted
+            Write-Verbose -Message ( @(
+                    "$($MyInvocation.MyCommand): "
+                    $($localizedData.DriveLetterExistsButShouldNot -f $DiskId, $currentDriveLetter)
+                ) -join '' )
+
+            $desiredConfigurationMatch = $false
+        }
+    }
+    else
+    {
+        if ($currentDriveLetter -eq $DriveLetter)
+        {
+            # The optical disk drive letter is already set correctly
+            Write-Verbose -Message ( @(
+                    "$($MyInvocation.MyCommand): "
+                    $($localizedData.DriverLetterExistsAndIsCorrect -f $DiskId, $DriveLetter)
+                ) -join '' )
+        }
+        else
+        {
+            # Is a desired drive letter already assigned to a different drive?
+            $existingVolume = Get-CimInstance `
+                -ClassName Win32_Volume `
+                -Filter "DriveLetter = '$DriveLetter'"
+
+            if ($existingVolume)
+            {
+                # The desired drive letter is already assigned to another drive - can't proceed
+                New-InvalidOperationException `
+                    -Message $($localizedData.DriveLetterAssignedToAnotherDrive -f $DriveLetter)
+            }
+            else
+            {
+                # The optical drive letter needs to be changed
+                Write-Verbose -Message ( @(
+                        "$($MyInvocation.MyCommand): "
+                        $($localizedData.DriverLetterExistsAndIsNotCorrect -f $DiskId, $currentDriveLetter, $DriveLetter)
+                    ) -join '' )
+
+                $desiredConfigurationMatch = $false
+            }
+        }
+    }
+
+    return $desiredConfigurationMatch
+}
+
+Export-ModuleMember -Function *-TargetResource
diff --git a/Modules/StorageDsc/DSCResources/MSFT_OpticalDiskDriveLetter/MSFT_OpticalDiskDriveLetter.schema.mof b/Modules/StorageDsc/DSCResources/MSFT_OpticalDiskDriveLetter/MSFT_OpticalDiskDriveLetter.schema.mof
new file mode 100644
index 00000000..14fa0649
--- /dev/null
+++ b/Modules/StorageDsc/DSCResources/MSFT_OpticalDiskDriveLetter/MSFT_OpticalDiskDriveLetter.schema.mof
@@ -0,0 +1,8 @@
+
+[ClassVersion("1.0.0.0"), FriendlyName("OpticalDiskDriveLetter")]
+class MSFT_OpticalDiskDriveLetter : OMI_BaseResource
+{
+    [Key, Description("Specifies the optical disk number for the disk to assign the drive letter to.")] String DiskId;
+    [Required, Description("Specifies the drive letter to assign to the optical disk. Can be a single letter, optionally followed by a colon. This value is ignored if Ensure is set to Absent.")] String DriveLetter;
+    [Write, Description("Determines whether a drive letter should be assigned to the optical disk. Defaults to 'Present'."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
+};
diff --git a/Modules/StorageDsc/DSCResources/MSFT_OpticalDiskDriveLetter/README.md b/Modules/StorageDsc/DSCResources/MSFT_OpticalDiskDriveLetter/README.md
new file mode 100644
index 00000000..9df3ce47
--- /dev/null
+++ b/Modules/StorageDsc/DSCResources/MSFT_OpticalDiskDriveLetter/README.md
@@ -0,0 +1,36 @@
+# Description
+
+The resource is used to set the drive letter of an optical disk drive (e.g.
+a CDROM or DVD drive).
+
+It can be used to set the drive letter of a specific optical disk drive if
+there are multiple in the system by specifying a value greater than 1 for
+the `DiskId` parameter.
+
+In a system with a single optical disk drive then the `DiskId` should
+be set to 1.
+
+In systems with multiple optical disks, the `DiskId` should be set to
+the ordinal number of the required optical disk found in the list
+returned when executing the following cmdlet:
+
+```powershell
+Get-CimInstance -ClassName Win32_CDROMDrive
+```
+
+Warning: Adding and removing optical drive devices to a system may cause the
+order the optical drives appear in the system to change. Therefore, the
+drive ordinal number may be affected in these situations.
+
+It is designed to ignore _temporary_ optical disk drives that are created
+when mounting ISOs on Windows Server 2012+.
+
+With the Device ID, we look for the length of the string after the final
+backslash (crude, but appears to work so far).
+
+Example:
+    # DeviceID for a virtual drive in a Hyper-V VM
+        SCSI\CDROM&VEN_MSFT&PROD_VIRTUAL_DVD-ROM\**000006**
+
+    # DeviceID for a mounted ISO   in a Hyper-V VM
+        SCSI\CDROM&VEN_MSFT&PROD_VIRTUAL_DVD-ROM\**2&1F4ADFFE&0&000002**
diff --git a/Modules/StorageDsc/DSCResources/MSFT_OpticalDiskDriveLetter/en-us/MSFT_OpticalDiskDriveLetter.strings.psd1 b/Modules/StorageDsc/DSCResources/MSFT_OpticalDiskDriveLetter/en-us/MSFT_OpticalDiskDriveLetter.strings.psd1
new file mode 100644
index 00000000..0760466b
--- /dev/null
+++ b/Modules/StorageDsc/DSCResources/MSFT_OpticalDiskDriveLetter/en-us/MSFT_OpticalDiskDriveLetter.strings.psd1
@@ -0,0 +1,15 @@
+ConvertFrom-StringData @'
+    UsingGetCimInstanceToFetchDriveLetter = Using Get-CimInstance to get the drive letter of optical disk {0} in the system.
+    OpticalDiskAssignedDriveLetter = The optical disk {0} is currently assigned drive letter '{1}'.
+    OpticalDiskNotAssignedDriveLetter = The optical disk {0} is not currently assigned a drive letter.
+    NoOpticalDiskDriveError = The optical disk {0} could not be found in the system, so this resource has nothing to do. This resource does not change the drive letter of mounted ISOs.
+
+    AttemptingToSetDriveLetter = The optical disk {0} drive letter is '{1}', attempting to set to '{2}'.
+    AttemptingToRemoveDriveLetter = The optical disk {0} drive letter is '{1}', attempting to remove it.
+
+    DriveLetterDoesNotExistAndShouldNot = The optical disk {0} does not have a drive letter assigned. Change not required.
+    DriveLetterExistsButShouldNot = The optical disk {0} is assigned the drive letter '{1}' which should be removed. Change required.
+    DriverLetterExistsAndIsCorrect = The optical disk {0} is assigned the drive letter '{1}' which is correct. Change not required.
+    DriveLetterAssignedToAnotherDrive = Drive letter '{0}' is already present but assigned to a another volume. Change can not proceed.
+    DriverLetterExistsAndIsNotCorrect = The optical disk {0} is assigned the drive letter '{1}' but should be '{2}'. Change required.
+'@
diff --git a/Modules/xStorage/DSCResources/MSFT_xWaitForDisk/MSFT_xWaitForDisk.psm1 b/Modules/StorageDsc/DSCResources/MSFT_WaitForDisk/MSFT_WaitForDisk.psm1
similarity index 99%
rename from Modules/xStorage/DSCResources/MSFT_xWaitForDisk/MSFT_xWaitForDisk.psm1
rename to Modules/StorageDsc/DSCResources/MSFT_WaitForDisk/MSFT_WaitForDisk.psm1
index 93b5c07d..e18a71ff 100644
--- a/Modules/xStorage/DSCResources/MSFT_xWaitForDisk/MSFT_xWaitForDisk.psm1
+++ b/Modules/StorageDsc/DSCResources/MSFT_WaitForDisk/MSFT_WaitForDisk.psm1
@@ -17,7 +17,7 @@ Import-Module -Name (Join-Path -Path $modulePath `
 
 # Import Localization Strings
 $localizedData = Get-LocalizedData `
-    -ResourceName 'MSFT_xWaitForDisk' `
+    -ResourceName 'MSFT_WaitForDisk' `
     -ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path)
 
 <#
diff --git a/Modules/xStorage/DSCResources/MSFT_xWaitForDisk/MSFT_xWaitForDisk.schema.mof b/Modules/StorageDsc/DSCResources/MSFT_WaitForDisk/MSFT_WaitForDisk.schema.mof
similarity index 84%
rename from Modules/xStorage/DSCResources/MSFT_xWaitForDisk/MSFT_xWaitForDisk.schema.mof
rename to Modules/StorageDsc/DSCResources/MSFT_WaitForDisk/MSFT_WaitForDisk.schema.mof
index 078a2d6a..ed998fbb 100644
--- a/Modules/xStorage/DSCResources/MSFT_xWaitForDisk/MSFT_xWaitForDisk.schema.mof
+++ b/Modules/StorageDsc/DSCResources/MSFT_WaitForDisk/MSFT_WaitForDisk.schema.mof
@@ -1,6 +1,6 @@
 
-[ClassVersion("1.0.0.0"), FriendlyName("xWaitForDisk")]
-class MSFT_xWaitForDisk : OMI_BaseResource
+[ClassVersion("1.0.0.0"), FriendlyName("WaitForDisk")]
+class MSFT_WaitForDisk : OMI_BaseResource
 {
     [Key, Description("Specifies the disk identifier for the disk to wait for.")] String DiskId;
     [Write, Description("Specifies the identifier type the DiskId contains. Defaults to Number."), ValueMap{"Number","UniqueId","Guid"}, Values{"Number","UniqueId","Guid"}] String DiskIdType;
diff --git a/Modules/xStorage/DSCResources/MSFT_xWaitForDisk/README.md b/Modules/StorageDsc/DSCResources/MSFT_WaitForDisk/README.md
similarity index 100%
rename from Modules/xStorage/DSCResources/MSFT_xWaitForDisk/README.md
rename to Modules/StorageDsc/DSCResources/MSFT_WaitForDisk/README.md
diff --git a/Modules/xStorage/DSCResources/MSFT_xWaitForDisk/en-us/MSFT_xWaitForDisk.strings.psd1 b/Modules/StorageDsc/DSCResources/MSFT_WaitForDisk/en-us/MSFT_WaitForDisk.strings.psd1
similarity index 100%
rename from Modules/xStorage/DSCResources/MSFT_xWaitForDisk/en-us/MSFT_xWaitForDisk.strings.psd1
rename to Modules/StorageDsc/DSCResources/MSFT_WaitForDisk/en-us/MSFT_WaitForDisk.strings.psd1
diff --git a/Modules/xStorage/DSCResources/MSFT_xWaitForVolume/MSFT_xWaitForVolume.psm1 b/Modules/StorageDsc/DSCResources/MSFT_WaitForVolume/MSFT_WaitForVolume.psm1
similarity index 99%
rename from Modules/xStorage/DSCResources/MSFT_xWaitForVolume/MSFT_xWaitForVolume.psm1
rename to Modules/StorageDsc/DSCResources/MSFT_WaitForVolume/MSFT_WaitForVolume.psm1
index eafb9d3b..5e8d6cb1 100644
--- a/Modules/xStorage/DSCResources/MSFT_xWaitForVolume/MSFT_xWaitForVolume.psm1
+++ b/Modules/StorageDsc/DSCResources/MSFT_WaitForVolume/MSFT_WaitForVolume.psm1
@@ -17,7 +17,7 @@ Import-Module -Name (Join-Path -Path $modulePath `
 
 # Import Localization Strings
 $localizedData = Get-LocalizedData `
-    -ResourceName 'MSFT_xWaitForVolume' `
+    -ResourceName 'MSFT_WaitForVolume' `
     -ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path)
 
 <#
diff --git a/Modules/xStorage/DSCResources/MSFT_xWaitForVolume/MSFT_xWaitForVolume.schema.mof b/Modules/StorageDsc/DSCResources/MSFT_WaitForVolume/MSFT_WaitForVolume.schema.mof
similarity index 77%
rename from Modules/xStorage/DSCResources/MSFT_xWaitForVolume/MSFT_xWaitForVolume.schema.mof
rename to Modules/StorageDsc/DSCResources/MSFT_WaitForVolume/MSFT_WaitForVolume.schema.mof
index 5c2fce88..2eada751 100644
--- a/Modules/xStorage/DSCResources/MSFT_xWaitForVolume/MSFT_xWaitForVolume.schema.mof
+++ b/Modules/StorageDsc/DSCResources/MSFT_WaitForVolume/MSFT_WaitForVolume.schema.mof
@@ -1,6 +1,6 @@
 
-[ClassVersion("1.0.0.0"), FriendlyName("xWaitForVolume")]
-class MSFT_xWaitForVolume : OMI_BaseResource
+[ClassVersion("1.0.0.0"), FriendlyName("WaitForVolume")]
+class MSFT_WaitForVolume : OMI_BaseResource
 {
     [Key, Description("Specifies the drive letter of the volume to wait for.")] String DriveLetter;
     [Write, Description("Specifies the number of seconds to wait for the volume to become available.")] Uint32 RetryIntervalSec;
diff --git a/Modules/xStorage/DSCResources/MSFT_xWaitForVolume/README.md b/Modules/StorageDsc/DSCResources/MSFT_WaitForVolume/README.md
similarity index 100%
rename from Modules/xStorage/DSCResources/MSFT_xWaitForVolume/README.md
rename to Modules/StorageDsc/DSCResources/MSFT_WaitForVolume/README.md
diff --git a/Modules/xStorage/DSCResources/MSFT_xWaitForVolume/en-us/MSFT_xWaitForVolume.strings.psd1 b/Modules/StorageDsc/DSCResources/MSFT_WaitForVolume/en-us/MSFT_WaitForVolume.strings.psd1
similarity index 100%
rename from Modules/xStorage/DSCResources/MSFT_xWaitForVolume/en-us/MSFT_xWaitForVolume.strings.psd1
rename to Modules/StorageDsc/DSCResources/MSFT_WaitForVolume/en-us/MSFT_WaitForVolume.strings.psd1
diff --git a/Modules/xStorage/Examples/Resources/xDisk/1-xDisk_InitializeDataDisk.ps1 b/Modules/StorageDsc/Examples/Resources/Disk/1-Disk_InitializeDataDisk.ps1
similarity index 76%
rename from Modules/xStorage/Examples/Resources/xDisk/1-xDisk_InitializeDataDisk.ps1
rename to Modules/StorageDsc/Examples/Resources/Disk/1-Disk_InitializeDataDisk.ps1
index 3beb4af9..03d2fd13 100644
--- a/Modules/xStorage/Examples/Resources/xDisk/1-xDisk_InitializeDataDisk.ps1
+++ b/Modules/StorageDsc/Examples/Resources/Disk/1-Disk_InitializeDataDisk.ps1
@@ -6,49 +6,48 @@
 #>
 Configuration Example
 {
-
-    Import-DSCResource -ModuleName xStorage
+    Import-DSCResource -ModuleName StorageDsc
 
     Node localhost
     {
-        xWaitforDisk Disk2
+        WaitForDisk Disk2
         {
              DiskId = 2
              RetryIntervalSec = 60
              RetryCount = 60
         }
 
-        xDisk GVolume
+        Disk GVolume
         {
              DiskId = 2
              DriveLetter = 'G'
              Size = 10GB
-             DependsOn = '[xWaitForDisk]Disk2'
+             DependsOn = '[WaitForDisk]Disk2'
         }
 
-        xDisk JVolume
+        Disk JVolume
         {
              DiskId = 2
              DriveLetter = 'J'
              FSLabel = 'Data'
-             DependsOn = '[xDisk]GVolume'
+             DependsOn = '[Disk]GVolume'
         }
 
-        xWaitforDisk Disk3
+        WaitForDisk Disk3
         {
              DiskId = 3
              RetryIntervalSec = 60
              RetryCount = 60
         }
 
-        xDisk SVolume
+        Disk SVolume
         {
              DiskId = 3
              DriveLetter = 'S'
              Size = 100GB
              FSFormat = 'ReFS'
              AllocationUnitSize = 64KB
-             DependsOn = '[xWaitForDisk]Disk3'
+             DependsOn = '[WaitForDisk]Disk3'
         }
     }
 }
diff --git a/Modules/xStorage/Examples/Resources/xDisk/2-xDisk_InitializeDataDiskUsingUniqueId.ps1 b/Modules/StorageDsc/Examples/Resources/Disk/2-Disk_InitializeDataDiskUsingUniqueId.ps1
similarity index 83%
rename from Modules/xStorage/Examples/Resources/xDisk/2-xDisk_InitializeDataDiskUsingUniqueId.ps1
rename to Modules/StorageDsc/Examples/Resources/Disk/2-Disk_InitializeDataDiskUsingUniqueId.ps1
index 037c39ae..7294ffd2 100644
--- a/Modules/xStorage/Examples/Resources/xDisk/2-xDisk_InitializeDataDiskUsingUniqueId.ps1
+++ b/Modules/StorageDsc/Examples/Resources/Disk/2-Disk_InitializeDataDiskUsingUniqueId.ps1
@@ -7,12 +7,11 @@
 #>
 Configuration Example
 {
-
-    Import-DSCResource -ModuleName xStorage
+    Import-DSCResource -ModuleName StorageDsc
 
     Node localhost
     {
-        xWaitforDisk Disk2
+        WaitForDisk Disk2
         {
              DiskId = '5E1E50A401000000001517FFFF0AEB84' # Disk 2
              DiskIdType = 'UniqueId'
@@ -20,25 +19,25 @@ Configuration Example
              RetryCount = 60
         }
 
-        xDisk GVolume
+        Disk GVolume
         {
              DiskId = '5E1E50A401000000001517FFFF0AEB84' # Disk 2
              DiskIdType = 'UniqueId'
              DriveLetter = 'G'
              Size = 10GB
-             DependsOn = '[xWaitForDisk]Disk2'
+             DependsOn = '[WaitForDisk]Disk2'
         }
 
-        xDisk JVolume
+        Disk JVolume
         {
              DiskId = '5E1E50A401000000001517FFFF0AEB84' # Disk 2
              DiskIdType = 'UniqueId'
              DriveLetter = 'J'
              FSLabel = 'Data'
-             DependsOn = '[xDisk]GVolume'
+             DependsOn = '[Disk]GVolume'
         }
 
-        xWaitforDisk Disk3
+        WaitForDisk Disk3
         {
              DiskId = '5E1E50A4010000000029AB39450AC9A5' # Disk 3
              DiskIdType = 'UniqueId'
@@ -46,7 +45,7 @@ Configuration Example
              RetryCount = 60
         }
 
-        xDisk SVolume
+        Disk SVolume
         {
              DiskId = '5E1E50A4010000000029AB39450AC9A5' # Disk 3
              DiskIdType = 'UniqueId'
@@ -54,7 +53,7 @@ Configuration Example
              Size = 100GB
              FSFormat = 'ReFS'
              AllocationUnitSize = 64KB
-             DependsOn = '[xWaitForDisk]Disk3'
+             DependsOn = '[WaitForDisk]Disk3'
         }
     }
 }
diff --git a/Modules/xStorage/Examples/Resources/xWaitForDisk/2-xWaitForDisk_InitializeDataDiskWithAccessPath.ps1 b/Modules/StorageDsc/Examples/Resources/DiskAccessPath/1-DiskAccessPath_InitializeDataDiskWithAccessPath.ps1
similarity index 74%
rename from Modules/xStorage/Examples/Resources/xWaitForDisk/2-xWaitForDisk_InitializeDataDiskWithAccessPath.ps1
rename to Modules/StorageDsc/Examples/Resources/DiskAccessPath/1-DiskAccessPath_InitializeDataDiskWithAccessPath.ps1
index 37777302..30acce6c 100644
--- a/Modules/xStorage/Examples/Resources/xWaitForDisk/2-xWaitForDisk_InitializeDataDiskWithAccessPath.ps1
+++ b/Modules/StorageDsc/Examples/Resources/DiskAccessPath/1-DiskAccessPath_InitializeDataDiskWithAccessPath.ps1
@@ -6,33 +6,32 @@
 #>
 Configuration Example
 {
-
-    Import-DSCResource -ModuleName xStorage
+    Import-DSCResource -ModuleName StorageDsc
 
     Node localhost
     {
-        xWaitforDisk Disk2
+        WaitForDisk Disk2
         {
              DiskId = 2
              RetryIntervalSec = 60
              RetryCount = 60
         }
 
-        xDiskAccessPath DataVolume
+        DiskAccessPath DataVolume
         {
              DiskId = 2
              AccessPath = 'c:\SQLData'
              Size = 10GB
              FSLabel = 'SQLData1'
-             DependsOn = '[xWaitForDisk]Disk2'
+             DependsOn = '[WaitForDisk]Disk2'
         }
 
-        xDiskAccessPath LogVolume
+        DiskAccessPath LogVolume
         {
              DiskId = 2
              AccessPath = 'c:\SQLLog'
              FSLabel = 'SQLLog1'
-             DependsOn = '[xDiskAccessPath]DataVolume'
+             DependsOn = '[DiskAccessPath]DataVolume'
         }
     }
 }
diff --git a/Modules/xStorage/Examples/Resources/xDiskAccessPath/2-xDiskAccessPath_InitializeDataDiskWithAccessPathUsingUniqueId.ps1 b/Modules/StorageDsc/Examples/Resources/DiskAccessPath/2-DiskAccessPath_InitializeDataDiskWithAccessPathUsingUniqueId.ps1
similarity index 80%
rename from Modules/xStorage/Examples/Resources/xDiskAccessPath/2-xDiskAccessPath_InitializeDataDiskWithAccessPathUsingUniqueId.ps1
rename to Modules/StorageDsc/Examples/Resources/DiskAccessPath/2-DiskAccessPath_InitializeDataDiskWithAccessPathUsingUniqueId.ps1
index 9b309672..008cc523 100644
--- a/Modules/xStorage/Examples/Resources/xDiskAccessPath/2-xDiskAccessPath_InitializeDataDiskWithAccessPathUsingUniqueId.ps1
+++ b/Modules/StorageDsc/Examples/Resources/DiskAccessPath/2-DiskAccessPath_InitializeDataDiskWithAccessPathUsingUniqueId.ps1
@@ -6,12 +6,11 @@
 #>
 Configuration Example
 {
-
-    Import-DSCResource -ModuleName xStorage
+    Import-DSCResource -ModuleName StorageDsc
 
     Node localhost
     {
-        xWaitforDisk Disk2
+        WaitForDisk Disk2
         {
              DiskId = '5E1E50A401000000001517FFFF0AEB84' # Disk 2
              DiskIdType = 'UniqueId'
@@ -19,23 +18,23 @@ Configuration Example
              RetryCount = 60
         }
 
-        xDiskAccessPath DataVolume
+        DiskAccessPath DataVolume
         {
              DiskId = '5E1E50A401000000001517FFFF0AEB84' # Disk 2
              DiskIdType = 'UniqueId'
              AccessPath = 'c:\SQLData'
              Size = 10GB
              FSLabel = 'SQLData1'
-             DependsOn = '[xWaitForDisk]Disk2'
+             DependsOn = '[WaitForDisk]Disk2'
         }
 
-        xDiskAccessPath LogVolume
+        DiskAccessPath LogVolume
         {
              DiskId = '5E1E50A401000000001517FFFF0AEB84' # Disk 2
              DiskIdType = 'UniqueId'
              AccessPath = 'c:\SQLLog'
              FSLabel = 'SQLLog1'
-             DependsOn = '[xDiskAccessPath]DataVolume'
+             DependsOn = '[DiskAccessPath]DataVolume'
         }
     }
 }
diff --git a/Modules/xStorage/Examples/Resources/xMountImage/1-xMountImage_DismountISO.ps1 b/Modules/StorageDsc/Examples/Resources/MountImage/1-MountImage_DismountISO.ps1
similarity index 77%
rename from Modules/xStorage/Examples/Resources/xMountImage/1-xMountImage_DismountISO.ps1
rename to Modules/StorageDsc/Examples/Resources/MountImage/1-MountImage_DismountISO.ps1
index d92bdb5a..a033c254 100644
--- a/Modules/xStorage/Examples/Resources/xMountImage/1-xMountImage_DismountISO.ps1
+++ b/Modules/StorageDsc/Examples/Resources/MountImage/1-MountImage_DismountISO.ps1
@@ -4,8 +4,9 @@
 #>
 configuration Example
 {
-    Import-DscResource -ModuleName xStorage
-    xMountImage ISO
+    Import-DscResource -ModuleName StorageDsc
+
+    MountImage ISO
     {
         ImagePath = 'c:\Sources\SQL.iso'
         DriveLetter = 'S'
diff --git a/Modules/xStorage/Examples/Resources/xWaitForVolume/2-xWaitForVolume_ISO.ps1 b/Modules/StorageDsc/Examples/Resources/MountImage/2-MountImage_MountISO.ps1
similarity index 75%
rename from Modules/xStorage/Examples/Resources/xWaitForVolume/2-xWaitForVolume_ISO.ps1
rename to Modules/StorageDsc/Examples/Resources/MountImage/2-MountImage_MountISO.ps1
index 897459ce..d264d9eb 100644
--- a/Modules/xStorage/Examples/Resources/xWaitForVolume/2-xWaitForVolume_ISO.ps1
+++ b/Modules/StorageDsc/Examples/Resources/MountImage/2-MountImage_MountISO.ps1
@@ -4,14 +4,15 @@
 #>
 configuration Example
 {
-    Import-DscResource -ModuleName xStorage
-    xMountImage ISO
+    Import-DscResource -ModuleName StorageDsc
+
+    MountImage ISO
     {
         ImagePath   = 'c:\Sources\SQL.iso'
         DriveLetter = 'S'
     }
 
-    xWaitForVolume WaitForISO
+    WaitForVolume WaitForISO
     {
         DriveLetter      = 'S'
         RetryIntervalSec = 5
diff --git a/Modules/xStorage/Examples/Resources/xMountImage/3-xMountImage_MountVHD.ps1 b/Modules/StorageDsc/Examples/Resources/MountImage/3-MountImage_MountVHD.ps1
similarity index 75%
rename from Modules/xStorage/Examples/Resources/xMountImage/3-xMountImage_MountVHD.ps1
rename to Modules/StorageDsc/Examples/Resources/MountImage/3-MountImage_MountVHD.ps1
index e8291814..2a757846 100644
--- a/Modules/xStorage/Examples/Resources/xMountImage/3-xMountImage_MountVHD.ps1
+++ b/Modules/StorageDsc/Examples/Resources/MountImage/3-MountImage_MountVHD.ps1
@@ -4,14 +4,15 @@
 #>
 configuration Example
 {
-    Import-DscResource -ModuleName xStorage
-    xMountImage MountVHD
+    Import-DscResource -ModuleName StorageDsc
+
+    MountImage MountVHD
     {
         ImagePath   = 'd:\Data\Disk1.vhd'
         DriveLetter = 'V'
     }
 
-    xWaitForVolume WaitForVHD
+    WaitForVolume WaitForVHD
     {
         DriveLetter      = 'V'
         RetryIntervalSec = 5
diff --git a/Modules/StorageDsc/Examples/Resources/OpticalDiskDriveLetter/1-OpticalDiskDriveLetter_SetDriveLetter.ps1 b/Modules/StorageDsc/Examples/Resources/OpticalDiskDriveLetter/1-OpticalDiskDriveLetter_SetDriveLetter.ps1
new file mode 100644
index 00000000..8564a3c6
--- /dev/null
+++ b/Modules/StorageDsc/Examples/Resources/OpticalDiskDriveLetter/1-OpticalDiskDriveLetter_SetDriveLetter.ps1
@@ -0,0 +1,18 @@
+<#
+    .EXAMPLE
+        This configuration will set the drive letter of the first
+        optical disk drive in the system to 'Z'.
+#>
+Configuration Example
+{
+    Import-DSCResource -ModuleName StorageDsc
+
+    Node localhost
+    {
+        OpticalDiskDriveLetter SetFirstOpticalDiskDriveLetterToZ
+        {
+            DiskId      = 1
+            DriveLetter = 'Z'
+        }
+    }
+}
diff --git a/Modules/StorageDsc/Examples/Resources/OpticalDiskDriveLetter/2-OpticalDiskDriveLetter_RemoveDriveLetter.ps1 b/Modules/StorageDsc/Examples/Resources/OpticalDiskDriveLetter/2-OpticalDiskDriveLetter_RemoveDriveLetter.ps1
new file mode 100644
index 00000000..6b9bf294
--- /dev/null
+++ b/Modules/StorageDsc/Examples/Resources/OpticalDiskDriveLetter/2-OpticalDiskDriveLetter_RemoveDriveLetter.ps1
@@ -0,0 +1,19 @@
+<#
+    .EXAMPLE
+        This configuration will remove the drive letter of the first
+        optical disk drive.
+#>
+Configuration Example
+{
+    Import-DSCResource -ModuleName StorageDsc
+
+    Node localhost
+    {
+        OpticalDiskDriveLetter RemoveFirstOpticalDiskDriveLetter
+        {
+            DiskId      = 1
+            DriveLetter = 'X' # This value is ignored
+            Ensure      = 'Absent'
+        }
+    }
+}
diff --git a/Modules/StorageDsc/Examples/Resources/OpticalDiskDriveLetter/3-OpticalDiskDriveLetter_SetDriveLetterMulti.ps1 b/Modules/StorageDsc/Examples/Resources/OpticalDiskDriveLetter/3-OpticalDiskDriveLetter_SetDriveLetterMulti.ps1
new file mode 100644
index 00000000..df6485ac
--- /dev/null
+++ b/Modules/StorageDsc/Examples/Resources/OpticalDiskDriveLetter/3-OpticalDiskDriveLetter_SetDriveLetterMulti.ps1
@@ -0,0 +1,34 @@
+<#
+    .EXAMPLE
+        This configuration will set the drive letter of the first
+        optical disk drive in the system to 'Y'. It will set the
+        drive letter of the second optical disk drive to 'Z'. It
+        will remove the drive letter from the third optical disk
+        drive in the system.
+#>
+Configuration Example
+{
+    Import-DSCResource -ModuleName StorageDsc
+
+    Node localhost
+    {
+        OpticalDiskDriveLetter SetFirstOpticalDiskDriveLetterToY
+        {
+            DiskId      = 1
+            DriveLetter = 'Y'
+        }
+
+        OpticalDiskDriveLetter SetSecondOpticalDiskDriveLetterToZ
+        {
+            DiskId      = 2
+            DriveLetter = 'Z'
+        }
+
+        OpticalDiskDriveLetter RemoveThirdOpticalDiskDriveLetter
+        {
+            DiskId      = 3
+            DriveLetter = 'A'
+            Ensure      = 'Absent'
+        }
+    }
+}
diff --git a/Modules/xStorage/Examples/Resources/xWaitForDisk/1-xWaitForDisk_InitializeDataDisk.ps1 b/Modules/StorageDsc/Examples/Resources/WaitForDisk/1-WaitForDisk_InitializeDataDisk.ps1
similarity index 82%
rename from Modules/xStorage/Examples/Resources/xWaitForDisk/1-xWaitForDisk_InitializeDataDisk.ps1
rename to Modules/StorageDsc/Examples/Resources/WaitForDisk/1-WaitForDisk_InitializeDataDisk.ps1
index 51e106d3..9f67239d 100644
--- a/Modules/xStorage/Examples/Resources/xWaitForDisk/1-xWaitForDisk_InitializeDataDisk.ps1
+++ b/Modules/StorageDsc/Examples/Resources/WaitForDisk/1-WaitForDisk_InitializeDataDisk.ps1
@@ -6,34 +6,33 @@
 #>
 Configuration Example
 {
-
-    Import-DSCResource -ModuleName xStorage
+    Import-DSCResource -ModuleName StorageDsc
 
     Node localhost
     {
-        xWaitforDisk Disk2
+        WaitForDisk Disk2
         {
              DiskId = 2
              RetryIntervalSec = 60
              RetryCount = 60
         }
 
-        xDisk GVolume
+        Disk GVolume
         {
              DiskId = 2
              DriveLetter = 'G'
              Size = 10GB
         }
 
-        xDisk JVolume
+        Disk JVolume
         {
              DiskId = 2
              DriveLetter = 'J'
              FSLabel = 'Data'
-             DependsOn = '[xDisk]GVolume'
+             DependsOn = '[Disk]GVolume'
         }
 
-        xDisk DataVolume
+        Disk DataVolume
         {
              DiskId = 3
              DriveLetter = 'S'
diff --git a/Modules/xStorage/Examples/Resources/xWaitForDisk/3-xWaitForDisk_InitializeDataDiskWithAccessPath.ps1 b/Modules/StorageDsc/Examples/Resources/WaitForDisk/2-WaitForDisk_InitializeDataDiskWithAccessPath.ps1
similarity index 74%
rename from Modules/xStorage/Examples/Resources/xWaitForDisk/3-xWaitForDisk_InitializeDataDiskWithAccessPath.ps1
rename to Modules/StorageDsc/Examples/Resources/WaitForDisk/2-WaitForDisk_InitializeDataDiskWithAccessPath.ps1
index 37777302..30acce6c 100644
--- a/Modules/xStorage/Examples/Resources/xWaitForDisk/3-xWaitForDisk_InitializeDataDiskWithAccessPath.ps1
+++ b/Modules/StorageDsc/Examples/Resources/WaitForDisk/2-WaitForDisk_InitializeDataDiskWithAccessPath.ps1
@@ -6,33 +6,32 @@
 #>
 Configuration Example
 {
-
-    Import-DSCResource -ModuleName xStorage
+    Import-DSCResource -ModuleName StorageDsc
 
     Node localhost
     {
-        xWaitforDisk Disk2
+        WaitForDisk Disk2
         {
              DiskId = 2
              RetryIntervalSec = 60
              RetryCount = 60
         }
 
-        xDiskAccessPath DataVolume
+        DiskAccessPath DataVolume
         {
              DiskId = 2
              AccessPath = 'c:\SQLData'
              Size = 10GB
              FSLabel = 'SQLData1'
-             DependsOn = '[xWaitForDisk]Disk2'
+             DependsOn = '[WaitForDisk]Disk2'
         }
 
-        xDiskAccessPath LogVolume
+        DiskAccessPath LogVolume
         {
              DiskId = 2
              AccessPath = 'c:\SQLLog'
              FSLabel = 'SQLLog1'
-             DependsOn = '[xDiskAccessPath]DataVolume'
+             DependsOn = '[DiskAccessPath]DataVolume'
         }
     }
 }
diff --git a/Modules/xStorage/Examples/Resources/xDiskAccessPath/1-xDiskAccessPath_InitializeDataDiskWithAccessPath.ps1 b/Modules/StorageDsc/Examples/Resources/WaitForDisk/3-WaitForDisk_InitializeDataDiskWithAccessPath.ps1
similarity index 74%
rename from Modules/xStorage/Examples/Resources/xDiskAccessPath/1-xDiskAccessPath_InitializeDataDiskWithAccessPath.ps1
rename to Modules/StorageDsc/Examples/Resources/WaitForDisk/3-WaitForDisk_InitializeDataDiskWithAccessPath.ps1
index 37777302..30acce6c 100644
--- a/Modules/xStorage/Examples/Resources/xDiskAccessPath/1-xDiskAccessPath_InitializeDataDiskWithAccessPath.ps1
+++ b/Modules/StorageDsc/Examples/Resources/WaitForDisk/3-WaitForDisk_InitializeDataDiskWithAccessPath.ps1
@@ -6,33 +6,32 @@
 #>
 Configuration Example
 {
-
-    Import-DSCResource -ModuleName xStorage
+    Import-DSCResource -ModuleName StorageDsc
 
     Node localhost
     {
-        xWaitforDisk Disk2
+        WaitForDisk Disk2
         {
              DiskId = 2
              RetryIntervalSec = 60
              RetryCount = 60
         }
 
-        xDiskAccessPath DataVolume
+        DiskAccessPath DataVolume
         {
              DiskId = 2
              AccessPath = 'c:\SQLData'
              Size = 10GB
              FSLabel = 'SQLData1'
-             DependsOn = '[xWaitForDisk]Disk2'
+             DependsOn = '[WaitForDisk]Disk2'
         }
 
-        xDiskAccessPath LogVolume
+        DiskAccessPath LogVolume
         {
              DiskId = 2
              AccessPath = 'c:\SQLLog'
              FSLabel = 'SQLLog1'
-             DependsOn = '[xDiskAccessPath]DataVolume'
+             DependsOn = '[DiskAccessPath]DataVolume'
         }
     }
 }
diff --git a/Modules/xStorage/Examples/Resources/xWaitForDisk/4-xWaitForDisk_InitializeDataDiskWithAccessPathUsingUniqueId.ps1 b/Modules/StorageDsc/Examples/Resources/WaitForDisk/4-WaitForDisk_InitializeDataDiskWithAccessPathUsingUniqueId.ps1
similarity index 76%
rename from Modules/xStorage/Examples/Resources/xWaitForDisk/4-xWaitForDisk_InitializeDataDiskWithAccessPathUsingUniqueId.ps1
rename to Modules/StorageDsc/Examples/Resources/WaitForDisk/4-WaitForDisk_InitializeDataDiskWithAccessPathUsingUniqueId.ps1
index 5ca41718..d09d84a0 100644
--- a/Modules/xStorage/Examples/Resources/xWaitForDisk/4-xWaitForDisk_InitializeDataDiskWithAccessPathUsingUniqueId.ps1
+++ b/Modules/StorageDsc/Examples/Resources/WaitForDisk/4-WaitForDisk_InitializeDataDiskWithAccessPathUsingUniqueId.ps1
@@ -1,17 +1,16 @@
 <#
     .EXAMPLE
         This configuration will wait for disk with Unique Id '5E1E50A401000000001517FFFF0AEB84' to become
-        available, and then make the disk available as two new formatted volumes mounted to folders 
+        available, and then make the disk available as two new formatted volumes mounted to folders
         c:\SQLData and c:\SQLLog, with c:\SQLLog using all available space after c:\SQLData has been created.
 #>
 Configuration Example
 {
-
-    Import-DSCResource -ModuleName xStorage
+    Import-DSCResource -ModuleName StorageDsc
 
     Node localhost
     {
-        xWaitforDisk Disk2
+        WaitForDisk Disk2
         {
              DiskId = '5E1E50A401000000001517FFFF0AEB84'
              DiskIdType = 'UniqueId'
@@ -19,23 +18,23 @@ Configuration Example
              RetryCount = 60
         }
 
-        xDiskAccessPath DataVolume
+        DiskAccessPath DataVolume
         {
              DiskId = '5E1E50A401000000001517FFFF0AEB84'
              DiskIdType = 'UniqueId'
              AccessPath = 'c:\SQLData'
              Size = 10GB
              FSLabel = 'SQLData1'
-             DependsOn = '[xWaitForDisk]Disk2'
+             DependsOn = '[WaitForDisk]Disk2'
         }
 
-        xDiskAccessPath LogVolume
+        DiskAccessPath LogVolume
         {
              DiskId = '5E1E50A401000000001517FFFF0AEB84'
              DiskIdType = 'UniqueId'
              AccessPath = 'c:\SQLLog'
              FSLabel = 'SQLLog1'
-             DependsOn = '[xDiskAccessPath]DataVolume'
+             DependsOn = '[DiskAccessPath]DataVolume'
         }
     }
 }
diff --git a/Modules/xStorage/Examples/Resources/xWaitForVolume/1-xWaitForVolume_VHD.ps1 b/Modules/StorageDsc/Examples/Resources/WaitForVolume/1-WaitForVolume_VHD.ps1
similarity index 75%
rename from Modules/xStorage/Examples/Resources/xWaitForVolume/1-xWaitForVolume_VHD.ps1
rename to Modules/StorageDsc/Examples/Resources/WaitForVolume/1-WaitForVolume_VHD.ps1
index e8291814..2a757846 100644
--- a/Modules/xStorage/Examples/Resources/xWaitForVolume/1-xWaitForVolume_VHD.ps1
+++ b/Modules/StorageDsc/Examples/Resources/WaitForVolume/1-WaitForVolume_VHD.ps1
@@ -4,14 +4,15 @@
 #>
 configuration Example
 {
-    Import-DscResource -ModuleName xStorage
-    xMountImage MountVHD
+    Import-DscResource -ModuleName StorageDsc
+
+    MountImage MountVHD
     {
         ImagePath   = 'd:\Data\Disk1.vhd'
         DriveLetter = 'V'
     }
 
-    xWaitForVolume WaitForVHD
+    WaitForVolume WaitForVHD
     {
         DriveLetter      = 'V'
         RetryIntervalSec = 5
diff --git a/Modules/xStorage/Examples/Resources/xMountImage/2-xMountImage_MountISO.ps1 b/Modules/StorageDsc/Examples/Resources/WaitForVolume/2-WaitForVolume_ISO.ps1
similarity index 75%
rename from Modules/xStorage/Examples/Resources/xMountImage/2-xMountImage_MountISO.ps1
rename to Modules/StorageDsc/Examples/Resources/WaitForVolume/2-WaitForVolume_ISO.ps1
index 897459ce..d264d9eb 100644
--- a/Modules/xStorage/Examples/Resources/xMountImage/2-xMountImage_MountISO.ps1
+++ b/Modules/StorageDsc/Examples/Resources/WaitForVolume/2-WaitForVolume_ISO.ps1
@@ -4,14 +4,15 @@
 #>
 configuration Example
 {
-    Import-DscResource -ModuleName xStorage
-    xMountImage ISO
+    Import-DscResource -ModuleName StorageDsc
+
+    MountImage ISO
     {
         ImagePath   = 'c:\Sources\SQL.iso'
         DriveLetter = 'S'
     }
 
-    xWaitForVolume WaitForISO
+    WaitForVolume WaitForISO
     {
         DriveLetter      = 'S'
         RetryIntervalSec = 5
diff --git a/Modules/xStorage/Modules/StorageDsc.Common/StorageDsc.Common.psm1 b/Modules/StorageDsc/Modules/StorageDsc.Common/StorageDsc.Common.psm1
similarity index 97%
rename from Modules/xStorage/Modules/StorageDsc.Common/StorageDsc.Common.psm1
rename to Modules/StorageDsc/Modules/StorageDsc.Common/StorageDsc.Common.psm1
index 0addded6..bf77ee7b 100644
--- a/Modules/xStorage/Modules/StorageDsc.Common/StorageDsc.Common.psm1
+++ b/Modules/StorageDsc/Modules/StorageDsc.Common/StorageDsc.Common.psm1
@@ -33,20 +33,24 @@ function Assert-DriveLetterValid
         $Colon
     )
 
-    $Matches = @([regex]::matches($DriveLetter, '^([A-Za-z]):?$', 'IgnoreCase'))
-    if (-not $Matches)
+    $matches = @([regex]::matches($DriveLetter, '^([A-Za-z]):?$', 'IgnoreCase'))
+
+    if (-not $matches)
     {
         # DriveLetter format is invalid
         New-InvalidArgumentException `
             -Message $($LocalizedData.InvalidDriveLetterFormatError -f $DriveLetter) `
             -ArgumentName 'DriveLetter'
     }
+
     # This is the drive letter without a colon
-    $DriveLetter = $Matches.Groups[1].Value
+    $DriveLetter = $matches.Groups[1].Value
+
     if ($Colon)
     {
         $DriveLetter = $DriveLetter + ':'
     } # if
+
     return $DriveLetter
 } # end function Assert-DriveLetterValid
 
diff --git a/Modules/xStorage/Modules/StorageDsc.Common/en-us/StorageDsc.Common.strings.psd1 b/Modules/StorageDsc/Modules/StorageDsc.Common/en-us/StorageDsc.Common.strings.psd1
similarity index 100%
rename from Modules/xStorage/Modules/StorageDsc.Common/en-us/StorageDsc.Common.strings.psd1
rename to Modules/StorageDsc/Modules/StorageDsc.Common/en-us/StorageDsc.Common.strings.psd1
diff --git a/Modules/xStorage/Modules/StorageDsc.ResourceHelper/StorageDsc.ResourceHelper.psm1 b/Modules/StorageDsc/Modules/StorageDsc.ResourceHelper/StorageDsc.ResourceHelper.psm1
similarity index 100%
rename from Modules/xStorage/Modules/StorageDsc.ResourceHelper/StorageDsc.ResourceHelper.psm1
rename to Modules/StorageDsc/Modules/StorageDsc.ResourceHelper/StorageDsc.ResourceHelper.psm1
diff --git a/Modules/xStorage/xStorage.psd1 b/Modules/StorageDsc/StorageDsc.psd1
similarity index 79%
rename from Modules/xStorage/xStorage.psd1
rename to Modules/StorageDsc/StorageDsc.psd1
index 47304d52..29f6dfa9 100644
--- a/Modules/xStorage/xStorage.psd1
+++ b/Modules/StorageDsc/StorageDsc.psd1
@@ -1,5 +1,5 @@
 #
-# Module manifest for module 'xStorage'
+# Module manifest for module 'StorageDsc'
 #
 # Generated on: 6/14/2015
 #
@@ -10,7 +10,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '3.4.0.0'
+ModuleVersion = '4.0.0.0'
 
 # ID used to uniquely identify this module
 GUID = '00d73ca1-58b5-46b7-ac1a-5bfcf5814faf'
@@ -22,7 +22,7 @@ Author = 'PowerShell DSC'
 CompanyName = 'Microsoft Corporation'
 
 # Copyright statement for this module
-Copyright = '2017'
+Copyright = '2018'
 
 # Description of the functionality provided by this module
 Description = 'This module contains all resources related to the PowerShell Storage module, or pertaining to disk management.'
@@ -93,24 +93,25 @@ PrivateData = @{
         Tags = @('DesiredStateConfiguration', 'DSC', 'DSCResourceKit', 'DSCResource')
 
         # A URL to the license for this module.
-        LicenseUri = 'https://github.com/PowerShell/xStorage/blob/master/LICENSE'
+        LicenseUri = 'https://github.com/PowerShell/StorageDsc/blob/master/LICENSE'
 
         # A URL to the main website for this project.
-        ProjectUri = 'https://github.com/PowerShell/xStorage'
+        ProjectUri = 'https://github.com/PowerShell/StorageDsc'
 
         # A URL to an icon representing this module.
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '- xDisk:
-  - Removed duplicate integration tests for Guid Disk Id type.
-  - Added new contexts to integration tests improve clarity.
-  - Fix bug when size not specified and disk partitioned and
-    formatted but not assigned drive letter - See [Issue 103](https://github.com/PowerShell/xStorage/issues/103).
-- xDiskAccessPath:
-  - Added new contexts to integration tests improve clarity.
-  - Fix bug when size not specified and disk partitioned and
-    formatted but not assigned to path - See [Issue 103](https://github.com/PowerShell/xStorage/issues/103).
+        ReleaseNotes = '- BREAKING CHANGE:
+  - Renamed xStorage to StorageDsc
+  - Renamed MSFT_xDisk to MSFT_Disk
+  - Renamed MSFT_xDiskAccessPath to MSFT_DiskAccessPath
+  - Renamed MSFT_xMountImage to MSFT_MountImage
+  - Renamed MSFT_xOpticalDiskDriveLetter to MSFT_OpticalDiskDriveLetter
+  - Renamed MSFT_xWaitForDisk to MSFT_WaitForDisk
+  - Renamed MSFT_xWaitForVolume to MSFT_WaitforVolume
+  - Deleted xStorage folder under StorageDsc/Modules
+  - See [Issue 129](https://github.com/PowerShell/xStorage/issues/129)
 
 '
 
@@ -134,3 +135,4 @@ PrivateData = @{
 
 
 
+
diff --git a/README.md b/README.md
index 4e4b1a39..b85c79d6 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,16 @@
-# xStorage
+# StorageDsc
 
-The **xStorage** module contains the following resources:
+The **StorageDsc** module contains the following resources:
 
-- **xMountImage**: used to mount or unmount an ISO/VHD disk image. It can be
+- **MountImage**: used to mount or unmount an ISO/VHD disk image. It can be
     mounted as read-only (ISO, VHD, VHDx) or read/write (VHD, VHDx).
-- **xDisk**: used to initialize, format and mount the partition as a drive letter.
-- **xDiskAccessPath**: used to initialize, format and mount the partition to a
+- **Disk**: used to initialize, format and mount the partition as a drive letter.
+- **DiskAccessPath**: used to initialize, format and mount the partition to a
     folder access path.
-- **xWaitForDisk** wait for a disk to become available.
-- **xWaitForVolume** wait for a drive to be mounted and become available.
+- **OpticalDiskDriveLetter**: used to change the drive letter of an optical
+    disk drive (e.g. a CDROM or DVD drive).  This resource ignores mounted ISOs.
+- **WaitForDisk** wait for a disk to become available.
+- **WaitForVolume** wait for a drive to be mounted and become available.
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
 For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
@@ -17,23 +19,23 @@ additional questions or comments.
 
 ## Documentation and Examples
 
-For a full list of resources in xStorage and examples on their use, check out
-the [xStorage wiki](https://github.com/PowerShell/xStorage/wiki).
+For a full list of resources in StorageDsc and examples on their use, check out
+the [StorageDsc wiki](https://github.com/PowerShell/StorageDsc/wiki).
 
 ## Branches
 
 ### master
 
-[![Build status](https://ci.appveyor.com/api/projects/status/1j95juvceu39ekm7/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/xstorage/branch/master)
-[![codecov](https://codecov.io/gh/PowerShell/xStorage/branch/master/graph/badge.svg)](https://codecov.io/gh/PowerShell/xStorage/branch/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/1j95juvceu39ekm7/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/StorageDsc/branch/master)
+[![codecov](https://codecov.io/gh/PowerShell/StorageDsc/branch/master/graph/badge.svg)](https://codecov.io/gh/PowerShell/StorageDsc/branch/master)
 
 This is the branch containing the latest release - no contributions should be made
 directly to this branch.
 
 ### dev
 
-[![Build status](https://ci.appveyor.com/api/projects/status/1j95juvceu39ekm7/branch/dev?svg=true)](https://ci.appveyor.com/project/PowerShell/xstorage/branch/dev)
-[![codecov](https://codecov.io/gh/PowerShell/xStorage/branch/dev/graph/badge.svg)](https://codecov.io/gh/PowerShell/xStorage/branch/dev)
+[![Build status](https://ci.appveyor.com/api/projects/status/1j95juvceu39ekm7/branch/dev?svg=true)](https://ci.appveyor.com/project/PowerShell/StorageDsc/branch/dev)
+[![codecov](https://codecov.io/gh/PowerShell/StorageDsc/branch/dev/graph/badge.svg)](https://codecov.io/gh/PowerShell/StorageDsc/branch/dev)
 
 This is the development branch to which contributions should be proposed by contributors
 as pull requests. This development branch will periodically be merged to the master
diff --git a/Tests/Integration/MSFT_xDisk.Integration.Tests.ps1 b/Tests/Integration/MSFT_Disk.Integration.Tests.ps1
similarity index 99%
rename from Tests/Integration/MSFT_xDisk.Integration.Tests.ps1
rename to Tests/Integration/MSFT_Disk.Integration.Tests.ps1
index 88ff2847..2af7f0ed 100644
--- a/Tests/Integration/MSFT_xDisk.Integration.Tests.ps1
+++ b/Tests/Integration/MSFT_Disk.Integration.Tests.ps1
@@ -1,11 +1,11 @@
-$script:DSCModuleName = 'xStorage'
-$script:DSCResourceName = 'MSFT_xDisk'
+$script:DSCModuleName = 'StorageDsc'
+$script:DSCResourceName = 'MSFT_Disk'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
 #region HEADER
 # Integration Test Template Version: 1.1.1
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xStorage'
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
diff --git a/Tests/Integration/MSFT_xDisk.config.ps1 b/Tests/Integration/MSFT_Disk.config.ps1
similarity index 82%
rename from Tests/Integration/MSFT_xDisk.config.ps1
rename to Tests/Integration/MSFT_Disk.config.ps1
index 0d9285c3..3556dcca 100644
--- a/Tests/Integration/MSFT_xDisk.config.ps1
+++ b/Tests/Integration/MSFT_Disk.config.ps1
@@ -1,11 +1,11 @@
-configuration MSFT_xDisk_Config {
+configuration MSFT_Disk_Config {
 
-    Import-DscResource -ModuleName xStorage
+    Import-DscResource -ModuleName StorageDsc
 
     node localhost {
         if ($Node.Size)
         {
-            xDisk Integration_Test
+            Disk Integration_Test
             {
                 DiskId      = $Node.DiskId
                 DiskIdType  = $Node.DiskIdType
@@ -16,7 +16,7 @@ configuration MSFT_xDisk_Config {
         }
         else
         {
-            xDisk Integration_Test
+            Disk Integration_Test
             {
                 DiskId      = $Node.DiskId
                 DiskIdType  = $Node.DiskIdType
@@ -27,14 +27,14 @@ configuration MSFT_xDisk_Config {
     }
 }
 
-configuration MSFT_xDisk_ConfigDestructive {
+configuration MSFT_Disk_ConfigDestructive {
 
-    Import-DscResource -ModuleName xStorage
+    Import-DscResource -ModuleName StorageDsc
 
     node localhost {
         if ($Node.Size)
         {
-            xDisk Integration_Test
+            Disk Integration_Test
             {
                 DiskId           = $Node.DiskId
                 DiskIdType       = $Node.DiskIdType
@@ -48,7 +48,7 @@ configuration MSFT_xDisk_ConfigDestructive {
         }
         else
         {
-            xDisk Integration_Test
+            Disk Integration_Test
             {
                 DiskId           = $Node.DiskId
                 DiskIdType       = $Node.DiskIdType
diff --git a/Tests/Integration/MSFT_xDiskAccessPath.Integration.Tests.ps1 b/Tests/Integration/MSFT_DiskAccessPath.Integration.Tests.ps1
similarity index 99%
rename from Tests/Integration/MSFT_xDiskAccessPath.Integration.Tests.ps1
rename to Tests/Integration/MSFT_DiskAccessPath.Integration.Tests.ps1
index b95eb4f0..d3a602d8 100644
--- a/Tests/Integration/MSFT_xDiskAccessPath.Integration.Tests.ps1
+++ b/Tests/Integration/MSFT_DiskAccessPath.Integration.Tests.ps1
@@ -1,11 +1,11 @@
-$script:DSCModuleName = 'xStorage'
-$script:DSCResourceName = 'MSFT_xDiskAccessPath'
+$script:DSCModuleName = 'StorageDsc'
+$script:DSCResourceName = 'MSFT_DiskAccessPath'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
 #region HEADER
 # Integration Test Template Version: 1.1.1
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xStorage'
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
@@ -40,13 +40,13 @@ try
                 $FSLabelB = 'TestDiskB'
 
                 # Get a couple of mount point paths
-                $accessPathA = Join-Path -Path $ENV:Temp -ChildPath 'xDiskAccessPath_MountA'
+                $accessPathA = Join-Path -Path $ENV:Temp -ChildPath 'DiskAccessPath_MountA'
                 if (-not (Test-Path -Path $accessPathA))
                 {
                     $null = New-Item -Path $accessPathA -ItemType Directory
                 } # if
 
-                $accessPathB = Join-Path -Path $ENV:Temp -ChildPath 'xDiskAccessPath_MountB'
+                $accessPathB = Join-Path -Path $ENV:Temp -ChildPath 'DiskAccessPath_MountB'
                 if (-not (Test-Path -Path $accessPathB))
                 {
                     $null = New-Item -Path $accessPathB -ItemType Directory
@@ -247,13 +247,13 @@ try
                 $FSLabelB = 'TestDiskB'
 
                 # Get a couple of mount point paths
-                $accessPathA = Join-Path -Path $ENV:Temp -ChildPath 'xDiskAccessPath_MountA'
+                $accessPathA = Join-Path -Path $ENV:Temp -ChildPath 'DiskAccessPath_MountA'
                 if (-not (Test-Path -Path $accessPathA))
                 {
                     $null = New-Item -Path $accessPathA -ItemType Directory
                 } # if
 
-                $accessPathB = Join-Path -Path $ENV:Temp -ChildPath 'xDiskAccessPath_MountB'
+                $accessPathB = Join-Path -Path $ENV:Temp -ChildPath 'DiskAccessPath_MountB'
                 if (-not (Test-Path -Path $accessPathB))
                 {
                     $null = New-Item -Path $accessPathB -ItemType Directory
@@ -454,13 +454,13 @@ try
                 $FSLabelB = 'TestDiskB'
 
                 # Get a couple of mount point paths
-                $accessPathA = Join-Path -Path $ENV:Temp -ChildPath 'xDiskAccessPath_MountA'
+                $accessPathA = Join-Path -Path $ENV:Temp -ChildPath 'DiskAccessPath_MountA'
                 if (-not (Test-Path -Path $accessPathA))
                 {
                     $null = New-Item -Path $accessPathA -ItemType Directory
                 } # if
 
-                $accessPathB = Join-Path -Path $ENV:Temp -ChildPath 'xDiskAccessPath_MountB'
+                $accessPathB = Join-Path -Path $ENV:Temp -ChildPath 'DiskAccessPath_MountB'
                 if (-not (Test-Path -Path $accessPathB))
                 {
                     $null = New-Item -Path $accessPathB -ItemType Directory
@@ -661,7 +661,7 @@ try
                 $FSLabelA = 'TestDiskA'
 
                 # Get a mount point path
-                $accessPathA = Join-Path -Path $ENV:Temp -ChildPath 'xDiskAccessPath_MountA'
+                $accessPathA = Join-Path -Path $ENV:Temp -ChildPath 'DiskAccessPath_MountA'
                 if (-not (Test-Path -Path $accessPathA))
                 {
                     $null = New-Item -Path $accessPathA -ItemType Directory
diff --git a/Tests/Integration/MSFT_xDiskAccessPath.config.ps1 b/Tests/Integration/MSFT_DiskAccessPath.config.ps1
similarity index 76%
rename from Tests/Integration/MSFT_xDiskAccessPath.config.ps1
rename to Tests/Integration/MSFT_DiskAccessPath.config.ps1
index 9e65d111..0fe97d22 100644
--- a/Tests/Integration/MSFT_xDiskAccessPath.config.ps1
+++ b/Tests/Integration/MSFT_DiskAccessPath.config.ps1
@@ -1,11 +1,11 @@
-configuration MSFT_xDiskAccessPath_Config {
+configuration MSFT_DiskAccessPath_Config {
 
-    Import-DscResource -ModuleName xStorage
+    Import-DscResource -ModuleName StorageDsc
 
     node localhost {
         if ($Node.Size)
         {
-            xDiskAccessPath Integration_Test {
+            DiskAccessPath Integration_Test {
                 DiskId             = $Node.DiskId
                 DiskIdType         = $Node.DiskIdType
                 AccessPath         = $Node.AccessPath
@@ -15,7 +15,7 @@ configuration MSFT_xDiskAccessPath_Config {
         }
         else
         {
-            xDiskAccessPath Integration_Test {
+            DiskAccessPath Integration_Test {
                 DiskId             = $Node.DiskId
                 DiskIdType         = $Node.DiskIdType
                 AccessPath         = $Node.AccessPath
diff --git a/Tests/Integration/MSFT_xMountImage_ISO.Integration.Tests.ps1 b/Tests/Integration/MSFT_MountImage_ISO.Integration.Tests.ps1
similarity index 97%
rename from Tests/Integration/MSFT_xMountImage_ISO.Integration.Tests.ps1
rename to Tests/Integration/MSFT_MountImage_ISO.Integration.Tests.ps1
index a540be4e..34377bb5 100644
--- a/Tests/Integration/MSFT_xMountImage_ISO.Integration.Tests.ps1
+++ b/Tests/Integration/MSFT_MountImage_ISO.Integration.Tests.ps1
@@ -4,14 +4,14 @@
 # The ISO is not included with this repository because of size contstraints.
 # It is up to the user or mechanism running these tests to put a valid 'test.iso'
 # into this folder.
-$script:DSCModuleName      = 'xStorage'
-$script:DSCResourceName    = 'MSFT_xMountImage'
+$script:DSCModuleName      = 'StorageDsc'
+$script:DSCResourceName    = 'MSFT_MountImage'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
 #region HEADER
 # Integration Test Template Version: 1.1.1
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xStorage'
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
      (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
@@ -35,7 +35,7 @@ try
     if (-not (Test-Path -Path $ISOPath))
     {
         Write-Verbose -Message "$($script:DSCResourceName) integration tests cannot be run because the ISO File '$ISOPath' is not available." -Verbose
-        Return
+        return
     } # if
 
     # Get a spare drive letter
diff --git a/Tests/Integration/MSFT_xMountImage_VHD.Integration.Tests.ps1 b/Tests/Integration/MSFT_MountImage_VHD.Integration.Tests.ps1
similarity index 97%
rename from Tests/Integration/MSFT_xMountImage_VHD.Integration.Tests.ps1
rename to Tests/Integration/MSFT_MountImage_VHD.Integration.Tests.ps1
index a4b93417..965a8008 100644
--- a/Tests/Integration/MSFT_xMountImage_VHD.Integration.Tests.ps1
+++ b/Tests/Integration/MSFT_MountImage_VHD.Integration.Tests.ps1
@@ -1,11 +1,11 @@
-$script:DSCModuleName      = 'xStorage'
-$script:DSCResourceName    = 'MSFT_xMountImage'
+$script:DSCModuleName      = 'StorageDsc'
+$script:DSCResourceName    = 'MSFT_MountImage'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
 #region HEADER
 # Integration Test Template Version: 1.1.1
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xStorage'
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
      (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
diff --git a/Tests/Integration/MSFT_xMountImage_dismount.config.ps1 b/Tests/Integration/MSFT_MountImage_dismount.config.ps1
similarity index 50%
rename from Tests/Integration/MSFT_xMountImage_dismount.config.ps1
rename to Tests/Integration/MSFT_MountImage_dismount.config.ps1
index 374b4bb6..20379e59 100644
--- a/Tests/Integration/MSFT_xMountImage_dismount.config.ps1
+++ b/Tests/Integration/MSFT_MountImage_dismount.config.ps1
@@ -1,9 +1,9 @@
-configuration MSFT_xMountImage_Dismount_Config {
+configuration MSFT_MountImage_Dismount_Config {
 
-    Import-DscResource -ModuleName xStorage
+    Import-DscResource -ModuleName StorageDsc
 
     node localhost {
-        xMountImage Integration_Test {
+        MountImage Integration_Test {
             ImagePath          = $Node.ImagePath
             Ensure             = 'Absent'
         }
diff --git a/Tests/Integration/MSFT_xMountImage_mount.config.ps1 b/Tests/Integration/MSFT_MountImage_mount.config.ps1
similarity index 58%
rename from Tests/Integration/MSFT_xMountImage_mount.config.ps1
rename to Tests/Integration/MSFT_MountImage_mount.config.ps1
index 5303f6d7..42ae93c3 100644
--- a/Tests/Integration/MSFT_xMountImage_mount.config.ps1
+++ b/Tests/Integration/MSFT_MountImage_mount.config.ps1
@@ -1,9 +1,9 @@
-configuration MSFT_xMountImage_Mount_Config {
+configuration MSFT_MountImage_Mount_Config {
 
-    Import-DscResource -ModuleName xStorage
+    Import-DscResource -ModuleName StorageDsc
 
     node localhost {
-        xMountImage Integration_Test {
+        MountImage Integration_Test {
             ImagePath          = $Node.ImagePath
             DriveLetter        = $Node.DriveLetter
             Ensure             = 'Present'
diff --git a/Tests/Integration/MSFT_OpticalDiskDriveLetter.Integration.Tests.ps1 b/Tests/Integration/MSFT_OpticalDiskDriveLetter.Integration.Tests.ps1
new file mode 100644
index 00000000..e95441ac
--- /dev/null
+++ b/Tests/Integration/MSFT_OpticalDiskDriveLetter.Integration.Tests.ps1
@@ -0,0 +1,193 @@
+$script:DSCModuleName      = 'StorageDsc'
+$script:DSCResourceName    = 'MSFT_OpticalDiskDriveLetter'
+
+Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
+
+#region HEADER
+# Integration Test Template Version: 1.1.1
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
+if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
+    (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
+{
+    & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
+}
+
+Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
+$TestEnvironment = Initialize-TestEnvironment `
+    -DSCModuleName $script:DSCModuleName `
+    -DSCResourceName $script:DSCResourceName `
+    -TestType Integration
+#endregion
+
+# Using try/finally to always cleanup even if something awful happens.
+try
+{
+    $opticalDisk = Get-CimInstance -ClassName Win32_CDROMDrive |
+        Where-Object -FilterScript {
+        -not (
+            $_.Caption -eq "Microsoft Virtual DVD-ROM" -and
+            ($_.DeviceID.Split("\")[-1]).Length -gt 10
+        )
+    }[0]
+
+    if (-not $opticalDisk)
+    {
+        Write-Verbose -Message "$($script:DSCResourceName) integration tests cannot be run because there is no optical disk in the system." -Verbose
+        return
+    }
+
+    $currentDriveLetter = $opticalDisk.Drive
+    $volume = Get-CimInstance -ClassName Win32_Volume -Filter "DriveLetter = '$currentDriveLetter'"
+
+    $lastDrive = ((Get-Volume).DriveLetter | Sort-Object | Select-Object -Last 1)
+    $driveLetter = [char](([int][char]$lastDrive) + 1)
+
+    # Change drive letter of the optical drive
+    $ConfigFile = Join-Path -Path $PSScriptRoot -ChildPath "$($script:DSCResourceName).config.ps1"
+    . $ConfigFile -Verbose -ErrorAction Stop
+
+    Describe "$($script:DSCResourceName)_Integration" {
+        # Dismount the optical disk from a drive letter
+        $volume | Set-CimInstance -Property @{ DriveLetter = $null }
+
+        Context 'Assign a Drive Letter to an optical drive that is not mounted' {
+            It 'Should compile and apply the MOF without throwing' {
+                {
+                    # This is to pass to the Config
+                    $configData = @{
+                        AllNodes = @(
+                            @{
+                                NodeName    = 'localhost'
+                                DiskId      = 1
+                                DriveLetter = $driveLetter
+                                Ensure      = 'Present'
+                            }
+                        )
+                    }
+
+                    & "$($script:DSCResourceName)_Config" `
+                        -OutputPath $TestDrive `
+                        -ConfigurationData $configData
+
+                    Start-DscConfiguration `
+                        -Path $TestDrive `
+                        -ComputerName localhost `
+                        -Wait `
+                        -Verbose `
+                        -Force `
+                        -ErrorAction Stop
+                } | Should -Not -Throw
+            }
+
+            It 'Should be able to call Get-DscConfiguration without throwing' {
+                { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should -Not -Throw
+            }
+
+            It 'Should have set the resource and all the parameters should match' {
+                $current = Get-DscConfiguration | Where-Object -FilterScript {
+                    $_.ConfigurationName -eq "$($script:DSCResourceName)_Config"
+                }
+                $current.DiskId           | Should -Be 1
+                $current.DriveLetter      | Should -Be "$($driveLetter):"
+            }
+        }
+
+        $driveLetter = [char](([int][char]$lastDrive) + 2)
+
+        Context 'Assign a Drive Letter to an optical drive that is already mounted' {
+            It 'Should compile and apply the MOF without throwing' {
+                {
+                    # This is to pass to the Config
+                    $configData = @{
+                        AllNodes = @(
+                            @{
+                                NodeName    = 'localhost'
+                                DiskId      = 1
+                                DriveLetter = $driveLetter
+                                Ensure      = 'Present'
+                            }
+                        )
+                    }
+
+                    & "$($script:DSCResourceName)_Config" `
+                        -OutputPath $TestDrive `
+                        -ConfigurationData $configData
+
+                    Start-DscConfiguration `
+                        -Path $TestDrive `
+                        -ComputerName localhost `
+                        -Wait `
+                        -Verbose `
+                        -Force `
+                        -ErrorAction Stop
+                } | Should -Not -Throw
+            }
+
+            It 'Should be able to call Get-DscConfiguration without throwing' {
+                { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should -Not -Throw
+            }
+
+            It 'Should have set the resource and all the parameters should match' {
+                $current = Get-DscConfiguration | Where-Object -FilterScript {
+                    $_.ConfigurationName -eq "$($script:DSCResourceName)_Config"
+                }
+                $current.DiskId           | Should -Be 1
+                $current.DriveLetter      | Should -Be "$($driveLetter):"
+            }
+        }
+
+        Context 'Remove a Drive Letter from an optical drive that is already mounted' {
+            It 'Should compile and apply the MOF without throwing' {
+                {
+                    # This is to pass to the Config
+                    $configData = @{
+                        AllNodes = @(
+                            @{
+                                NodeName    = 'localhost'
+                                DiskId      = 1
+                                DriveLetter = 'X'
+                                Ensure      = 'Absent'
+                            }
+                        )
+                    }
+
+                    & "$($script:DSCResourceName)_Config" `
+                        -OutputPath $TestDrive `
+                        -ConfigurationData $configData
+
+                    Start-DscConfiguration `
+                        -Path $TestDrive `
+                        -ComputerName localhost `
+                        -Wait `
+                        -Verbose `
+                        -Force `
+                        -ErrorAction Stop
+                } | Should -Not -Throw
+            }
+
+            It 'Should be able to call Get-DscConfiguration without throwing' {
+                { Get-DscConfiguration -Verbose -ErrorAction Stop } | Should -Not -Throw
+            }
+
+            It 'Should have set the resource and all the parameters should match' {
+                $current = Get-DscConfiguration | Where-Object -FilterScript {
+                    $_.ConfigurationName -eq "$($script:DSCResourceName)_Config"
+                }
+                $current.DiskId           | Should -Be 1
+                $current.DriveLetter      | Should -Be ''
+            }
+        }
+    }
+}
+finally
+{
+    #region FOOTER
+    Restore-TestEnvironment -TestEnvironment $TestEnvironment
+
+    # Mount the optical disk back to where it was
+    if ($volume)
+    {
+        $volume | Set-CimInstance -Property @{ DriveLetter = $currentDriveLetter }
+    }
+    #endregion
+}
diff --git a/Tests/Integration/MSFT_OpticalDiskDriveLetter.config.ps1 b/Tests/Integration/MSFT_OpticalDiskDriveLetter.config.ps1
new file mode 100644
index 00000000..8da313e9
--- /dev/null
+++ b/Tests/Integration/MSFT_OpticalDiskDriveLetter.config.ps1
@@ -0,0 +1,20 @@
+configuration MSFT_OpticalDiskDriveLetter_config {
+    Import-DSCResource -ModuleName StorageDsc
+    node localhost {
+        if ($Node.Ensure)
+        {
+            OpticalDiskDriveLetter Integration_Test {
+                DiskId      = $Node.DiskId
+                DriveLetter = $Node.DriveLetter
+                Ensure      = $Node.Ensure
+            }
+        }
+        else
+        {
+            OpticalDiskDriveLetter Integration_Test {
+                DiskId      = $Node.DiskId
+                DriveLetter = $Node.DriveLetter
+            }
+        }
+    }
+}
diff --git a/Tests/Integration/MSFT_xWaitForDisk.Integration.Tests.ps1 b/Tests/Integration/MSFT_WaitForDisk.Integration.Tests.ps1
similarity index 97%
rename from Tests/Integration/MSFT_xWaitForDisk.Integration.Tests.ps1
rename to Tests/Integration/MSFT_WaitForDisk.Integration.Tests.ps1
index c41d35de..1052cc1d 100644
--- a/Tests/Integration/MSFT_xWaitForDisk.Integration.Tests.ps1
+++ b/Tests/Integration/MSFT_WaitForDisk.Integration.Tests.ps1
@@ -1,11 +1,11 @@
-$script:DSCModuleName      = 'xStorage'
-$script:DSCResourceName    = 'MSFT_xWaitForDisk'
+$script:DSCModuleName      = 'StorageDsc'
+$script:DSCResourceName    = 'MSFT_WaitForDisk'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
 #region HEADER
 # Integration Test Template Version: 1.1.1
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xStorage'
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
      (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
diff --git a/Tests/Integration/MSFT_xWaitForDisk.config.ps1 b/Tests/Integration/MSFT_WaitForDisk.config.ps1
similarity index 65%
rename from Tests/Integration/MSFT_xWaitForDisk.config.ps1
rename to Tests/Integration/MSFT_WaitForDisk.config.ps1
index 4a34cf07..f78d8640 100644
--- a/Tests/Integration/MSFT_xWaitForDisk.config.ps1
+++ b/Tests/Integration/MSFT_WaitForDisk.config.ps1
@@ -1,7 +1,7 @@
-configuration MSFT_xWaitForDisk_Config {
-    Import-DscResource -ModuleName xStorage
+configuration MSFT_WaitForDisk_Config {
+    Import-DscResource -ModuleName StorageDsc
     node localhost {
-        xWaitForDisk Integration_Test {
+        WaitForDisk Integration_Test {
             DiskId           = $Node.DiskId
             DiskIdType       = $Node.DiskIdType
             RetryIntervalSec = $Node.RetryIntervalSec
diff --git a/Tests/Integration/MSFT_xWaitForVolume.Integration.Tests.ps1 b/Tests/Integration/MSFT_WaitForVolume.Integration.Tests.ps1
similarity index 94%
rename from Tests/Integration/MSFT_xWaitForVolume.Integration.Tests.ps1
rename to Tests/Integration/MSFT_WaitForVolume.Integration.Tests.ps1
index 9afc7983..23138bb1 100644
--- a/Tests/Integration/MSFT_xWaitForVolume.Integration.Tests.ps1
+++ b/Tests/Integration/MSFT_WaitForVolume.Integration.Tests.ps1
@@ -1,11 +1,11 @@
-$script:DSCModuleName      = 'xStorage'
-$script:DSCResourceName    = 'MSFT_xWaitForVolume'
+$script:DSCModuleName      = 'StorageDsc'
+$script:DSCResourceName    = 'MSFT_WaitForVolume'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
 #region HEADER
 # Integration Test Template Version: 1.1.1
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xStorage'
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
      (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
diff --git a/Tests/Integration/MSFT_xWaitForVolume.config.ps1 b/Tests/Integration/MSFT_WaitForVolume.config.ps1
similarity index 72%
rename from Tests/Integration/MSFT_xWaitForVolume.config.ps1
rename to Tests/Integration/MSFT_WaitForVolume.config.ps1
index 6d0f87ad..0c723bf0 100644
--- a/Tests/Integration/MSFT_xWaitForVolume.config.ps1
+++ b/Tests/Integration/MSFT_WaitForVolume.config.ps1
@@ -4,10 +4,10 @@ $TestWaitForVolume = @{
     RetryCount       = 2
 }
 
-configuration MSFT_xWaitForVolume_Config {
-    Import-DscResource -ModuleName xStorage
+configuration MSFT_WaitForVolume_Config {
+    Import-DscResource -ModuleName StorageDsc
     node localhost {
-        xWaitForVolume Integration_Test {
+        WaitForVolume Integration_Test {
             DriveLetter      = $TestWaitForVolume.DriveLetter
             RetryIntervalSec = $TestWaitForVolume.RetryIntervalSec
             RetryCount       = $TestWaitForVolume.RetryCount
diff --git a/Tests/Integration/ModuleConflict.Tests.ps1 b/Tests/Integration/ModuleConflict.Tests.ps1
index 9362eabb..f9e0a87a 100644
--- a/Tests/Integration/ModuleConflict.Tests.ps1
+++ b/Tests/Integration/ModuleConflict.Tests.ps1
@@ -1,4 +1,4 @@
-$script:DSCModuleName      = 'xStorage'
+$script:DSCModuleName      = 'StorageDsc'
 <#
     These integration tests ensure that exported cmdlets names do not conflict
     with any other names that are exposed by other common resource kit modules.
@@ -7,7 +7,7 @@ $script:ModulesToTest = @( 'xNetworking','xComputerManagement','xDFS' )
 
 #region HEADER
 # Integration Test Template Version: 1.1.0
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xStorage'
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
 
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
      (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
diff --git a/Tests/TestHarness.psm1 b/Tests/TestHarness.psm1
index 99863737..e01d11ad 100644
--- a/Tests/TestHarness.psm1
+++ b/Tests/TestHarness.psm1
@@ -10,12 +10,12 @@ function Invoke-TestHarness
         $DscTestsPath
     )
 
-    Write-Verbose -Message 'Commencing all xStorage tests'
+    Write-Verbose -Message 'Commencing all StorageDsc tests'
 
     $repoDir = Join-Path -Path $PSScriptRoot -ChildPath "..\" -Resolve
 
     $testCoverageFiles = @()
-    Get-ChildItem -Path "$repoDir\modules\xStorage\DSCResources\**\*.psm1" -Recurse | ForEach-Object {
+    Get-ChildItem -Path "$repoDir\modules\StorageDsc\DSCResources\**\*.psm1" -Recurse | ForEach-Object {
         if ($_.FullName -notlike '*\DSCResource.Tests\*')
         {
             $testCoverageFiles += $_.FullName
@@ -29,7 +29,7 @@ function Invoke-TestHarness
         $testResultSettings.Add('OutputFile', $TestResultsFile)
     }
 
-    Import-Module -Name "$repoDir\modules\xStorage\xStorage.psd1"
+    Import-Module -Name "$repoDir\modules\StorageDsc\StorageDsc.psd1"
     $testsToRun = @()
 
     # Run Unit Tests
diff --git a/Tests/Unit/MSFT_xDisk.Tests.ps1 b/Tests/Unit/MSFT_Disk.Tests.ps1
similarity index 99%
rename from Tests/Unit/MSFT_xDisk.Tests.ps1
rename to Tests/Unit/MSFT_Disk.Tests.ps1
index a726b539..a28fe0fb 100644
--- a/Tests/Unit/MSFT_xDisk.Tests.ps1
+++ b/Tests/Unit/MSFT_Disk.Tests.ps1
@@ -1,11 +1,11 @@
-$script:DSCModuleName = 'xStorage'
-$script:DSCResourceName = 'MSFT_xDisk'
+$script:DSCModuleName = 'StorageDsc'
+$script:DSCResourceName = 'MSFT_Disk'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
 #region HEADER
 # Unit Test Template Version: 1.1.0
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xStorage'
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
@@ -304,7 +304,7 @@ try
         #endregion
 
         #region Function Get-TargetResource
-        Describe 'MSFT_xDisk\Get-TargetResource' {
+        Describe 'MSFT_Disk\Get-TargetResource' {
             Context 'Online GPT disk with a partition/volume and correct Drive Letter assigned using Disk Number' {
                 # verifiable (should be called) mocks
                 Mock `
@@ -618,7 +618,7 @@ try
         #endregion
 
         #region Function Set-TargetResource
-        Describe 'MSFT_xDisk\Set-TargetResource' {
+        Describe 'MSFT_Disk\Set-TargetResource' {
             Context 'Offline GPT disk using Disk Number' {
                 # verifiable (should be called) mocks
                 Mock `
@@ -1843,7 +1843,7 @@ try
         #endregion
 
         #region Function Test-TargetResource
-        Describe 'MSFT_xDisk\Test-TargetResource' {
+        Describe 'MSFT_Disk\Test-TargetResource' {
             Mock `
                 -CommandName Get-CimInstance `
                 -MockWith { $script:mockedCim }
diff --git a/Tests/Unit/MSFT_xDiskAccessPath.Tests.ps1 b/Tests/Unit/MSFT_DiskAccessPath.Tests.ps1
similarity index 99%
rename from Tests/Unit/MSFT_xDiskAccessPath.Tests.ps1
rename to Tests/Unit/MSFT_DiskAccessPath.Tests.ps1
index 5f87df00..c82ce210 100644
--- a/Tests/Unit/MSFT_xDiskAccessPath.Tests.ps1
+++ b/Tests/Unit/MSFT_DiskAccessPath.Tests.ps1
@@ -1,11 +1,11 @@
-$script:DSCModuleName = 'xStorage'
-$script:DSCResourceName = 'MSFT_xDiskAccessPath'
+$script:DSCModuleName = 'StorageDsc'
+$script:DSCResourceName = 'MSFT_DiskAccessPath'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
 #region HEADER
 # Unit Test Template Version: 1.1.0
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xStorage'
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
@@ -248,7 +248,7 @@ try
         #endregion
 
         #region Function Get-TargetResource
-        Describe 'MSFT_xDiskAccessPath\Get-TargetResource' {
+        Describe 'MSFT_DiskAccessPath\Get-TargetResource' {
             Context 'Online GPT disk with a partition/volume and correct Access Path assigned using Disk Number' {
                 # verifiable (should be called) mocks
                 Mock `
@@ -518,7 +518,7 @@ try
         #endregion
 
         #region Function Set-TargetResource
-        Describe 'MSFT_xDiskAccessPath\Set-TargetResource' {
+        Describe 'MSFT_DiskAccessPath\Set-TargetResource' {
             Context 'Offline GPT disk using Disk Number' {
                 # verifiable (should be called) mocks
                 Mock `
@@ -1367,7 +1367,7 @@ try
         #endregion
 
         #region Function Test-TargetResource
-        Describe 'MSFT_xDiskAccessPath\Test-TargetResource' {
+        Describe 'MSFT_DiskAccessPath\Test-TargetResource' {
             Mock `
                 -CommandName Get-CimInstance `
                 -MockWith { $script:mockedCim }
@@ -1693,7 +1693,7 @@ try
                     } | Should -Not -Throw
                 }
 
-                # skipped due to:  https://github.com/PowerShell/xStorage/issues/22
+                # skipped due to:  https://github.com/PowerShell/StorageDsc/issues/22
                 It 'Should return false' -skip {
                     $script:result | Should -Be $false
                 }
diff --git a/Tests/Unit/MSFT_xMountImage.Tests.ps1 b/Tests/Unit/MSFT_MountImage.Tests.ps1
similarity index 99%
rename from Tests/Unit/MSFT_xMountImage.Tests.ps1
rename to Tests/Unit/MSFT_MountImage.Tests.ps1
index 8c69d0a5..bb984550 100644
--- a/Tests/Unit/MSFT_xMountImage.Tests.ps1
+++ b/Tests/Unit/MSFT_MountImage.Tests.ps1
@@ -1,11 +1,11 @@
-$script:DSCModuleName      = 'xStorage'
-$script:DSCResourceName    = 'MSFT_xMountImage'
+$script:DSCModuleName      = 'StorageDsc'
+$script:DSCResourceName    = 'MSFT_MountImage'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
 #region HEADER
 # Unit Test Template Version: 1.1.0
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xStorage'
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
      (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
@@ -200,7 +200,7 @@ try
         #endregion
 
         #region Function Get-TargetResource
-        Describe 'MSFT_xMountImage\Get-TargetResource' {
+        Describe 'MSFT_MountImage\Get-TargetResource' {
             #region functions for mocking pipeline
             # These functions are required to be able to mock functions where
             # values are passed in via the pipeline.
@@ -421,7 +421,7 @@ try
         #endregion
 
         #region Function Set-TargetResource
-        Describe 'MSFT_xMountImage\Set-TargetResource' {
+        Describe 'MSFT_MountImage\Set-TargetResource' {
             Mock `
                 -CommandName Test-ParameterValid `
                 -MockWith { $true } `
@@ -623,7 +623,7 @@ try
         #endregion
 
         #region Function Test-TargetResource
-        Describe 'MSFT_xMountImage\Test-TargetResource' {
+        Describe 'MSFT_MountImage\Test-TargetResource' {
             Mock `
                 -CommandName Test-ParameterValid `
                 -MockWith { $true } `
@@ -763,7 +763,7 @@ try
         #endregion
 
         #region Function Test-ParameterValid
-        Describe 'MSFT_xMountImage\Test-ParameterValid' {
+        Describe 'MSFT_MountImage\Test-ParameterValid' {
             Context 'DriveLetter passed, ensure is Absent' {
                 It 'Should throw InvalidParameterSpecifiedError exception' {
                     $errorRecord = Get-InvalidOperationRecord `
@@ -880,7 +880,7 @@ try
         #endregion
 
         #region Function Mount-DiskImageToLetter
-        Describe 'MSFT_xMountImage\Mount-DiskImageToLetter' {
+        Describe 'MSFT_MountImage\Mount-DiskImageToLetter' {
             #region functions for mocking pipeline
             # These functions are required to be able to mock functions where
             # values are passed in via the pipeline.
diff --git a/Tests/Unit/MSFT_OpticalDiskDriveLetter.Tests.ps1 b/Tests/Unit/MSFT_OpticalDiskDriveLetter.Tests.ps1
new file mode 100644
index 00000000..bdc88f8f
--- /dev/null
+++ b/Tests/Unit/MSFT_OpticalDiskDriveLetter.Tests.ps1
@@ -0,0 +1,765 @@
+$script:DSCModuleName      = 'StorageDsc'
+$script:DSCResourceName    = 'MSFT_OpticalDiskDriveLetter'
+
+Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
+
+#region HEADER
+# Unit Test Template Version: 1.1.0
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
+if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
+    (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
+{
+    & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
+}
+
+Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
+$TestEnvironment = Initialize-TestEnvironment `
+    -DSCModuleName $script:DSCModuleName `
+    -DSCResourceName $script:DSCResourceName `
+    -TestType Unit
+#endregion HEADER
+
+# Begin Testing
+try
+{
+    #region Pester Tests
+
+    # The InModuleScope command allows you to perform white-box unit testing on the internal
+    # (non-exported) code of a Script Module.
+    InModuleScope $script:DSCResourceName {
+        $script:testDriveLetter = 'X:'
+        $script:testDriveLetterNoVolume = 'Volume{47b90a5d-f340-11e7-80fd-806e6f6e6963}'
+        $script:testVolumeDeviceId = '"\\?\$($script:testDriveLetterNoVolume)\"'
+
+        $script:mockedNoOpticalDrive = $null
+
+        $script:mockedOpticalDrive = [pscustomobject] @{
+            Drive    = $script:testDriveLetter
+            Caption  = 'Microsoft Virtual DVD-ROM'
+            DeviceID = 'SCSI\CDROM&VEN_MSFT&PROD_VIRTUAL_DVD-ROM\000006'
+            Id       = $script:testDriveLetter
+        }
+
+        $script:mockedOpticalDriveNoDriveLetter = [pscustomobject] @{
+            Drive    = $script:testDriveLetterNoVolume
+            Caption  = 'Microsoft Virtual DVD-ROM'
+            DeviceID = 'SCSI\CDROM&VEN_MSFT&PROD_VIRTUAL_DVD-ROM\000006'
+            Id       = $script:testDriveLetterNoVolume
+        }
+
+        $script:mockedOpticalDriveMultiDisks = @(
+            $script:mockedOpticalDriveNoDriveLetter
+            $script:mockedOpticalDrive
+        )
+
+        $script:mockedWrongLetterOpticalDrive = [pscustomobject] @{
+            Drive    = 'W:'
+            Caption  = 'Microsoft Virtual DVD-ROM'
+            DeviceID = 'SCSI\CDROM&VEN_MSFT&PROD_VIRTUAL_DVD-ROM\000006'
+            Id       = 'W:'
+        }
+
+        $script:mockedOpticalDriveISO = [pscustomobject] @{
+            Drive    = 'I:'
+            Caption  = 'Microsoft Virtual DVD-ROM'
+            DeviceID = 'SCSI\CDROM&VEN_MSFT&PROD_VIRTUAL_DVD-ROM\2&1F4ADFFE&0&000002'
+            Id       = 'I:'
+        }
+
+        $script:mockedOpticalDriveIDE = [pscustomobject] @{
+            Drive    = 'I:'
+            Caption  = 'Msft Virtual CD/ROM ATA Device'
+            DeviceID = 'IDE\CDROMMSFT_VIRTUAL_CD/ROM_____________________1.0_____\5&CFB56DE&0&1.0.0'
+            Id       = 'I:'
+        }
+
+        $script:mockedVolume = [pscustomobject] @{
+            DriveLetter = $script:testDriveLetter
+            DriveType   = 5
+            DeviceId    = '\\?\Volume{bba1802b-e7a1-11e3-824e-806e6f6e6963}\'
+            Id          = $script:testDriveLetter
+        }
+
+        $script:mockedWrongVolume = [pscustomobject] @{
+            DriveLetter = 'W:'
+            DriveType   = 5
+            DeviceId    = $script:testVolumeDeviceId
+            Id          = 'W:'
+        }
+
+        function Set-CimInstance
+        {
+            Param
+            (
+                [CmdletBinding()]
+                [Parameter(ValueFromPipeline)]
+                $InputObject,
+
+                [Parameter()]
+                [hashtable]
+                $Property
+            )
+        }
+
+        #region Function Get-OpticalDiskDriveLetter
+        Describe 'MSFT_xOpticalDiskDriveLetter\Get-OpticalDiskDriveLetter' {
+            Context 'Single optical disk drive present and assigned a drive letter' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedOpticalDrive
+                } `
+                    -Verifiable
+
+                It 'Should not throw an exception' {
+                    {
+                        $script:result = Get-OpticalDiskDriveLetter `
+                            -DiskId 1 `
+                            -Verbose
+                    } | Should -Not -Throw
+                }
+
+                It "DriveLetter should be $($script:testDriveLetter)" {
+                    $script:result.DriveLetter | Should -Be $script:testDriveLetter
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+
+            Context 'Single optical disk drive present and not assiged a drive letter' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedOpticalDriveNoDriveLetter
+                } `
+                    -Verifiable
+
+                It 'Should not throw an exception' {
+                    {
+                        $script:result = Get-OpticalDiskDriveLetter `
+                            -DiskId 1 `
+                            -Verbose
+                    } | Should -Not -Throw
+                }
+
+                It "DriveLetter should be empty" {
+                    $script:result.DriveLetter | Should -Be ''
+                    $script:result.DeviceId | Should -Be $script:testDriveLetterNoVolume
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+
+            Context 'Multiple optical disk drives present and second one is assigned a drive letter' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedOpticalDriveMultiDisks
+                } `
+                    -Verifiable
+
+                It 'Should not throw an exception' {
+                    {
+                        $script:result = Get-OpticalDiskDriveLetter `
+                            -DiskId 2 `
+                            -Verbose
+                    } | Should -Not -Throw
+                }
+
+                It "DriveLetter should be $($script:testDriveLetter)" {
+                    $script:result.DriveLetter | Should -Be $script:testDriveLetter
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+
+            Context 'Single optical disk drive present but second disk is requested' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedOpticalDrive
+                } `
+                    -Verifiable
+
+                $errorRecord = Get-InvalidArgumentRecord `
+                    -Message ($LocalizedData.NoOpticalDiskDriveError -f 2) `
+                    -ArgumentName 'DiskId'
+
+                It 'Should throw expected exception' {
+                    {
+                        $script:result = Get-OpticalDiskDriveLetter `
+                            -DiskId 2 `
+                            -Verbose
+                    } | Should -Throw $errorRecord
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+
+            Context 'Single optical disk drive present but is mounted with ISO' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedOpticalDriveISO
+                } `
+                    -Verifiable
+
+                It 'Should throw expected exception' {
+                    {
+                        $script:result = Get-OpticalDiskDriveLetter `
+                            -DiskId 1 `
+                            -Verbose
+                    } | Should -Throw $errorRecord
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+        }
+        #endregion
+
+        #region Function Get-TargetResource
+        Describe 'MSFT_OpticalDiskDriveLetter\Get-TargetResource' {
+            Context 'Optical disk drive present with correct drive letter' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedOpticalDrive
+                } `
+                    -Verifiable
+
+                It 'Should not throw an exception' {
+                    {
+                        $script:result = Get-TargetResource `
+                            -DiskId 1 `
+                            -Driveletter $script:testDriveLetter `
+                            -Verbose
+                    } | Should -Not -Throw
+                }
+
+                It "DriveLetter should be $($script:testDriveLetter)" {
+                    $script:result.DriveLetter | Should -Be $script:testDriveLetter
+                    $script:result.Ensure | Should -Be 'Present'
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+
+            Context 'Optical disk drive present with incorrect drive letter' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedWrongLetterOpticalDrive
+                } `
+                    -Verifiable
+
+                It 'Should not throw an exception' {
+                    {
+                        $script:result = Get-TargetResource `
+                            -DiskId 1 `
+                            -Driveletter $script:testDriveLetter `
+                            -Verbose
+                    } | Should -Not -Throw
+                }
+
+                It "DriveLetter should be $($script:testDriveLetter)" {
+                    $script:result.DriveLetter | Should -Not -Be $script:testDriveLetter
+                    $script:result.Ensure | Should -Be 'Present'
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+
+            Context 'IDE optical disk drive present with incorrect drive letter' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedOpticalDriveIDE
+                } `
+                    -Verifiable
+
+                It 'Should not throw an exception' {
+                    {
+                        $script:result = Get-TargetResource `
+                            -DiskId 1 `
+                            -Driveletter $script:testDriveLetter `
+                            -Verbose
+                    } | Should -Not -Throw
+                }
+
+                It "Should be DriveLetter $($script:testDriveLetter)" {
+                    $script:result.DriveLetter | Should -Not -Be $script:testDriveLetter
+                    $script:result.Ensure | Should -Be 'Present'
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+
+            Context 'Optical disk drive not present' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedNoOpticalDrive
+                } `
+                    -Verifiable
+
+                $errorRecord = Get-InvalidArgumentRecord `
+                    -Message ($LocalizedData.NoOpticalDiskDriveError -f 1) `
+                    -ArgumentName 'DiskId'
+
+                It 'Should throw expected exception' {
+                    {
+                        $script:result = Get-TargetResource `
+                            -DiskId 1 `
+                            -Driveletter $script:testDriveLetter `
+                            -Verbose
+                    } | Should -Throw $errorRecord
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+        }
+        #endregion
+
+        #region Function Set-TargetResource
+        Describe 'MSFT_OpticalDiskDriveLetter\Set-TargetResource' {
+            Context 'Optical disk drive exists with the correct drive letter' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedOpticalDrive
+                } `
+                    -Verifiable
+
+                It 'Should not throw an exception' {
+                    {
+                        Set-TargetResource `
+                            -DiskId 1 `
+                            -Driveletter $script:testDriveLetter `
+                            -Verbose
+                    } | Should -Not -Throw
+                }
+
+                It 'Should call the correct mocks' {
+                    Assert-VerifiableMock
+                    Assert-MockCalled -CommandName Get-CimInstance -Exactly -Times 1
+                }
+            }
+
+            Context 'Optical disk drive exists with a drive letter when Ensure is set to Absent' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedOpticalDrive
+                } `
+                    -Verifiable
+
+                Mock `
+                    -CommandName Get-CimInstance  `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_Volume'
+                } `
+                    -MockWith {
+                    $script:mockedVolume
+                } `
+                    -Verifiable
+
+                Mock `
+                    -CommandName Set-CimInstance `
+                    -Verifiable
+
+                It 'Should not throw an exception' {
+                    {
+                        Set-TargetResource `
+                            -DiskId 1 `
+                            -Driveletter $script:testDriveLetter `
+                            -Ensure 'Absent' `
+                            -Verbose
+                    } | Should -Not -Throw
+                }
+
+                It 'Should call the correct mocks' {
+                    Assert-VerifiableMock
+                    Assert-MockCalled -CommandName Get-CimInstance -Exactly -Times 2
+                }
+            }
+
+            Context 'Optical disk drive exists with the wrong drive letter' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedWrongLetterOpticalDrive
+                } `
+                    -Verifiable
+
+                Mock `
+                    -CommandName Get-CimInstance  `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_Volume'
+                } `
+                    -MockWith {
+                    $script:mockedWrongVolume
+                } `
+                    -Verifiable
+
+                Mock `
+                    -CommandName Set-CimInstance `
+                    -Verifiable
+
+                It 'Should not throw an exception' {
+                    {
+                        Set-TargetResource `
+                            -DiskId 1 `
+                            -Driveletter $script:testDriveLetter `
+                            -Verbose
+                    } | Should -Not -Throw
+                }
+
+                It 'Should call the correct mocks' {
+                    Assert-VerifiableMock
+                    Assert-MockCalled -CommandName Get-CimInstance -Exactly -Times 2
+                    Assert-MockCalled -CommandName Set-CimInstance -Exactly -Times 1
+                }
+            }
+
+            Context 'IDE optical disk drive exists with the wrong drive letter' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedOpticalDriveIDE
+                } `
+                    -Verifiable
+
+                Mock `
+                    -CommandName Get-CimInstance  `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_Volume'
+                } `
+                    -MockWith {
+                    $script:mockedWrongVolume
+                } `
+                    -Verifiable
+
+                Mock `
+                    -CommandName Set-CimInstance `
+                    -Verifiable
+
+                It 'Should not throw an exception' {
+                    {
+                        Set-TargetResource `
+                            -DiskId 1 `
+                            -Driveletter $script:testDriveLetter `
+                            -Verbose
+                    } | Should -Not -Throw
+                }
+
+                It 'Should call the correct mocks' {
+                    Assert-VerifiableMock
+                    Assert-MockCalled -CommandName Get-CimInstance -Exactly -Times 2
+                    Assert-MockCalled -CommandName Set-CimInstance -Exactly -Times 1
+                }
+            }
+
+            Context 'Optical disk drive not present' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedNoOpticalDrive
+                } `
+                    -Verifiable
+
+                $errorRecord = Get-InvalidArgumentRecord `
+                    -Message ($LocalizedData.NoOpticalDiskDriveError -f 1) `
+                    -ArgumentName 'DiskId'
+
+                It 'Should throw expected exception' {
+                    {
+                        $script:result = Set-TargetResource `
+                            -DiskId 1 `
+                            -Driveletter $script:testDriveLetter `
+                            -Verbose
+                    } | Should -Throw $errorRecord
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+        }
+        #endregion
+
+        Describe 'MSFT_OpticalDiskDriveLetter\Test-TargetResource' {
+            Context 'Optical drive exists and is assigned expected drive letter' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedOpticalDrive
+                } `
+                    -Verifiable
+
+                It 'Should not throw an exception' {
+                    {
+                        $script:result = Test-TargetResource `
+                            -DiskId 1 `
+                            -DriveLetter $script:testDriveLetter `
+                            -Verbose
+                    } | Should -Not -Throw
+                }
+
+                It 'Should return $true' {
+                    $script:result | Should -Be $true
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+
+            Context 'Optical drive exists but is assigned a drive letter but should not be' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedOpticalDrive
+                } `
+                    -Verifiable
+
+                It 'Should not throw an exception' {
+                    {
+                        $script:result = Test-TargetResource `
+                            -DiskId 1 `
+                            -DriveLetter $script:testDriveLetter `
+                            -Ensure 'Absent' `
+                            -Verbose
+                    } | Should -Not -Throw
+                }
+
+                It 'Should return $false' {
+                    $script:result | Should -Be $false
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+
+            Context 'The drive letter already exists on a volume that is not an optical disk drive' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedWrongLetterOpticalDrive
+                } `
+                    -Verifiable
+
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_Volume'
+                } `
+                    -MockWith {
+                    $script:mockedVolume
+                } `
+                    -Verifiable
+
+                $errorRecord = Get-InvalidOperationRecord `
+                    -Message $($localizedData.DriveLetterAssignedToAnotherDrive -f $script:testDriveLetter)
+
+                It 'Should throw expected exception' {
+                    {
+                        $script:result = Test-TargetResource `
+                            -DiskId 1 `
+                            -DriveLetter $script:testDriveLetter `
+                            -Verbose
+                    } | Should -Throw $errorRecord
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+
+            Context 'The optical drive is assigned a drive letter but should not be' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedOpticalDrive
+                } `
+                    -Verifiable
+
+                It 'Should not throw an exception' {
+                    {
+                        $script:result = Test-TargetResource `
+                            -DiskId 1 `
+                            -DriveLetter $script:testDriveLetter `
+                            -Ensure 'Absent' `
+                            -Verbose
+                    } | Should -Not -Throw
+                }
+
+                It 'Should return $false' {
+                    $script:result | Should -Be $false
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+
+            Context 'The optical drive is not assigned a drive letter and should not be' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedOpticalDriveNoDriveLetter
+                } `
+                    -Verifiable
+
+                It 'Should not throw an exception' {
+                    {
+                        $script:result = Test-TargetResource `
+                            -DiskId 1 `
+                            -DriveLetter $script:testDriveLetter `
+                            -Ensure 'Absent' `
+                            -Verbose
+                    } | Should -Not -Throw
+                }
+
+                It 'Should return $true' {
+                    $script:result | Should -Be $true
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+
+            Context 'Optical disk drive not present' {
+                # verifiable (should be called) mocks
+                Mock `
+                    -CommandName Get-CimInstance `
+                    -ParameterFilter {
+                    $ClassName -eq 'Win32_CDROMDrive'
+                } `
+                    -MockWith {
+                    $script:mockedNoOpticalDrive
+                } `
+                    -Verifiable
+
+                $errorRecord = Get-InvalidArgumentRecord `
+                    -Message ($LocalizedData.NoOpticalDiskDriveError -f 1) `
+                    -ArgumentName 'DiskId'
+
+                It 'Should throw expected exception' {
+                    {
+                        $script:result = Test-TargetResource `
+                            -DiskId 1 `
+                            -Driveletter $script:testDriveLetter `
+                            -Verbose
+                    } | Should -Throw $errorRecord
+                }
+
+                It 'Should call all the Get mocks' {
+                    Assert-VerifiableMock
+                }
+            }
+        }
+        #endregion
+    }
+}
+finally
+{
+    #region FOOTER
+    Restore-TestEnvironment -TestEnvironment $TestEnvironment
+    #endregion
+}
diff --git a/Tests/Unit/MSFT_xWaitForDisk.Tests.ps1 b/Tests/Unit/MSFT_WaitForDisk.Tests.ps1
similarity index 98%
rename from Tests/Unit/MSFT_xWaitForDisk.Tests.ps1
rename to Tests/Unit/MSFT_WaitForDisk.Tests.ps1
index ea54f2e3..c2dcc2b2 100644
--- a/Tests/Unit/MSFT_xWaitForDisk.Tests.ps1
+++ b/Tests/Unit/MSFT_WaitForDisk.Tests.ps1
@@ -1,11 +1,11 @@
-$script:DSCModuleName = 'xStorage'
-$script:DSCResourceName = 'MSFT_xWaitForDisk'
+$script:DSCModuleName = 'StorageDsc'
+$script:DSCResourceName = 'MSFT_WaitForDisk'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
 #region HEADER
 # Unit Test Template Version: 1.1.0
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xStorage'
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
@@ -62,7 +62,7 @@ try
         #endregion
 
         #region Function Get-TargetResource
-        Describe "MSFT_xWaitForDisk\Get-TargetResource" {
+        Describe "MSFT_WaitForDisk\Get-TargetResource" {
             Context 'Disk is specified by Number' {
                 $script:result = $null
 
@@ -144,7 +144,7 @@ try
         #endregion
 
         #region Function Set-TargetResource
-        Describe 'MSFT_xWaitForDisk\Set-TargetResource' {
+        Describe 'MSFT_WaitForDisk\Set-TargetResource' {
             Mock -CommandName Start-Sleep
 
             Context "Disk Number $testDiskNumber is ready" {
@@ -282,7 +282,7 @@ try
         #endregion
 
         #region Function Test-TargetResource
-        Describe 'MSFT_xWaitForDisk\Test-TargetResource' {
+        Describe 'MSFT_WaitForDisk\Test-TargetResource' {
             Context "Disk Number $testDiskNumber is ready" {
                 # verifiable (Should Be called) mocks
                 Mock `
diff --git a/Tests/Unit/MSFT_xWaitForVolume.Tests.ps1 b/Tests/Unit/MSFT_WaitForVolume.Tests.ps1
similarity index 94%
rename from Tests/Unit/MSFT_xWaitForVolume.Tests.ps1
rename to Tests/Unit/MSFT_WaitForVolume.Tests.ps1
index f2c044f3..feb09c9e 100644
--- a/Tests/Unit/MSFT_xWaitForVolume.Tests.ps1
+++ b/Tests/Unit/MSFT_WaitForVolume.Tests.ps1
@@ -1,11 +1,11 @@
-$script:DSCModuleName      = 'xStorage'
-$script:DSCResourceName    = 'MSFT_xWaitForVolume'
+$script:DSCModuleName      = 'StorageDsc'
+$script:DSCResourceName    = 'MSFT_WaitForVolume'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
 #region HEADER
 # Unit Test Template Version: 1.1.0
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xStorage'
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
      (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
@@ -39,7 +39,7 @@ try
         #endregion
 
         #region Function Get-TargetResource
-        Describe "MSFT_xWaitForVolume\Get-TargetResource" {
+        Describe "MSFT_WaitForVolume\Get-TargetResource" {
             $resource = Get-TargetResource @driveCParameters -Verbose
             It "DriveLetter Should Be $($driveCParameters.DriveLetter)" {
                 $resource.DriveLetter | Should -Be $driveCParameters.DriveLetter
@@ -60,7 +60,7 @@ try
         #endregion
 
         #region Function Set-TargetResource
-        Describe 'MSFT_xWaitForVolume\Set-TargetResource' {
+        Describe 'MSFT_WaitForVolume\Set-TargetResource' {
             Mock Start-Sleep
             Mock Get-PSDrive
 
@@ -102,7 +102,7 @@ try
         #endregion
 
         #region Function Test-TargetResource
-        Describe 'MSFT_xWaitForVolume\Test-TargetResource' {
+        Describe 'MSFT_WaitForVolume\Test-TargetResource' {
             Mock Get-PSDrive
 
             Context 'drive C is ready' {
diff --git a/Tests/Unit/StorageDsc.Common.Tests.ps1 b/Tests/Unit/StorageDsc.Common.Tests.ps1
index 5d85b48d..4ab73cab 100644
--- a/Tests/Unit/StorageDsc.Common.Tests.ps1
+++ b/Tests/Unit/StorageDsc.Common.Tests.ps1
@@ -4,7 +4,7 @@ Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot
 
 #region HEADER
 # Unit Test Template Version: 1.1.0
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xStorage'
+[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\StorageDsc'
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
diff --git a/appveyor.yml b/appveyor.yml
index 32bbcdda..e5fb85a9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,7 @@ install:
     - git clone https://github.com/PowerShell/DscResource.Tests
 
     - ps: |
-        $moduleName = 'xStorage'
+        $moduleName = 'StorageDsc'
         $mainModuleFolder = "Modules\$moduleName"
         Import-Module "$env:APPVEYOR_BUILD_FOLDER\DscResource.Tests\AppVeyor.psm1"
         Invoke-AppveyorInstallTask -PesterMaximumVersion 4.0.8