From 5b69372f892414ff5ab2251ec92a80a87bb5c63a Mon Sep 17 00:00:00 2001
From: Nick G <nickgw@users.noreply.github.com>
Date: Wed, 8 Jun 2022 04:01:30 -0400
Subject: [PATCH] BREAKING CHANGE: xHyper-V renamed to HyperVDsc: Renamed all
 DSCResources, Examples, Modules and Tests where applicable (#194)

---
 .vscode/tasks.json                            |   6 +-
 CHANGELOG.md                                  |   6 +
 README.md                                     | 192 +++++++++---------
 RequiredModules.psd1                          |   4 +-
 Resolve-Dependency.ps1                        |   2 +-
 build.ps1                                     |   3 +-
 build.yaml                                    |  16 +-
 codecov.yml                                   |   5 +-
 .../MSFT_xVHD.psm1 => DSC_VHD/DSC_Vhd.psm1}   |   6 +-
 .../DSC_Vhd.schema.mof}                       |   4 +-
 .../{MSFT_xVHD => DSC_VHD}/README.md          |   0
 .../en-US/DSC_Vhd.strings.psd1}               |   0
 .../DSC_VMDvdDrive.psm1}                      |   0
 .../DSC_VMDvdDrive.schema.mof}                |   4 +-
 .../README.md                                 |   0
 .../en-US/DSC_VMDvdDrive.strings.psd1}        |   0
 .../DSC_VMHardDiskDrive.psm1}                 |   0
 .../DSC_VMHardDiskDrive.schema.mof}           |   4 +-
 .../README.md                                 |   0
 .../en-US/DSC_VMHardDiskDrive.strings.psd1}   |   0
 .../DSC_VMHost.psm1}                          |   6 +-
 .../DSC_VMHost.schema.mof}                    |   4 +-
 .../{MSFT_xVMHost => DSC_VMHost}/README.md    |   0
 .../en-US/DSC_VMHost.strings.psd1}            |   0
 .../DSC_VMHyperV.psm1}                        |   0
 .../DSC_VMHyperV.schema.mof}                  |   4 +-
 .../README.md                                 |   0
 .../en-US/DSC_VMHyperV.strings.psd1}          |   0
 .../DSC_VMNetworkAdapter.psm1}                |   8 +-
 .../DSC_VMNetworkAdapter.schema.mof}          |   8 +-
 .../README.md                                 |   0
 .../en-US/DSC_VMNetworkAdapter.strings.psd1}  |   0
 .../DSC_VMProcessor.psm1}                     |   6 +-
 .../DSC_VMProcessor.schema.mof}               |   4 +-
 .../README.md                                 |   0
 .../en-US/DSC_VMProcessor.strings.psd1}       |   0
 .../DSC_VMScsiController.psm1}                |   0
 .../DSC_VMScsiController.schema.mof}          |   4 +-
 .../README.md                                 |   0
 .../en-US/DSC_VMScsiController.strings.psd1}  |   0
 .../DSC_VMSwitch.psm1}                        |   6 +-
 .../DSC_VMSwitch.schema.mof}                  |   4 +-
 .../README.md                                 |   0
 .../en-US/DSC_VMSwitch.strings.psd1}          |   0
 .../DSC_VhdFileDirectory.psm1}                |   0
 .../DSC_VhdFileDirectory.schema.mof}          |   8 +-
 .../README.md                                 |   0
 .../en-US/DSC_VhdFileDirectory.strings.psd1}  |   0
 ...s1 => Sample_EndToEndHyperV_RunningVM.ps1} |  16 +-
 ...MHardDiskDrive_VMWith4AdditionalDisks.ps1} |  20 +-
 ...ample_VMHardDiskDrive_VMWithExtraDisk.ps1} |  16 +-
 ...Host_Paths.ps1 => Sample_VMHost_Paths.ps1} |   6 +-
 ...plete.ps1 => Sample_VMHyperV_Complete.ps1} |  10 +-
 ....ps1 => Sample_VMHyperV_DynamicMemory.ps1} |   6 +-
 ...s.ps1 => Sample_VMHyperV_MultipleNICs.ps1} |  16 +-
 ..._Simple.ps1 => Sample_VMHyperV_Simple.ps1} |   6 +-
 ...=> Sample_VMHyperV_SimpleWithDVDDrive.ps1} |  10 +-
 ...HyperV_SimpleWithNestedVirtualization.ps1} |  10 +-
 ... Sample_VMNetworkAdapter_ManagementOS.ps1} |   6 +-
 ...VMNetworkAdapter_MultipleManagementOS.ps1} |   8 +-
 ...=> Sample_VMNetworkAdapter_MultipleVM.ps1} |  10 +-
 ...VMNetworkAdapter_MultipleVMMACAddress.ps1} |   8 +-
 ...etworkAdapter_VMStaticNetworkSettings.ps1} |   8 +-
 ...Sample_VMNetworkAdapter_VMVlanTagging.ps1} |   6 +-
 ...ample_VMScsiController_AddControllers.ps1} |  14 +-
 ...ernal.ps1 => Sample_VMSwitch_External.ps1} |   6 +-
 ...ET.ps1 => Sample_VMSwitch_ExternalSET.ps1} |   6 +-
 ...=> Sample_VMSwitch_ExternalSET_LBMode.ps1} |   6 +-
 ...ernal.ps1 => Sample_VMSwitch_Internal.ps1} |   6 +-
 ...1 => Sample_Vhd_AdditionalPropertyVHD.ps1} |   6 +-
 ...ute.ps1 => Sample_Vhd_ChangeAttribute.ps1} |   8 +-
 ...er.ps1 => Sample_Vhd_CopyFileOrFolder.ps1} |   8 +-
 ...Vhd_DiffVHD.ps1 => Sample_Vhd_DiffVHD.ps1} |   6 +-
 ...d_FixedVHD.ps1 => Sample_Vhd_FixedVHD.ps1} |   6 +-
 ....ps1 => Sample_Vhd_MissingPropertyVHD.ps1} |   6 +-
 ..._xVhd_NewVHD.ps1 => Sample_Vhd_NewVHD.ps1} |   6 +-
 ... Sample_Vhd_RemoveFileOrFolderFromVHD.ps1} |   8 +-
 source/{xHyper-V.psd1 => HyperVDsc.psd1}      |   4 +-
 .../HyperVDsc.Common/HyperVDsc.Common.psd1    |   2 +-
 ...er-V.help.txt => about_HyperVDsc.help.txt} |   8 +-
 source/xHyper-V.psm1                          |   4 -
 ...1 => DSC_VMDvdDrive.Integration.Tests.ps1} |   4 +-
 ...nfig.ps1 => DSC_VMDvdDrive_add.config.ps1} |   6 +-
 ...g.ps1 => DSC_VMDvdDrive_remove.config.ps1} |   6 +-
 ...s.ps1 => DSC_VMHost.Integration.Tests.ps1} |   4 +-
 ...t.config.ps1 => DSC_VMHost_set.config.ps1} |   6 +-
 ... => DSC_VMProcessor.Integration.Tests.ps1} |   4 +-
 ...fig.ps1 => DSC_VMProcessor_set.config.ps1} |   4 +-
 ...{MSFT_xVHD.Tests.ps1 => DSC_VHD.Tests.ps1} |  12 +-
 ...ive.Tests.ps1 => DSC_VMDvdDrive.Tests.ps1} |  12 +-
 ...ests.ps1 => DSC_VMHardDiskDrive.Tests.ps1} |  10 +-
 ...xVMHost.Tests.ps1 => DSC_VMHost.Tests.ps1} |  10 +-
 ...yperV.Tests.ps1 => DSC_VMHyperV.Tests.ps1} |   4 +-
 ...sts.ps1 => DSC_VMNetworkAdapter.Tests.ps1} |  12 +-
 ...or.Tests.ps1 => DSC_VMProcessor.Tests.ps1} |  12 +-
 ...sts.ps1 => DSC_VMScsiController.Tests.ps1} |  10 +-
 ...Switch_BandwidthReservationMode.Tests.ps1} |   4 +-
 ..._VMSwitch_EnableEmbeddedTeaming.Tests.ps1} |   6 +-
 ...Id.Tests.ps1 => DSC_VMSwitch_Id.Tests.ps1} |  10 +-
 ...sts.ps1 => DSC_VhdFileDirectory.Tests.ps1} |  18 +-
 100 files changed, 372 insertions(+), 368 deletions(-)
 rename source/DSCResources/{MSFT_xVHD/MSFT_xVHD.psm1 => DSC_VHD/DSC_Vhd.psm1} (98%)
 rename source/DSCResources/{MSFT_xVHD/MSFT_xVHD.schema.mof => DSC_VHD/DSC_Vhd.schema.mof} (92%)
 rename source/DSCResources/{MSFT_xVHD => DSC_VHD}/README.md (100%)
 rename source/DSCResources/{MSFT_xVHD/en-US/MSFT_xVHD.strings.psd1 => DSC_VHD/en-US/DSC_Vhd.strings.psd1} (100%)
 rename source/DSCResources/{MSFT_xVMDvdDrive/MSFT_xVMDvdDrive.psm1 => DSC_VMDvdDrive/DSC_VMDvdDrive.psm1} (100%)
 rename source/DSCResources/{MSFT_xVMDvdDrive/MSFT_xVMDvdDrive.schema.mof => DSC_VMDvdDrive/DSC_VMDvdDrive.schema.mof} (87%)
 rename source/DSCResources/{MSFT_xVMDvdDrive => DSC_VMDvdDrive}/README.md (100%)
 rename source/DSCResources/{MSFT_xVMDvdDrive/en-US/MSFT_xVMDvdDrive.strings.psd1 => DSC_VMDvdDrive/en-US/DSC_VMDvdDrive.strings.psd1} (100%)
 rename source/DSCResources/{MSFT_xVMHardDiskDrive/MSFT_xVMHardDiskDrive.psm1 => DSC_VMHardDiskDrive/DSC_VMHardDiskDrive.psm1} (100%)
 rename source/DSCResources/{MSFT_xVMHardDiskDrive/MSFT_xVMHardDiskDrive.schema.mof => DSC_VMHardDiskDrive/DSC_VMHardDiskDrive.schema.mof} (90%)
 rename source/DSCResources/{MSFT_xVMHardDiskDrive => DSC_VMHardDiskDrive}/README.md (100%)
 rename source/DSCResources/{MSFT_xVMHardDiskDrive/en-US/MSFT_xVMHardDiskDrive.strings.psd1 => DSC_VMHardDiskDrive/en-US/DSC_VMHardDiskDrive.strings.psd1} (100%)
 rename source/DSCResources/{MSFT_xVMHost/MSFT_xVMHost.psm1 => DSC_VMHost/DSC_VMHost.psm1} (98%)
 rename source/DSCResources/{MSFT_xVMHost/MSFT_xVMHost.schema.mof => DSC_VMHost/DSC_VMHost.schema.mof} (97%)
 rename source/DSCResources/{MSFT_xVMHost => DSC_VMHost}/README.md (100%)
 rename source/DSCResources/{MSFT_xVMHost/en-US/MSFT_xVMHost.strings.psd1 => DSC_VMHost/en-US/DSC_VMHost.strings.psd1} (100%)
 rename source/DSCResources/{MSFT_xVMHyperV/MSFT_xVMHyperV.psm1 => DSC_VMHyperV/DSC_VMHyperV.psm1} (100%)
 rename source/DSCResources/{MSFT_xVMHyperV/MSFT_xVMHyperV.schema.mof => DSC_VMHyperV/DSC_VMHyperV.schema.mof} (96%)
 rename source/DSCResources/{MSFT_xVMHyperV => DSC_VMHyperV}/README.md (100%)
 rename source/DSCResources/{MSFT_xVMHyperV/en-US/MSFT_xVMHyperV.strings.psd1 => DSC_VMHyperV/en-US/DSC_VMHyperV.strings.psd1} (100%)
 rename source/DSCResources/{MSFT_xVMNetworkAdapter/MSFT_xVMNetworkAdapter.psm1 => DSC_VMNetworkAdapter/DSC_VMNetworkAdapter.psm1} (98%)
 rename source/DSCResources/{MSFT_xVMNetworkAdapter/MSFT_xVMNetworkAdapter.schema.mof => DSC_VMNetworkAdapter/DSC_VMNetworkAdapter.schema.mof} (68%)
 rename source/DSCResources/{MSFT_xVMNetworkAdapter => DSC_VMNetworkAdapter}/README.md (100%)
 rename source/DSCResources/{MSFT_xVMNetworkAdapter/en-US/MSFT_xVMNetworkAdapter.strings.psd1 => DSC_VMNetworkAdapter/en-US/DSC_VMNetworkAdapter.strings.psd1} (100%)
 rename source/DSCResources/{MSFT_xVMProcessor/MSFT_xVMProcessor.psm1 => DSC_VMProcessor/DSC_VMProcessor.psm1} (98%)
 rename source/DSCResources/{MSFT_xVMProcessor/MSFT_xVMProcessor.schema.mof => DSC_VMProcessor/DSC_VMProcessor.schema.mof} (95%)
 rename source/DSCResources/{MSFT_xVMProcessor => DSC_VMProcessor}/README.md (100%)
 rename source/DSCResources/{MSFT_xVMProcessor/en-US/MSFT_xVMProcessor.strings.psd1 => DSC_VMProcessor/en-US/DSC_VMProcessor.strings.psd1} (100%)
 rename source/DSCResources/{MSFT_xVMScsiController/MSFT_xVMScsiController.psm1 => DSC_VMScsiController/DSC_VMScsiController.psm1} (100%)
 rename source/DSCResources/{MSFT_xVMScsiController/MSFT_xVMScsiController.schema.mof => DSC_VMScsiController/DSC_VMScsiController.schema.mof} (86%)
 rename source/DSCResources/{MSFT_xVMScsiController => DSC_VMScsiController}/README.md (100%)
 rename source/DSCResources/{MSFT_xVMScsiController/en-US/MSFT_xVMScsiController.strings.psd1 => DSC_VMScsiController/en-US/DSC_VMScsiController.strings.psd1} (100%)
 rename source/DSCResources/{MSFT_xVMSwitch/MSFT_xVMSwitch.psm1 => DSC_VMSwitch/DSC_VMSwitch.psm1} (99%)
 rename source/DSCResources/{MSFT_xVMSwitch/MSFT_xVMSwitch.schema.mof => DSC_VMSwitch/DSC_VMSwitch.schema.mof} (93%)
 rename source/DSCResources/{MSFT_xVMSwitch => DSC_VMSwitch}/README.md (100%)
 rename source/DSCResources/{MSFT_xVMSwitch/en-US/MSFT_xVMSwitch.strings.psd1 => DSC_VMSwitch/en-US/DSC_VMSwitch.strings.psd1} (100%)
 rename source/DSCResources/{MSFT_xVhdFileDirectory/MSFT_xVhdFileDirectory.psm1 => DSC_VhdFileDirectory/DSC_VhdFileDirectory.psm1} (100%)
 rename source/DSCResources/{MSFT_xVhdFileDirectory/MSFT_xVhdFileDirectory.schema.mof => DSC_VhdFileDirectory/DSC_VhdFileDirectory.schema.mof} (71%)
 rename source/DSCResources/{MSFT_xVhdFileDirectory => DSC_VhdFileDirectory}/README.md (100%)
 rename source/DSCResources/{MSFT_xVhdFileDirectory/en-US/MSFT_xVhdFileDirectory.strings.psd1 => DSC_VhdFileDirectory/en-US/DSC_VhdFileDirectory.strings.psd1} (100%)
 rename source/Examples/{Sample_EndToEndXHyperV_RunningVM.ps1 => Sample_EndToEndHyperV_RunningVM.ps1} (80%)
 rename source/Examples/{Sample_xVMHardDiskDrive_VMWith4AdditionalDisks.ps1 => Sample_VMHardDiskDrive_VMWith4AdditionalDisks.ps1} (83%)
 rename source/Examples/{Sample_xVMHardDiskDrive_VMWithExtraDisk.ps1 => Sample_VMHardDiskDrive_VMWithExtraDisk.ps1} (86%)
 rename source/Examples/{Sample_xVMHost_Paths.ps1 => Sample_VMHost_Paths.ps1} (73%)
 rename source/Examples/{Sample_xVMHyperV_Complete.ps1 => Sample_VMHyperV_Complete.ps1} (94%)
 rename source/Examples/{Sample_xVMHyperV_DynamicMemory.ps1 => Sample_VMHyperV_DynamicMemory.ps1} (90%)
 rename source/Examples/{Sample_xVMHyperV_MultipleNICs.ps1 => Sample_VMHyperV_MultipleNICs.ps1} (79%)
 rename source/Examples/{Sample_xVMHyperV_Simple.ps1 => Sample_VMHyperV_Simple.ps1} (86%)
 rename source/Examples/{Sample_xVMHyperV_SimpleWithDVDDrive.ps1 => Sample_VMHyperV_SimpleWithDVDDrive.ps1} (82%)
 rename source/Examples/{Sample_xVMHyperV_SimpleWithNestedVirtualization.ps1 => Sample_VMHyperV_SimpleWithNestedVirtualization.ps1} (82%)
 rename source/Examples/{Sample_xVMNetworkAdapter_ManagementOS.ps1 => Sample_VMNetworkAdapter_ManagementOS.ps1} (60%)
 rename source/Examples/{Sample_xVMNetworkAdapter_MultipleManagementOS.ps1 => Sample_VMNetworkAdapter_MultipleManagementOS.ps1} (65%)
 rename source/Examples/{Sample_xVMNetworkAdapter_MultipleVM.ps1 => Sample_VMNetworkAdapter_MultipleVM.ps1} (70%)
 rename source/Examples/{Sample_xVMNetworkAdapter_MultipleVMMACAddress.ps1 => Sample_VMNetworkAdapter_MultipleVMMACAddress.ps1} (69%)
 rename source/Examples/{Sample_xVMNetworkAdapter_VMStaticNetworkSettings.ps1 => Sample_VMNetworkAdapter_VMStaticNetworkSettings.ps1} (67%)
 rename source/Examples/{Sample_xVMNetworkAdapter_VMVlanTagging.ps1 => Sample_VMNetworkAdapter_VMVlanTagging.ps1} (64%)
 rename source/Examples/{Sample_xVMScsiController_AddControllers.ps1 => Sample_VMScsiController_AddControllers.ps1} (82%)
 rename source/Examples/{Sample_xVMSwitch_External.ps1 => Sample_VMSwitch_External.ps1} (86%)
 rename source/Examples/{Sample_xVMSwitch_ExternalSET.ps1 => Sample_VMSwitch_ExternalSET.ps1} (89%)
 rename source/Examples/{Sample_xVMSwitch_ExternalSET_LBMode.ps1 => Sample_VMSwitch_ExternalSET_LBMode.ps1} (89%)
 rename source/Examples/{Sample_xVMSwitch_Internal.ps1 => Sample_VMSwitch_Internal.ps1} (83%)
 rename source/Examples/{Sample_xVhd_AdditionalPropertyVHD.ps1 => Sample_Vhd_AdditionalPropertyVHD.ps1} (88%)
 rename source/Examples/{Sample_xVhd_ChangeAttribute.ps1 => Sample_Vhd_ChangeAttribute.ps1} (75%)
 rename source/Examples/{Sample_xVhd_CopyFileOrFolder.ps1 => Sample_Vhd_CopyFileOrFolder.ps1} (70%)
 rename source/Examples/{Sample_xVhd_DiffVHD.ps1 => Sample_Vhd_DiffVHD.ps1} (93%)
 rename source/Examples/{Sample_xVhd_FixedVHD.ps1 => Sample_Vhd_FixedVHD.ps1} (92%)
 rename source/Examples/{Sample_xVhd_MissingPropertyVHD.ps1 => Sample_Vhd_MissingPropertyVHD.ps1} (84%)
 rename source/Examples/{Sample_xVhd_NewVHD.ps1 => Sample_Vhd_NewVHD.ps1} (92%)
 rename source/Examples/{Sample_xVhd_RemoveFileOrFolderFromVHD.ps1 => Sample_Vhd_RemoveFileOrFolderFromVHD.ps1} (68%)
 rename source/{xHyper-V.psd1 => HyperVDsc.psd1} (92%)
 rename source/en-US/{about_xHyper-V.help.txt => about_HyperVDsc.help.txt} (74%)
 delete mode 100644 source/xHyper-V.psm1
 rename tests/Integration/{MSFT_xVMDvdDrive.Integration.Tests.ps1 => DSC_VMDvdDrive.Integration.Tests.ps1} (98%)
 rename tests/Integration/{MSFT_xVMDvdDrive_add.config.ps1 => DSC_VMDvdDrive_add.config.ps1} (69%)
 rename tests/Integration/{MSFT_xVMDvdDrive_remove.config.ps1 => DSC_VMDvdDrive_remove.config.ps1} (68%)
 rename tests/Integration/{MSFT_xVMHost.Integration.Tests.ps1 => DSC_VMHost.Integration.Tests.ps1} (97%)
 rename tests/Integration/{MSFT_xVMHost_set.config.ps1 => DSC_VMHost_set.config.ps1} (82%)
 rename tests/Integration/{MSFT_xVMProcessor.Integration.Tests.ps1 => DSC_VMProcessor.Integration.Tests.ps1} (97%)
 rename tests/Integration/{MSFT_xVMProcessor_set.config.ps1 => DSC_VMProcessor_set.config.ps1} (79%)
 rename tests/Unit/{MSFT_xVHD.Tests.ps1 => DSC_VHD.Tests.ps1} (97%)
 rename tests/Unit/{MSFT_xVMDvdDrive.Tests.ps1 => DSC_VMDvdDrive.Tests.ps1} (98%)
 rename tests/Unit/{MSFT_xVMHardDiskDrive.Tests.ps1 => DSC_VMHardDiskDrive.Tests.ps1} (97%)
 rename tests/Unit/{MSFT_xVMHost.Tests.ps1 => DSC_VMHost.Tests.ps1} (98%)
 rename tests/Unit/{MSFT_xVMHyperV.Tests.ps1 => DSC_VMHyperV.Tests.ps1} (99%)
 rename tests/Unit/{MSFT_xVMNetworkAdapter.Tests.ps1 => DSC_VMNetworkAdapter.Tests.ps1} (96%)
 rename tests/Unit/{MSFT_xVMProcessor.Tests.ps1 => DSC_VMProcessor.Tests.ps1} (97%)
 rename tests/Unit/{MSFT_xVMScsiController.Tests.ps1 => DSC_VMScsiController.Tests.ps1} (98%)
 rename tests/Unit/{MSFT_xVMSwitch_BandwidthReservationMode.Tests.ps1 => DSC_VMSwitch_BandwidthReservationMode.Tests.ps1} (99%)
 rename tests/Unit/{MSFT_xVMSwitch_EnableEmbeddedTeaming.Tests.ps1 => DSC_VMSwitch_EnableEmbeddedTeaming.Tests.ps1} (99%)
 rename tests/Unit/{MSFT_xVMSwitch_Id.Tests.ps1 => DSC_VMSwitch_Id.Tests.ps1} (98%)
 rename tests/Unit/{MSFT_xVhdFileDirectory.Tests.ps1 => DSC_VhdFileDirectory.Tests.ps1} (97%)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 2991140..3a3fc21 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -84,7 +84,11 @@
             "label": "test",
             "type": "shell",
             "command": "&${cwd}/build.ps1",
-            "args": ["-AutoRestore","-Tasks","test"],
+            "args": [
+                "-AutoRestore",
+                "-Tasks",
+                "test"
+            ],
             "presentation": {
                 "echo": true,
                 "reveal": "always",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1708d5d..01324b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md).
 
 ## [Unreleased]
+- xHyper-V
+  - BREAKING CHANGE
+    - Renamed _xHyper-V_ to _HyperVDsc - fixes [Issue #69](https://github.com/PowerShell/xHyper-V/issues/213).
+    - Changed all MSFT_xResourceName to DSC_ResourceName.
+    - Updated DSCResources, Examples, Modules and Tests for new naming.
+    - Updated README.md from _xHyper-V_ to _HyperVDsc
 
 ## [3.18.0] - 2022-06-04
 
diff --git a/README.md b/README.md
index 09bb4c4..06bbb09 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
-# xHyper-V
+# HyperVDsc
 
 This module contains DSC resources for the management and
 configuration of Hyper-V hosts, virtual machines and related resources.
 
-[![Build Status](https://dev.azure.com/dsccommunity/xHyper-V/_apis/build/status/dsccommunity.xHyper-V?branchName=master)](https://dev.azure.com/dsccommunity/xHyper-V/_build/latest?definitionId=25&branchName=master)
-![Azure DevOps coverage (branch)](https://img.shields.io/azure-devops/coverage/dsccommunity/xHyper-V/25/master)
-[![codecov](https://codecov.io/gh/dsccommunity/xHyper-V/branch/master/graph/badge.svg)](https://codecov.io/gh/dsccommunity/xHyper-V)
-[![Azure DevOps tests](https://img.shields.io/azure-devops/tests/dsccommunity/xHyper-V/25/master)](https://dsccommunity.visualstudio.com/xHyper-V/_test/analytics?definitionId=25&contextType=build)
-[![PowerShell Gallery (with prereleases)](https://img.shields.io/powershellgallery/vpre/xHyper-V?label=xHyper-V%20Preview)](https://www.powershellgallery.com/packages/xHyper-V/)
-[![PowerShell Gallery](https://img.shields.io/powershellgallery/v/xHyper-V?label=xHyper-V)](https://www.powershellgallery.com/packages/xHyper-V/)
+[![Build Status](https://dev.azure.com/dsccommunity/HyperVDsc/_apis/build/status/dsccommunity.HyperVDsc?branchName=master)](https://dev.azure.com/dsccommunity/HyperVDsc/_build/latest?definitionId=25&branchName=master)
+![Azure DevOps coverage (branch)](https://img.shields.io/azure-devops/coverage/dsccommunity/HyperVDsc/25/master)
+[![codecov](https://codecov.io/gh/dsccommunity/HyperVDsc/branch/master/graph/badge.svg)](https://codecov.io/gh/dsccommunity/HyperVDsc)
+[![Azure DevOps tests](https://img.shields.io/azure-devops/tests/dsccommunity/HyperVDsc/25/master)](https://dsccommunity.visualstudio.com/HyperVDsc/_test/analytics?definitionId=25&contextType=build)
+[![PowerShell Gallery (with prereleases)](https://img.shields.io/powershellgallery/vpre/HyperVDsc?label=HyperVDsc%20Preview)](https://www.powershellgallery.com/packages/HyperVDsc/)
+[![PowerShell Gallery](https://img.shields.io/powershellgallery/v/HyperVDsc?label=HyperVDsc)](https://www.powershellgallery.com/packages/HyperVDsc/)
 
 ## Code of Conduct
 
@@ -31,47 +31,47 @@ A full list of changes in each version can be found in the [change log](CHANGELO
 
 ## Documentation
 
-The documentation can be found in the [xHyper-V Wiki](https://github.com/dsccommunity/xHyper-V/wiki).
+The documentation can be found in the [HyperVDsc Wiki](https://github.com/dsccommunity/HyperVDsc/wiki).
 The DSC resources schema files is used to automatically update the
 documentation on each PR merge.
 
 ### Examples
 
-You can review the [Examples](/source/Examples) directory in the xHyper-V module
+You can review the [Examples](/source/Examples) directory in the HyperVDsc module
 for some general use scenarios for all of the resources that are in the module.
 
-The resource examples are also available in the [xHyper-V Wiki](https://github.com/dsccommunity/xHyper-V/wiki).
+The resource examples are also available in the [HyperVDsc Wiki](https://github.com/dsccommunity/HyperVDsc/wiki).
 
 ## Resources
 
-* [**xVHD**](#xvhd) manages VHDs in a Hyper-V host.
-* [**xVhdFile**](#xvhdfile) manages files or directories in a VHD.
+* [**VHD**](#Vhd) manages VHDs in a Hyper-V host.
+* [**VhdFile**](#Vhdfile) manages files or directories in a VHD.
  You can use it to copy files/folders to the VHD, remove files/folders from a VHD,
  and change attributes of a file in a VHD (e.g. change a file attribute to
  'ReadOnly' or 'Hidden').
  This resource is particularly useful when bootstrapping DSC Configurations
  into a VM.
-* [**xVMDvdDrive**](#xvmdvddrive) manages DVD drives attached to a Hyper-V
+* [**VMDvdDrive**](#Vmdvddrive) manages DVD drives attached to a Hyper-V
  virtual machine.
-* [**xVMHardDiskDrive**](#xvmharddiskdrive) manages VHD(X)s attached to a Hyper-V virtual machine.
-* [**xVMHost**](#xvmhost) manages Hyper-V host settings.
-* [**xVMHyperV**](#xvmhyperv) manages VMs in a Hyper-V host.
-* [**xVMNetworkAdapter**](#xvmnetworkadapter) manages VMNetadapters attached to
+* [**VMHardDiskDrive**](#Vmharddiskdrive) manages VHD(X)s attached to a Hyper-V virtual machine.
+* [**VMHost**](#Vmhost) manages Hyper-V host settings.
+* [**VMHyperV**](#Vmhyperv) manages VMs in a Hyper-V host.
+* [**VMNetworkAdapter**](#Vmnetworkadapter) manages VMNetadapters attached to
  a Hyper-V virtual machine or the management OS.
-* [**xVMProcessor**](#xvmprocessor) manages Hyper-V virtual machine processor options.
-* [**xVMScsiController**](#xvmscsicontroller) manages the SCSI controllers attached to a Hyper-V virtual machine.
-* [**xVMSwitch**](#xvmswitch) manages virtual switches in a Hyper-V host.
+* [**VMProcessor**](#Vmprocessor) manages Hyper-V virtual machine processor options.
+* [**VMScsiController**](#Vmscsicontroller) manages the SCSI controllers attached to a Hyper-V virtual machine.
+* [**VMSwitch**](#Vmswitch) manages virtual switches in a Hyper-V host.
 
-### xVHD
+### VHD
 
 Manages VHDs in a Hyper-V host.
 
-#### Requirements for xVHD
+#### Requirements for VHD
 
 * The Hyper-V Role has to be installed on the machine.
 * The Hyper-V PowerShell module has to be installed on the machine.
 
-#### Parameters for xVHD
+#### Parameters for VHD
 
 * **`[String]` Name** _(Key)_: The desired VHD file name.
 * **`[String]` Path** _(Key)_: The desired Path where the VHD will be created.
@@ -84,20 +84,20 @@ Manages VHDs in a Hyper-V host.
 * **`[String]` Ensure** _(Write)_: Ensures that the VHD is Present or Absent.
  The default value is Present. { *Present* | Absent }.
 
-#### Read-Only Properties from Get-TargetResource for xVHD
+#### Read-Only Properties from Get-TargetResource for VHD
 
 * **`[String]` ID** _(Read)_: Virtual Disk Identifier.
 * **`[String]` Type** _(Read)_: Type of Vhd - Dynamic, Fixed, Differencing.
 * **`[Uint64]` FileSizeBytes** _(Read)_: Current size of the VHD.
 * **`[Boolean]` IsAttached** _(Read)_: Is the VHD attached to a VM or not.
 
-#### Examples xVHD
+#### Examples VHD
 
-* [Create a new VHD](/source/Examples/Sample_xVHD_NewVHD.ps1)
-* [Create a new Fixed VHD](/source/Examples/Sample_xVHD_FixedVHD.ps1)
-* [Create a differencing VHD](/source/Examples/Sample_xVHD_DiffVHD.ps1)
+* [Create a new VHD](/source/Examples/Sample_Vhd_NewVHD.ps1)
+* [Create a new Fixed VHD](/source/Examples/Sample_Vhd_FixedVHD.ps1)
+* [Create a differencing VHD](/source/Examples/Sample_Vhd_DiffVHD.ps1)
 
-### xVhdFile
+### VhdFile
 
 Manages files or directories in a VHD.
  You can use it to copy files/folders to the VHD, remove files/folders from a VHD,
@@ -106,22 +106,22 @@ Manages files or directories in a VHD.
  This resource is particularly useful when bootstrapping DSC Configurations
  into a VM.
 
-#### Requirements for xVhdFile
+#### Requirements for VhdFile
 
 * The Hyper-V Role has to be installed on the machine.
 * The Hyper-V PowerShell module has to be installed on the machine.
 
-#### Parameters for xVhdFile
+#### Parameters for VhdFile
 
 * **`[String]` VhdPath** _(Key)_: Path to the VHD.
-* **`[MSFT_xFileDirectory[]]` FileDirectory** _(Required)_: The FileDirectory objects
+* **`[DSC_FileDirectory[]]` FileDirectory** _(Required)_: The FileDirectory objects
  to copy to the VHD (as used in the "File" resource).
  Please see the Examples section for more details.
 * **`[String]` CheckSum** _(Write)_: Indicates the checksum type to use when determining
  whether two files are the same. The default value is ModifiedDate.
  { *ModifiedDate* | SHA-1 | SHA-256 | SHA-512 }.
 
-##### MSFT_xFileDirectory Class
+##### DSC_FileDirectory Class
 
 * **`[String]` DestinationPath** _(Required)_: Indicates the location where you want
  to ensure the state for a file or directory.
@@ -145,24 +145,24 @@ Manages files or directories in a VHD.
 * **`[String[]]` Attributes** _(Write)_: Specifies the desired state of the attributes
  for the targeted file or directory. { ReadOnly | Hidden | System | Archive }.
 
-#### Read-Only Properties from Get-TargetResource for xVhdFile
+#### Read-Only Properties from Get-TargetResource for VhdFile
 
 None
 
-#### Examples xVhdFile
+#### Examples VhdFile
 
 * [Multiple examples](/source/Examples)
 
-### xVMDvdDrive
+### VMDvdDrive
 
 Manages DVD drives attached to a Hyper-V virtual machine.
 
-#### Requirements for xVMDvdDrive
+#### Requirements for VMDvdDrive
 
 * The Hyper-V Role has to be installed on the machine.
 * The Hyper-V PowerShell module has to be installed on the machine.
 
-#### Parameters for xVMDvdDrive
+#### Parameters for VMDvdDrive
 
 * **`[String]` VMName** _(Key)_: Specifies the name of the virtual machine
  to which the DVD drive is to be added.
@@ -175,26 +175,26 @@ Manages DVD drives attached to a Hyper-V virtual machine.
 * **`[String]` Ensure** _(Write)_: Specifies if the DVD Drive should exist or not.
   The default value is Present. { *Present* | Absent }.
 
-#### Read-Only Properties from Get-TargetResource for xVMDvdDrive
+#### Read-Only Properties from Get-TargetResource for VMDvdDrive
 
 None
 
-#### Examples xVMDvdDrive
+#### Examples VMDvdDrive
 
-* [Create a VM, given a VHDX and add a DVD Drives](/source/Examples/Sample_xVMHyperV_SimpleWithDVDDrive.ps1)
+* [Create a VM, given a VHDX and add a DVD Drives](/source/Examples/Sample_VMHyperV_SimpleWithDVDDrive.ps1)
 
-### xVMHardDiskDrive
+### VMHardDiskDrive
 
 Manages VHD(X)s attached to a Hyper-V virtual machine.
 When ControllerNumber or ControllerLocation is not provided, the same logic as
  Set-VMHardDiskDrive cmdlet is used.
 
-#### Requirements for xVMHardDiskDrive
+#### Requirements for VMHardDiskDrive
 
 * The Hyper-V Role has to be installed on the machine.
 * The Hyper-V PowerShell module has to be installed on the machine.
 
-#### Parameters for xVMHardDiskDrive
+#### Parameters for VMHardDiskDrive
 
 * **`[String]` VMName** _(Key)_: Specifies the name of the virtual machine
  whose hard disk drive is to be manipulated.
@@ -213,25 +213,25 @@ When ControllerNumber or ControllerLocation is not provided, the same logic as
 * **`[String]` Ensure** _(Write)_: Specifies if the hard disk drive should exist or
  not. The default value is Present. { *Present* | Absent }.
 
-#### Read-Only Properties from Get-TargetResource for xVMHardDiskDrive
+#### Read-Only Properties from Get-TargetResource for VMHardDiskDrive
 
 None
 
-#### Examples xVMHardDiskDrive
+#### Examples VMHardDiskDrive
 
-* [Create a VM, with an OS drive and an additional data drive](/source/Examples/Sample_xVMHardDiskDrive_VMWithExtraDisk.ps1)
-* [Create a VM, with an OS drive and 4 data drives](/source/Examples/Sample_xVMHardDiskDrive_VMWith4AdditionalDisks.ps1)
+* [Create a VM, with an OS drive and an additional data drive](/source/Examples/Sample_VMHardDiskDrive_VMWithExtraDisk.ps1)
+* [Create a VM, with an OS drive and 4 data drives](/source/Examples/Sample_VMHardDiskDrive_VMWith4AdditionalDisks.ps1)
 
-### xVMHost
+### VMHost
 
 Manages Hyper-V host settings.
 
-#### Requirements for xVMHost
+#### Requirements for VMHost
 
 * The Hyper-V Role has to be installed on the machine.
 * The Hyper-V PowerShell module has to be installed on the machine.
 
-#### Parameters for xVMHost
+#### Parameters for VMHost
 
 * **`[String]` IsSingleInstance** _(Key)_: Specifies the resource is a single instance,
  the value must be 'Yes'. { *Yes* }.
@@ -282,15 +282,15 @@ Manages Hyper-V host settings.
 * **`[Boolean]` VirtualMachineMigrationEnabled** _(Write)_: Indicates whether Live
  Migration should be enabled or disabled on the Hyper-V host.
 
-#### Read-Only Properties from Get-TargetResource for xVMHost
+#### Read-Only Properties from Get-TargetResource for VMHost
 
 None
 
-#### Examples xVMHost
+#### Examples VMHost
 
-* [Change VM Host paths](/source/Examples/Sample_xVMHost_Paths.ps1)
+* [Change VM Host paths](/source/Examples/Sample_VMHost_Paths.ps1)
 
-### xVMHyperV
+### VMHyperV
 
 Manages VMs in a Hyper-V host.
 
@@ -300,12 +300,12 @@ The following properties **cannot** be changed after VM creation:
 * Path
 * Generation
 
-#### Requirements for xVMHyperV
+#### Requirements for VMHyperV
 
 * The Hyper-V Role has to be installed on the machine.
 * The Hyper-V PowerShell module has to be installed on the machine.
 
-#### Parameters for xVMHyperV
+#### Parameters for VMHyperV
 
 * **`[String]` Name** _(Key)_: The desired VM name.
 * **`[String]` VhdPath** _(Required)_: The desired VHD associated with the VM.
@@ -340,7 +340,7 @@ The following properties **cannot** be changed after VM creation:
 * **`[Boolean]` EnableGuestService** _(Write)_: Enable Guest Service Interface
  for the VM. The default value is $false.
 
-#### Read-Only Properties from Get-TargetResource for xVMHyperV
+#### Read-Only Properties from Get-TargetResource for VMHyperV
 
 * **`[String]` ID** _(Read)_: VM unique ID.
 * **`[String]` Status** _(Read)_: Status of the VM.
@@ -352,23 +352,23 @@ The following properties **cannot** be changed after VM creation:
 * **`[String[]]` NetworkAdapters** _(Read)_: Network adapters' IP addresses of
  the VM".
 
-#### Examples xVMHyperV
+#### Examples VMHyperV
 
-* [Create a VM (Simple)](/source/Examples/Sample_xVMHyperV_Simple.ps1)
-* [Create a VM with dynamic memory](/source/Examples/Sample_xVMHyperV_DynamicMemory.ps1)
-* [Create a VM (Complete)](/source/Examples/Sample_xVMHyperV_Complete.ps1)
-* [Create a VM with multiple NICs attached to multiple switches](/source/Examples/Sample_xVMHyperV_MultipleNICs.ps1)
+* [Create a VM (Simple)](/source/Examples/Sample_VMHyperV_Simple.ps1)
+* [Create a VM with dynamic memory](/source/Examples/Sample_VMHyperV_DynamicMemory.ps1)
+* [Create a VM (Complete)](/source/Examples/Sample_VMHyperV_Complete.ps1)
+* [Create a VM with multiple NICs attached to multiple switches](/source/Examples/Sample_VMHyperV_MultipleNICs.ps1)
 
-### xVMNetworkAdapter
+### VMNetworkAdapter
 
 Manages VMNetadapters attached to a Hyper-V virtual machine or the management OS.
 
-#### Requirements for xVMNetworkAdapter
+#### Requirements for VMNetworkAdapter
 
 * The Hyper-V Role has to be installed on the machine.
 * The Hyper-V PowerShell module has to be installed on the machine.
 
-#### Parameters for xVMNetworkAdapter
+#### Parameters for VMNetworkAdapter
 
 * **`[String]` Id** _(Key)_: Unique string for identifying the resource instance.
 * **`[String]` Name** _(Required)_: Name of the network adapter as it appears either
@@ -377,7 +377,7 @@ Manages VMNetadapters attached to a Hyper-V virtual machine or the management OS
 * **`[String]` VMName** _(Required)_: Name of the VM to attach to.
   If you want to attach new VM Network adapter to the management OS,
   set this property to 'Management OS'.
-* **`[xNetworkSettings]` NetworkSetting** _(Write)_: Network Settings of the network adapter.
+* **`[NetworkSettings]` NetworkSetting** _(Write)_: Network Settings of the network adapter.
   If this parameter is not supplied, DHCP will be used.
 * **`[String]` MacAddress** _(Write)_: Use this to specify a Static MAC Address.
   If this parameter is not specified, dynamic MAC Address will be set.
@@ -386,7 +386,7 @@ Manages VMNetadapters attached to a Hyper-V virtual machine or the management OS
 * **`[String]` Ensure** _(Write)_: Ensures that the VM Network Adapter is
   Present or Absent. The default value is Present. { *Present* | Absent }.
 
-##### xNetworkSettings Class
+##### NetworkSettings Class
 
 * **`[String]` IpAddress** _(Write)_: IpAddress to give the network adapter.
   Only used if not Dhcp. Required if not Dhcp.
@@ -397,30 +397,30 @@ Manages VMNetadapters attached to a Hyper-V virtual machine or the management OS
 * **`[String]` DnsServer** _(Write)_: DNSServer to give the network adapter.
   Only used if not Dhcp.
 
-#### Read-Only Properties from Get-TargetResource for xVMNetworkAdapter
+#### Read-Only Properties from Get-TargetResource for VMNetworkAdapter
 
 * **`[Boolean]` DynamicMacAddress** _(Read)_: Does the VMNetworkAdapter use a
  Dynamic MAC Address.
 
-#### Examples xVMNetworkAdapter
+#### Examples VMNetworkAdapter
 
-* [Add a new VM Network adapter in the management OS](/source/Examples/Sample_xVMNetworkAdapter_ManagementOS.ps1)
-* [Add multiple VM Network adapters to a VM](/source/Examples/Sample_xVMNetworkAdapter_MultipleVM.ps1)
-* [Add a couple of VM Network adapters in the management OS](/source/Examples/Sample_xVMNetworkAdapter_MultipleManagementOS.ps1)
-* [Add multiple VM Network adapters to a VM using status MAC addresses](/source/Examples/Sample_xVMNetworkAdapter_MultipleVMMACAddress.ps1)
-* [Add VM Network adapters to a VM with a Vlan tag](/source/Examples/Sample_xVMNetworkAdapter_VMVlanTagging.ps1)
-* [Add VM Network adapters to a VM with a static IpAddress](/source/Examples/Sample_xVMNetworkAdapter_VMStaticNetworkSettings.ps1)
+* [Add a new VM Network adapter in the management OS](/source/Examples/Sample_VMNetworkAdapter_ManagementOS.ps1)
+* [Add multiple VM Network adapters to a VM](/source/Examples/Sample_VMNetworkAdapter_MultipleVM.ps1)
+* [Add a couple of VM Network adapters in the management OS](/source/Examples/Sample_VMNetworkAdapter_MultipleManagementOS.ps1)
+* [Add multiple VM Network adapters to a VM using status MAC addresses](/source/Examples/Sample_VMNetworkAdapter_MultipleVMMACAddress.ps1)
+* [Add VM Network adapters to a VM with a Vlan tag](/source/Examples/Sample_VMNetworkAdapter_VMVlanTagging.ps1)
+* [Add VM Network adapters to a VM with a static IpAddress](/source/Examples/Sample_VMNetworkAdapter_VMStaticNetworkSettings.ps1)
 
-### xVMProcessor
+### VMProcessor
 
 Manages Hyper-V virtual machine processor options.
 
-#### Requirements for xVMProcessor
+#### Requirements for VMProcessor
 
 * The Hyper-V Role has to be installed on the machine.
 * The Hyper-V PowerShell module has to be installed on the machine.
 
-#### Parameters for xVMProcessor
+#### Parameters for VMProcessor
 
 * **`[String]` VMName** _(Key)_: Specifies the name of the virtual machine
  on which the processor is to be configured.
@@ -454,25 +454,25 @@ Manages Hyper-V virtual machine processor options.
 * **`[Boolean]` RestartIfNeeded** _(Write)_: If specified, shutdowns and restarts
  the VM if needed for property changes.
 
-#### Read-Only Properties from Get-TargetResource for xVMProcessor
+#### Read-Only Properties from Get-TargetResource for VMProcessor
 
 None
 
-#### Examples xVMProcessor
+#### Examples VMProcessor
 
-* [Create a secure boot gen 2 VM for a given VHD with nested virtualisation enabled](/source/Examples/Sample_xVMHyperV_SimpleWithNestedVirtualization.ps1)
+* [Create a secure boot gen 2 VM for a given VHD with nested virtualisation enabled](/source/Examples/Sample_VMHyperV_SimpleWithNestedVirtualization.ps1)
 
-### xVMScsiController
+### VMScsiController
 
 Manages the SCSI controllers attached to a Hyper-V virtual machine.
 When removing a controller, all the disks still connected to the controller will be detached.
 
-#### Requirements for xVMScsiController
+#### Requirements for VMScsiController
 
 * The Hyper-V Role has to be installed on the machine.
 * The Hyper-V PowerShell module has to be installed on the machine.
 
-#### Parameters for xVMScsiController
+#### Parameters for VMScsiController
 
 * **`[String]` VMName** _(Key)_: Specifies the name of the virtual machine whose SCSI
  controller is to be manipulated.
@@ -481,24 +481,24 @@ When removing a controller, all the disks still connected to the controller will
 * **`[String]` Ensure** _(Write)_: Specifies if the SCSI controller should exist or
  not. The default value is Present. { *Present* | Absent }.
 
-#### Read-Only Properties from Get-TargetResource for xVMScsiController
+#### Read-Only Properties from Get-TargetResource for VMScsiController
 
 None
 
-#### Examples xVMScsiController
+#### Examples VMScsiController
 
-* [Add a secondary SCSI controller](/source/Examples/Sample_xVMScsiController_AddControllers.ps1)
+* [Add a secondary SCSI controller](/source/Examples/Sample_VMScsiController_AddControllers.ps1)
 
-### xVMSwitch
+### VMSwitch
 
 Manages virtual switches in a Hyper-V host.
 
-#### Requirements for xVMSwitch
+#### Requirements for VMSwitch
 
 * The Hyper-V Role has to be installed on the machine.
 * The Hyper-V PowerShell module has to be installed on the machine.
 
-#### Parameters for xVMSwitch
+#### Parameters for VMSwitch
 
 * **`[String]` Name** _(Key)_: The desired VM Switch name.
 * **`[String]` Type** _(Key)_: The desired type of switch.
@@ -518,13 +518,13 @@ Manages virtual switches in a Hyper-V host.
 * **`[String]` Ensure** _(Write)_: Ensures that the VM Switch is Present or Absent.
  The default value is Present. { *Present* | Absent }.
 
-#### Read-Only Properties from Get-TargetResource for xVMSwitch
+#### Read-Only Properties from Get-TargetResource for VMSwitch
 
 * **`[String]` NetAdapterInterfaceDescription** _(Read)_: Description of the
  network interface.
 
-#### Examples xVMSwitch
+#### Examples VMSwitch
 
-* [Create an internal VM Switch](/source/Examples/Sample_xVMSwitch_Internal.ps1)
-* [Create an external VM Switch](/source/Examples/Sample_xVMSwitch_External.ps1)
-* [Create an external VM Switch with embedded teaming](/source/Examples/Sample_xVMSwitch_ExternalSET.ps1)
+* [Create an internal VM Switch](/source/Examples/Sample_VMSwitch_Internal.ps1)
+* [Create an external VM Switch](/source/Examples/Sample_VMSwitch_External.ps1)
+* [Create an external VM Switch with embedded teaming](/source/Examples/Sample_VMSwitch_ExternalSET.ps1)
diff --git a/RequiredModules.psd1 b/RequiredModules.psd1
index 786c628..c875d80 100644
--- a/RequiredModules.psd1
+++ b/RequiredModules.psd1
@@ -18,9 +18,7 @@
     MarkdownLinkCheck           = 'latest'
     'DscResource.Test'          = 'latest'
     'DscResource.AnalyzerRules' = 'latest'
-    xDscResourceDesigner        = 'latest'
     'DscResource.DocGenerator'  = 'latest'
-
-    # Build dependent modules
     'DscResource.Common'        = 'latest'
+    xDscResourceDesigner        = 'latest'
 }
diff --git a/Resolve-Dependency.ps1 b/Resolve-Dependency.ps1
index 294cb68..e207b3e 100644
--- a/Resolve-Dependency.ps1
+++ b/Resolve-Dependency.ps1
@@ -241,7 +241,7 @@ try
 
         $installPowerShellGetParameters = @{
             Name               = 'PowerShellGet'
-            Force              = $True
+            Force              = $true
             SkipPublisherCheck = $true
             AllowClobber       = $true
             Scope              = $Scope
diff --git a/build.ps1 b/build.ps1
index 5579df1..b40a72e 100644
--- a/build.ps1
+++ b/build.ps1
@@ -356,8 +356,7 @@ Begin
 
             $BuildConfig = $config[0]
         }
-        else
-        {
+        else {
             $BuildConfig = $config
         }
     }
diff --git a/build.yaml b/build.yaml
index 536e242..fc3745e 100644
--- a/build.yaml
+++ b/build.yaml
@@ -2,7 +2,6 @@
 ####################################################
 #          ModuleBuilder Configuration             #
 ####################################################
-
 CopyPaths:
   - en-US
   - DSCResources
@@ -22,7 +21,7 @@ NestedModule:
       Exclude: PSGetModuleInfo.xml
 
 ####################################################
-#       Sampler Pipeline Configuration             #
+#       Pipeline Configuration                     #
 ####################################################
 BuildWorkflow:
   '.':
@@ -33,7 +32,7 @@ BuildWorkflow:
     - Clean
     - Build_Module_ModuleBuilder
     - Build_NestedModules_ModuleBuilder
-    - Create_changelog_release_output
+    - Create_Changelog_Release_Output
     - Generate_Conceptual_Help
     - Generate_Wiki_Content
 
@@ -46,7 +45,7 @@ BuildWorkflow:
 
   test:
     - Pester_Tests_Stop_On_Fail
-    - Pester_if_Code_Coverage_Under_Threshold
+    - Pester_If_Code_Coverage_Under_Threshold
 
   publish:
     - publish_module_to_gallery
@@ -54,7 +53,7 @@ BuildWorkflow:
     - Publish_GitHub_Wiki_Content
 
 ####################################################
-#       PESTER  Configuration                      #
+#       PESTER Configuration                       #
 ####################################################
 
 Pester:
@@ -64,18 +63,19 @@ Pester:
   Script:
     - tests/Unit
   Tag:
-  CodeCoverageThreshold: 83
   CodeCoverageOutputFile: JaCoCo_coverage.xml
   CodeCoverageOutputFileEncoding: ascii
+  CodeCoverageThreshold: 80
 
 DscTest:
+  OutputFormat: NUnitXML
   ExcludeTag:
-    - "Common Tests - New Error-Level Script Analyzer Rules"
-  Tag:
+    - 'Common Tests - New Error-Level Script Analyzer Rules'
   ExcludeSourceFile:
     - output
   ExcludeModuleFile:
     - Modules/DscResource.Common
+  MainGitBranch: master
 
 ModuleBuildTasks:
   Sampler:
diff --git a/codecov.yml b/codecov.yml
index 9d8b22a..db6723c 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,6 +1,6 @@
 codecov:
   require_ci_to_pass: no
-  # master should be the baseline for reporting
+  # main should be the baseline for reporting
   branch: master
 
 comment:
@@ -16,7 +16,7 @@ coverage:
     project:
       default:
         # Set the overall project code coverage requirement to 70%
-        target: 70
+        target: 80
     patch:
       default:
         # Set the pull request requirement to not regress overall coverage by more than 5%
@@ -24,5 +24,6 @@ coverage:
         target: auto
         threshold: 5
 
+# This is not needed if the module only contain class-based resources.
 fixes:
   - '^\d+\.\d+\.\d+::source'  # move path "X.Y.Z" => "source"
diff --git a/source/DSCResources/MSFT_xVHD/MSFT_xVHD.psm1 b/source/DSCResources/DSC_VHD/DSC_Vhd.psm1
similarity index 98%
rename from source/DSCResources/MSFT_xVHD/MSFT_xVHD.psm1
rename to source/DSCResources/DSC_VHD/DSC_Vhd.psm1
index eb7243e..51e2b9b 100644
--- a/source/DSCResources/MSFT_xVHD/MSFT_xVHD.psm1
+++ b/source/DSCResources/DSC_VHD/DSC_Vhd.psm1
@@ -6,7 +6,7 @@ $script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'
 
 <#
 .SYNOPSIS
-    Gets MSFT_xVHD resource current state.
+    Gets DSC_VHD resource current state.
 
 .PARAMETER Name
     The desired VHD file name.
@@ -72,7 +72,7 @@ function Get-TargetResource
 
 <#
 .SYNOPSIS
-    Configures MSFT_xVHD resource state.
+    Configures DSC_VHD resource state.
 
 .PARAMETER Name
     The desired VHD file name.
@@ -224,7 +224,7 @@ function Set-TargetResource
 
 <#
 .SYNOPSIS
-    Tests if MSFT_xVHD resource state is in the desired state or not.
+    Tests if DSC_VHD resource state is in the desired state or not.
 
 .PARAMETER Name
     The desired VHD file name.
diff --git a/source/DSCResources/MSFT_xVHD/MSFT_xVHD.schema.mof b/source/DSCResources/DSC_VHD/DSC_Vhd.schema.mof
similarity index 92%
rename from source/DSCResources/MSFT_xVHD/MSFT_xVHD.schema.mof
rename to source/DSCResources/DSC_VHD/DSC_Vhd.schema.mof
index f41e9d2..b01c195 100644
--- a/source/DSCResources/MSFT_xVHD/MSFT_xVHD.schema.mof
+++ b/source/DSCResources/DSC_VHD/DSC_Vhd.schema.mof
@@ -1,5 +1,5 @@
-[ClassVersion("1.0.0"), FriendlyName("xVHD")]
-class MSFT_xVHD : OMI_BaseResource
+[ClassVersion("1.0.0"), FriendlyName("Vhd")]
+class DSC_Vhd : OMI_BaseResource
 {
     [Key, Description("Name of the VHD File")] String Name;
     [Key, Description("Folder where the VHD will be created")] String Path;
diff --git a/source/DSCResources/MSFT_xVHD/README.md b/source/DSCResources/DSC_VHD/README.md
similarity index 100%
rename from source/DSCResources/MSFT_xVHD/README.md
rename to source/DSCResources/DSC_VHD/README.md
diff --git a/source/DSCResources/MSFT_xVHD/en-US/MSFT_xVHD.strings.psd1 b/source/DSCResources/DSC_VHD/en-US/DSC_Vhd.strings.psd1
similarity index 100%
rename from source/DSCResources/MSFT_xVHD/en-US/MSFT_xVHD.strings.psd1
rename to source/DSCResources/DSC_VHD/en-US/DSC_Vhd.strings.psd1
diff --git a/source/DSCResources/MSFT_xVMDvdDrive/MSFT_xVMDvdDrive.psm1 b/source/DSCResources/DSC_VMDvdDrive/DSC_VMDvdDrive.psm1
similarity index 100%
rename from source/DSCResources/MSFT_xVMDvdDrive/MSFT_xVMDvdDrive.psm1
rename to source/DSCResources/DSC_VMDvdDrive/DSC_VMDvdDrive.psm1
diff --git a/source/DSCResources/MSFT_xVMDvdDrive/MSFT_xVMDvdDrive.schema.mof b/source/DSCResources/DSC_VMDvdDrive/DSC_VMDvdDrive.schema.mof
similarity index 87%
rename from source/DSCResources/MSFT_xVMDvdDrive/MSFT_xVMDvdDrive.schema.mof
rename to source/DSCResources/DSC_VMDvdDrive/DSC_VMDvdDrive.schema.mof
index 04e3c4a..3a7876f 100644
--- a/source/DSCResources/MSFT_xVMDvdDrive/MSFT_xVMDvdDrive.schema.mof
+++ b/source/DSCResources/DSC_VMDvdDrive/DSC_VMDvdDrive.schema.mof
@@ -1,5 +1,5 @@
-[ClassVersion("1.0.0.0"), FriendlyName("xVMDvdDrive")]
-class MSFT_xVMDvdDrive : OMI_BaseResource
+[ClassVersion("1.0.0.0"), FriendlyName("VMDvdDrive")]
+class DSC_VMDvdDrive : OMI_BaseResource
 {
     [Key, Description("Specifies the name of the virtual machine to which the DVD drive is to be added.")] String VMName;
     [Key, Description("Specifies the number of the controller to which the DVD drive is to be added.")] Uint32 ControllerNumber;
diff --git a/source/DSCResources/MSFT_xVMDvdDrive/README.md b/source/DSCResources/DSC_VMDvdDrive/README.md
similarity index 100%
rename from source/DSCResources/MSFT_xVMDvdDrive/README.md
rename to source/DSCResources/DSC_VMDvdDrive/README.md
diff --git a/source/DSCResources/MSFT_xVMDvdDrive/en-US/MSFT_xVMDvdDrive.strings.psd1 b/source/DSCResources/DSC_VMDvdDrive/en-US/DSC_VMDvdDrive.strings.psd1
similarity index 100%
rename from source/DSCResources/MSFT_xVMDvdDrive/en-US/MSFT_xVMDvdDrive.strings.psd1
rename to source/DSCResources/DSC_VMDvdDrive/en-US/DSC_VMDvdDrive.strings.psd1
diff --git a/source/DSCResources/MSFT_xVMHardDiskDrive/MSFT_xVMHardDiskDrive.psm1 b/source/DSCResources/DSC_VMHardDiskDrive/DSC_VMHardDiskDrive.psm1
similarity index 100%
rename from source/DSCResources/MSFT_xVMHardDiskDrive/MSFT_xVMHardDiskDrive.psm1
rename to source/DSCResources/DSC_VMHardDiskDrive/DSC_VMHardDiskDrive.psm1
diff --git a/source/DSCResources/MSFT_xVMHardDiskDrive/MSFT_xVMHardDiskDrive.schema.mof b/source/DSCResources/DSC_VMHardDiskDrive/DSC_VMHardDiskDrive.schema.mof
similarity index 90%
rename from source/DSCResources/MSFT_xVMHardDiskDrive/MSFT_xVMHardDiskDrive.schema.mof
rename to source/DSCResources/DSC_VMHardDiskDrive/DSC_VMHardDiskDrive.schema.mof
index 3375c15..6d8c6af 100644
--- a/source/DSCResources/MSFT_xVMHardDiskDrive/MSFT_xVMHardDiskDrive.schema.mof
+++ b/source/DSCResources/DSC_VMHardDiskDrive/DSC_VMHardDiskDrive.schema.mof
@@ -1,5 +1,5 @@
-[ClassVersion("1.0.0"), FriendlyName("xVMHardDiskDrive")]
-class MSFT_xVMHardDiskDrive : OMI_BaseResource
+[ClassVersion("1.0.0"), FriendlyName("VMHardDiskDrive")]
+class DSC_VMHardDiskDrive : OMI_BaseResource
 {
     [Key, Description("Specifies the name of the virtual machine whose hard disk drive is to be manipulated.")] String VMName;
     [Key, Description("Specifies the full path to the location of the VHD that represents the hard disk drive.")] String Path;
diff --git a/source/DSCResources/MSFT_xVMHardDiskDrive/README.md b/source/DSCResources/DSC_VMHardDiskDrive/README.md
similarity index 100%
rename from source/DSCResources/MSFT_xVMHardDiskDrive/README.md
rename to source/DSCResources/DSC_VMHardDiskDrive/README.md
diff --git a/source/DSCResources/MSFT_xVMHardDiskDrive/en-US/MSFT_xVMHardDiskDrive.strings.psd1 b/source/DSCResources/DSC_VMHardDiskDrive/en-US/DSC_VMHardDiskDrive.strings.psd1
similarity index 100%
rename from source/DSCResources/MSFT_xVMHardDiskDrive/en-US/MSFT_xVMHardDiskDrive.strings.psd1
rename to source/DSCResources/DSC_VMHardDiskDrive/en-US/DSC_VMHardDiskDrive.strings.psd1
diff --git a/source/DSCResources/MSFT_xVMHost/MSFT_xVMHost.psm1 b/source/DSCResources/DSC_VMHost/DSC_VMHost.psm1
similarity index 98%
rename from source/DSCResources/MSFT_xVMHost/MSFT_xVMHost.psm1
rename to source/DSCResources/DSC_VMHost/DSC_VMHost.psm1
index 476f935..8308ca1 100644
--- a/source/DSCResources/MSFT_xVMHost/MSFT_xVMHost.psm1
+++ b/source/DSCResources/DSC_VMHost/DSC_VMHost.psm1
@@ -8,7 +8,7 @@ $script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'
 
 <#
 .SYNOPSIS
-    Gets MSFT_xVMHost resource current state.
+    Gets DSC_VMHost resource current state.
 
 .PARAMETER IsSingleInstance
     Specifies the resource is a single instance, the value must be 'Yes'.
@@ -62,7 +62,7 @@ function Get-TargetResource
 
 <#
 .SYNOPSIS
-    Tests if MSFT_xVMHost resource state is in the desired state or not.
+    Tests if DSC_VMHost resource state is in the desired state or not.
 
 .PARAMETER IsSingleInstance
     Specifies the resource is a single instance, the value must be 'Yes'.
@@ -241,7 +241,7 @@ function Test-TargetResource
 
 <#
 .SYNOPSIS
-    Configures MSFT_xVMHost resource state.
+    Configures DSC_VMHost resource state.
 
 .PARAMETER IsSingleInstance
     Specifies the resource is a single instance, the value must be 'Yes'.
diff --git a/source/DSCResources/MSFT_xVMHost/MSFT_xVMHost.schema.mof b/source/DSCResources/DSC_VMHost/DSC_VMHost.schema.mof
similarity index 97%
rename from source/DSCResources/MSFT_xVMHost/MSFT_xVMHost.schema.mof
rename to source/DSCResources/DSC_VMHost/DSC_VMHost.schema.mof
index 12be0e8..6a91db3 100644
--- a/source/DSCResources/MSFT_xVMHost/MSFT_xVMHost.schema.mof
+++ b/source/DSCResources/DSC_VMHost/DSC_VMHost.schema.mof
@@ -1,5 +1,5 @@
-[ClassVersion("1.0.0.0"), FriendlyName("xVMHost")]
-class MSFT_xVMHost : OMI_BaseResource
+[ClassVersion("1.0.0.0"), FriendlyName("VMHost")]
+class DSC_VMHost : OMI_BaseResource
 {
     [Key, Description("Specifies the resource is a single instance, the value must be 'Yes'."), ValueMap{"Yes"}, Values{"Yes"}] String IsSingleInstance;
     [Write, Description("Indicates whether users can use enhanced mode when they connect to virtual machines on this server by using Virtual Machine Connection.")] Boolean EnableEnhancedSessionMode;
diff --git a/source/DSCResources/MSFT_xVMHost/README.md b/source/DSCResources/DSC_VMHost/README.md
similarity index 100%
rename from source/DSCResources/MSFT_xVMHost/README.md
rename to source/DSCResources/DSC_VMHost/README.md
diff --git a/source/DSCResources/MSFT_xVMHost/en-US/MSFT_xVMHost.strings.psd1 b/source/DSCResources/DSC_VMHost/en-US/DSC_VMHost.strings.psd1
similarity index 100%
rename from source/DSCResources/MSFT_xVMHost/en-US/MSFT_xVMHost.strings.psd1
rename to source/DSCResources/DSC_VMHost/en-US/DSC_VMHost.strings.psd1
diff --git a/source/DSCResources/MSFT_xVMHyperV/MSFT_xVMHyperV.psm1 b/source/DSCResources/DSC_VMHyperV/DSC_VMHyperV.psm1
similarity index 100%
rename from source/DSCResources/MSFT_xVMHyperV/MSFT_xVMHyperV.psm1
rename to source/DSCResources/DSC_VMHyperV/DSC_VMHyperV.psm1
diff --git a/source/DSCResources/MSFT_xVMHyperV/MSFT_xVMHyperV.schema.mof b/source/DSCResources/DSC_VMHyperV/DSC_VMHyperV.schema.mof
similarity index 96%
rename from source/DSCResources/MSFT_xVMHyperV/MSFT_xVMHyperV.schema.mof
rename to source/DSCResources/DSC_VMHyperV/DSC_VMHyperV.schema.mof
index 7a2541e..d1dedbc 100644
--- a/source/DSCResources/MSFT_xVMHyperV/MSFT_xVMHyperV.schema.mof
+++ b/source/DSCResources/DSC_VMHyperV/DSC_VMHyperV.schema.mof
@@ -1,5 +1,5 @@
-[ClassVersion("1.0.0"), FriendlyName("xVMHyperV")]
-class MSFT_xVMHyperV : OMI_BaseResource
+[ClassVersion("1.0.0"), FriendlyName("VMHyperV")]
+class DSC_VMHyperV : OMI_BaseResource
 {
     [Key, Description("Name of the VM")] String Name;
     [Required, Description("VHD associated with the VM")] String VhdPath;
diff --git a/source/DSCResources/MSFT_xVMHyperV/README.md b/source/DSCResources/DSC_VMHyperV/README.md
similarity index 100%
rename from source/DSCResources/MSFT_xVMHyperV/README.md
rename to source/DSCResources/DSC_VMHyperV/README.md
diff --git a/source/DSCResources/MSFT_xVMHyperV/en-US/MSFT_xVMHyperV.strings.psd1 b/source/DSCResources/DSC_VMHyperV/en-US/DSC_VMHyperV.strings.psd1
similarity index 100%
rename from source/DSCResources/MSFT_xVMHyperV/en-US/MSFT_xVMHyperV.strings.psd1
rename to source/DSCResources/DSC_VMHyperV/en-US/DSC_VMHyperV.strings.psd1
diff --git a/source/DSCResources/MSFT_xVMNetworkAdapter/MSFT_xVMNetworkAdapter.psm1 b/source/DSCResources/DSC_VMNetworkAdapter/DSC_VMNetworkAdapter.psm1
similarity index 98%
rename from source/DSCResources/MSFT_xVMNetworkAdapter/MSFT_xVMNetworkAdapter.psm1
rename to source/DSCResources/DSC_VMNetworkAdapter/DSC_VMNetworkAdapter.psm1
index d1ed7ae..9ce1e29 100644
--- a/source/DSCResources/MSFT_xVMNetworkAdapter/MSFT_xVMNetworkAdapter.psm1
+++ b/source/DSCResources/DSC_VMNetworkAdapter/DSC_VMNetworkAdapter.psm1
@@ -6,7 +6,7 @@ $script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'
 
 <#
 .SYNOPSIS
-    Gets MSFT_xVMNetworkAdapter resource current state.
+    Gets DSC_VMNetworkAdapter resource current state.
 
 .PARAMETER Id
     Specifies an unique identifier for the network adapter.
@@ -88,7 +88,7 @@ function Get-TargetResource
         $networkInfo = Get-NetworkInformation -VMName $VMName -Name $Name
         if ($networkInfo)
         {
-            $item = New-CimInstance -ClassName MSFT_xNetworkSettings -Property $networkInfo -Namespace root/microsoft/windows/desiredstateconfiguration -ClientOnly
+            $item = New-CimInstance -ClassName MSFT_NetworkSettings -Property $networkInfo -Namespace root/microsoft/windows/desiredstateconfiguration -ClientOnly
             $configuration.Add('NetworkSetting', $item)
         }
 
@@ -112,7 +112,7 @@ function Get-TargetResource
 
 <#
 .SYNOPSIS
-    Sets MSFT_xVMNetworkAdapter resource state.
+    Sets DSC_VMNetworkAdapter resource state.
 
 .PARAMETER Id
     Specifies an unique identifier for the network adapter.
@@ -344,7 +344,7 @@ function Set-TargetResource
 
 <#
 .SYNOPSIS
-    Tests if MSFT_xVMNetworkAdapter resource state is indeed desired state or not.
+    Tests if DSC_VMNetworkAdapter resource state is indeed desired state or not.
 
 .PARAMETER Id
     Specifies an unique identifier for the network adapter.
diff --git a/source/DSCResources/MSFT_xVMNetworkAdapter/MSFT_xVMNetworkAdapter.schema.mof b/source/DSCResources/DSC_VMNetworkAdapter/DSC_VMNetworkAdapter.schema.mof
similarity index 68%
rename from source/DSCResources/MSFT_xVMNetworkAdapter/MSFT_xVMNetworkAdapter.schema.mof
rename to source/DSCResources/DSC_VMNetworkAdapter/DSC_VMNetworkAdapter.schema.mof
index 8929134..4e0d731 100644
--- a/source/DSCResources/MSFT_xVMNetworkAdapter/MSFT_xVMNetworkAdapter.schema.mof
+++ b/source/DSCResources/DSC_VMNetworkAdapter/DSC_VMNetworkAdapter.schema.mof
@@ -1,6 +1,6 @@
 
 [ClassVersion("2.0.0.0")]
-Class xNetworkSettings
+Class NetworkSettings
 {
   [Write] string IpAddress;
   [Write] string Subnet;
@@ -8,15 +8,15 @@ Class xNetworkSettings
   [Write] string DnsServer;
 };
 
-[ClassVersion("2.0.0.0"), FriendlyName("xVMNetworkAdapter")]
-class MSFT_xVMNetworkAdapter : OMI_BaseResource
+[ClassVersion("2.0.0.0"), FriendlyName("VMNetworkAdapter")]
+class DSC_VMNetworkAdapter : OMI_BaseResource
 {
     [Key] String Id;
     [Required] String Name;
     [Required] String SwitchName;
     [Required] String VMName;
     [Write] String MacAddress;
-    [Write, EmbeddedInstance("xNetworkSettings")] String NetworkSetting;
+    [Write, EmbeddedInstance("NetworkSettings")] String NetworkSetting;
     [Write] String VlanId;
     [Write, ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
     [Read] Boolean DynamicMacAddress;
diff --git a/source/DSCResources/MSFT_xVMNetworkAdapter/README.md b/source/DSCResources/DSC_VMNetworkAdapter/README.md
similarity index 100%
rename from source/DSCResources/MSFT_xVMNetworkAdapter/README.md
rename to source/DSCResources/DSC_VMNetworkAdapter/README.md
diff --git a/source/DSCResources/MSFT_xVMNetworkAdapter/en-US/MSFT_xVMNetworkAdapter.strings.psd1 b/source/DSCResources/DSC_VMNetworkAdapter/en-US/DSC_VMNetworkAdapter.strings.psd1
similarity index 100%
rename from source/DSCResources/MSFT_xVMNetworkAdapter/en-US/MSFT_xVMNetworkAdapter.strings.psd1
rename to source/DSCResources/DSC_VMNetworkAdapter/en-US/DSC_VMNetworkAdapter.strings.psd1
diff --git a/source/DSCResources/MSFT_xVMProcessor/MSFT_xVMProcessor.psm1 b/source/DSCResources/DSC_VMProcessor/DSC_VMProcessor.psm1
similarity index 98%
rename from source/DSCResources/MSFT_xVMProcessor/MSFT_xVMProcessor.psm1
rename to source/DSCResources/DSC_VMProcessor/DSC_VMProcessor.psm1
index 23620a5..d2f9417 100644
--- a/source/DSCResources/MSFT_xVMProcessor/MSFT_xVMProcessor.psm1
+++ b/source/DSCResources/DSC_VMProcessor/DSC_VMProcessor.psm1
@@ -8,7 +8,7 @@ $script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'
 
 <#
 .SYNOPSIS
-    Gets MSFT_xVMProcessor resource current state.
+    Gets DSC_VMProcessor resource current state.
 
 .PARAMETER VMName
     Specifies the name of the virtual machine on which the processor is to be configured.
@@ -47,7 +47,7 @@ function Get-TargetResource
 
 <#
 .SYNOPSIS
-    Tests if MSFT_xVMProcessor resource state is in the desired state or not.
+    Tests if DSC_VMProcessor resource state is in the desired state or not.
 
 .PARAMETER VMName
     Specifies the name of the virtual machine on which the processor is to be configured.
@@ -195,7 +195,7 @@ function Test-TargetResource
 
 <#
 .SYNOPSIS
-    Configures MSFT_xVMProcessor resource state.
+    Configures DSC_VMProcessor resource state.
 
 .PARAMETER VMName
     Specifies the name of the virtual machine on which the processor is to be configured.
diff --git a/source/DSCResources/MSFT_xVMProcessor/MSFT_xVMProcessor.schema.mof b/source/DSCResources/DSC_VMProcessor/DSC_VMProcessor.schema.mof
similarity index 95%
rename from source/DSCResources/MSFT_xVMProcessor/MSFT_xVMProcessor.schema.mof
rename to source/DSCResources/DSC_VMProcessor/DSC_VMProcessor.schema.mof
index 0b3c174..ce3b97e 100644
--- a/source/DSCResources/MSFT_xVMProcessor/MSFT_xVMProcessor.schema.mof
+++ b/source/DSCResources/DSC_VMProcessor/DSC_VMProcessor.schema.mof
@@ -1,5 +1,5 @@
-[ClassVersion("1.0.0.0"), FriendlyName("xVMProcessor")]
-class MSFT_xVMProcessor : OMI_BaseResource
+[ClassVersion("1.0.0.0"), FriendlyName("VMProcessor")]
+class DSC_VMProcessor : OMI_BaseResource
 {
     [Key, Description("Specifies the name of the virtual machine on which the processor is to be configured.")] String VMName;
     [Write, Description("Specifies whether to enable host resource protection.")] Boolean EnableHostResourceProtection;
diff --git a/source/DSCResources/MSFT_xVMProcessor/README.md b/source/DSCResources/DSC_VMProcessor/README.md
similarity index 100%
rename from source/DSCResources/MSFT_xVMProcessor/README.md
rename to source/DSCResources/DSC_VMProcessor/README.md
diff --git a/source/DSCResources/MSFT_xVMProcessor/en-US/MSFT_xVMProcessor.strings.psd1 b/source/DSCResources/DSC_VMProcessor/en-US/DSC_VMProcessor.strings.psd1
similarity index 100%
rename from source/DSCResources/MSFT_xVMProcessor/en-US/MSFT_xVMProcessor.strings.psd1
rename to source/DSCResources/DSC_VMProcessor/en-US/DSC_VMProcessor.strings.psd1
diff --git a/source/DSCResources/MSFT_xVMScsiController/MSFT_xVMScsiController.psm1 b/source/DSCResources/DSC_VMScsiController/DSC_VMScsiController.psm1
similarity index 100%
rename from source/DSCResources/MSFT_xVMScsiController/MSFT_xVMScsiController.psm1
rename to source/DSCResources/DSC_VMScsiController/DSC_VMScsiController.psm1
diff --git a/source/DSCResources/MSFT_xVMScsiController/MSFT_xVMScsiController.schema.mof b/source/DSCResources/DSC_VMScsiController/DSC_VMScsiController.schema.mof
similarity index 86%
rename from source/DSCResources/MSFT_xVMScsiController/MSFT_xVMScsiController.schema.mof
rename to source/DSCResources/DSC_VMScsiController/DSC_VMScsiController.schema.mof
index 1eebb01..e299038 100644
--- a/source/DSCResources/MSFT_xVMScsiController/MSFT_xVMScsiController.schema.mof
+++ b/source/DSCResources/DSC_VMScsiController/DSC_VMScsiController.schema.mof
@@ -1,5 +1,5 @@
-[ClassVersion("1.0.0"), FriendlyName("xVMScsiController")]
-class MSFT_xVMScsiController : OMI_BaseResource
+[ClassVersion("1.0.0"), FriendlyName("VMScsiController")]
+class DSC_VMScsiController : OMI_BaseResource
 {
     [Key, Description("Specifies the name of the virtual machine whose SCSI controller status is to be controlled")] String VMName;
     [Key, Description("Specifies the number of the SCSI controller whose status is to be controlled. If not specified, it defaults to 0."), ValueMap{"0","1","2","3"}, Values{"0","1","2","3"}] Uint32 ControllerNumber;
diff --git a/source/DSCResources/MSFT_xVMScsiController/README.md b/source/DSCResources/DSC_VMScsiController/README.md
similarity index 100%
rename from source/DSCResources/MSFT_xVMScsiController/README.md
rename to source/DSCResources/DSC_VMScsiController/README.md
diff --git a/source/DSCResources/MSFT_xVMScsiController/en-US/MSFT_xVMScsiController.strings.psd1 b/source/DSCResources/DSC_VMScsiController/en-US/DSC_VMScsiController.strings.psd1
similarity index 100%
rename from source/DSCResources/MSFT_xVMScsiController/en-US/MSFT_xVMScsiController.strings.psd1
rename to source/DSCResources/DSC_VMScsiController/en-US/DSC_VMScsiController.strings.psd1
diff --git a/source/DSCResources/MSFT_xVMSwitch/MSFT_xVMSwitch.psm1 b/source/DSCResources/DSC_VMSwitch/DSC_VMSwitch.psm1
similarity index 99%
rename from source/DSCResources/MSFT_xVMSwitch/MSFT_xVMSwitch.psm1
rename to source/DSCResources/DSC_VMSwitch/DSC_VMSwitch.psm1
index e23bc07..676ddda 100644
--- a/source/DSCResources/MSFT_xVMSwitch/MSFT_xVMSwitch.psm1
+++ b/source/DSCResources/DSC_VMSwitch/DSC_VMSwitch.psm1
@@ -8,7 +8,7 @@ $script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'
 
 <#
 .SYNOPSIS
-    Gets MSFT_xVMSwitch resource current state.
+    Gets DSC_VMSwitch resource current state.
 
 .PARAMETER Name
     Name of the VM Switch.
@@ -101,7 +101,7 @@ function Get-TargetResource
 
 <#
 .SYNOPSIS
-    Configures MSFT_xVMSwitch resource state.
+    Configures DSC_VMSwitch resource state.
 
 .PARAMETER Name
     Name of the VM Switch.
@@ -381,7 +381,7 @@ function Set-TargetResource
 
 <#
 .SYNOPSIS
-    Tests if MSFT_xVMSwitch resource state is in the desired state or not.
+    Tests if DSC_VMSwitch resource state is in the desired state or not.
 
 .PARAMETER Name
     Name of the VM Switch.
diff --git a/source/DSCResources/MSFT_xVMSwitch/MSFT_xVMSwitch.schema.mof b/source/DSCResources/DSC_VMSwitch/DSC_VMSwitch.schema.mof
similarity index 93%
rename from source/DSCResources/MSFT_xVMSwitch/MSFT_xVMSwitch.schema.mof
rename to source/DSCResources/DSC_VMSwitch/DSC_VMSwitch.schema.mof
index 4f6df35..cc8cf81 100644
--- a/source/DSCResources/MSFT_xVMSwitch/MSFT_xVMSwitch.schema.mof
+++ b/source/DSCResources/DSC_VMSwitch/DSC_VMSwitch.schema.mof
@@ -1,5 +1,5 @@
-[ClassVersion("1.0.0.0"), FriendlyName("xVMSwitch")]
-class MSFT_xVMSwitch : OMI_BaseResource
+[ClassVersion("1.0.0.0"), FriendlyName("VMSwitch")]
+class DSC_VMSwitch : OMI_BaseResource
 {
     [Key, Description("Name of the VM Switch")] String Name;
     [Key, Description("Type of switch"), ValueMap{"External","Internal","Private"}, Values{"External","Internal","Private"}] String Type;
diff --git a/source/DSCResources/MSFT_xVMSwitch/README.md b/source/DSCResources/DSC_VMSwitch/README.md
similarity index 100%
rename from source/DSCResources/MSFT_xVMSwitch/README.md
rename to source/DSCResources/DSC_VMSwitch/README.md
diff --git a/source/DSCResources/MSFT_xVMSwitch/en-US/MSFT_xVMSwitch.strings.psd1 b/source/DSCResources/DSC_VMSwitch/en-US/DSC_VMSwitch.strings.psd1
similarity index 100%
rename from source/DSCResources/MSFT_xVMSwitch/en-US/MSFT_xVMSwitch.strings.psd1
rename to source/DSCResources/DSC_VMSwitch/en-US/DSC_VMSwitch.strings.psd1
diff --git a/source/DSCResources/MSFT_xVhdFileDirectory/MSFT_xVhdFileDirectory.psm1 b/source/DSCResources/DSC_VhdFileDirectory/DSC_VhdFileDirectory.psm1
similarity index 100%
rename from source/DSCResources/MSFT_xVhdFileDirectory/MSFT_xVhdFileDirectory.psm1
rename to source/DSCResources/DSC_VhdFileDirectory/DSC_VhdFileDirectory.psm1
diff --git a/source/DSCResources/MSFT_xVhdFileDirectory/MSFT_xVhdFileDirectory.schema.mof b/source/DSCResources/DSC_VhdFileDirectory/DSC_VhdFileDirectory.schema.mof
similarity index 71%
rename from source/DSCResources/MSFT_xVhdFileDirectory/MSFT_xVhdFileDirectory.schema.mof
rename to source/DSCResources/DSC_VhdFileDirectory/DSC_VhdFileDirectory.schema.mof
index b221b4b..0a994f0 100644
--- a/source/DSCResources/MSFT_xVhdFileDirectory/MSFT_xVhdFileDirectory.schema.mof
+++ b/source/DSCResources/DSC_VhdFileDirectory/DSC_VhdFileDirectory.schema.mof
@@ -1,6 +1,6 @@
 
 [ClassVersion("1.0.0.0")]
-Class MSFT_xFileDirectory
+Class DSC_FileDirectory
 {
   [Required] string DestinationPath;
   [Write] string SourcePath;
@@ -12,11 +12,11 @@ Class MSFT_xFileDirectory
   [Write,ValueMap{"ReadOnly", "Hidden", "System", "Archive"},Values{"ReadOnly", "Hidden", "System", "Archive"}] string Attributes[];
 };
 
-[ClassVersion("1.0.0.0"), FriendlyName("xVhdFile")]
-class MSFT_xVhdFileDirectory : OMI_BaseResource
+[ClassVersion("1.0.0.0"), FriendlyName("VhdFile")]
+class DSC_VhdFileDirectory : OMI_BaseResource
 {
     [Key, Description("Path to the VHD")] String VhdPath;
-    [Required, EmbeddedInstance("MSFT_xFileDirectory"), Description("The FileDirectory objects to copy to the VHD")] String FileDirectory[];
+    [Required, EmbeddedInstance("DSC_FileDirectory"), Description("The FileDirectory objects to copy to the VHD")] String FileDirectory[];
         [Write,ValueMap{"ModifiedDate","SHA-1","SHA-256","SHA-512"},Values{"ModifiedDate","SHA-1","SHA-256","SHA-512"}] string CheckSum;
 };
 
diff --git a/source/DSCResources/MSFT_xVhdFileDirectory/README.md b/source/DSCResources/DSC_VhdFileDirectory/README.md
similarity index 100%
rename from source/DSCResources/MSFT_xVhdFileDirectory/README.md
rename to source/DSCResources/DSC_VhdFileDirectory/README.md
diff --git a/source/DSCResources/MSFT_xVhdFileDirectory/en-US/MSFT_xVhdFileDirectory.strings.psd1 b/source/DSCResources/DSC_VhdFileDirectory/en-US/DSC_VhdFileDirectory.strings.psd1
similarity index 100%
rename from source/DSCResources/MSFT_xVhdFileDirectory/en-US/MSFT_xVhdFileDirectory.strings.psd1
rename to source/DSCResources/DSC_VhdFileDirectory/en-US/DSC_VhdFileDirectory.strings.psd1
diff --git a/source/Examples/Sample_EndToEndXHyperV_RunningVM.ps1 b/source/Examples/Sample_EndToEndHyperV_RunningVM.ps1
similarity index 80%
rename from source/Examples/Sample_EndToEndXHyperV_RunningVM.ps1
rename to source/Examples/Sample_EndToEndHyperV_RunningVM.ps1
index 0e7db60..96f9847 100644
--- a/source/Examples/Sample_EndToEndXHyperV_RunningVM.ps1
+++ b/source/Examples/Sample_EndToEndHyperV_RunningVM.ps1
@@ -1,5 +1,5 @@
 # End to end sample for x-Hyper-v
-Configuration Sample_EndToEndXHyperV_RunningVM
+Configuration Sample_EndToEndHyperV_RunningVM
 {
     param
     (
@@ -13,10 +13,10 @@ Configuration Sample_EndToEndXHyperV_RunningVM
         $unattendedFilePathToCopy = 'C:\Media\unattended.xml'
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     # Create a switch to be used by the VM
-    xVMSwitch switch
+    VMSwitch switch
     {
         Name   = 'Test-Switch'
         Ensure = 'Present'
@@ -24,7 +24,7 @@ Configuration Sample_EndToEndXHyperV_RunningVM
     }
 
     # Create new VHD file.
-    xVHD NewVHD1
+    Vhd NewVHD1
     {
 
         Ensure     = 'Present'
@@ -36,10 +36,10 @@ Configuration Sample_EndToEndXHyperV_RunningVM
 
     # Customize VHD by copying a folders/files to the VHD before a VM can be created
     # Example below shows copying unattended.xml before a VM can be created
-    xVhdFile CopyUnattendxml
+    VhdFile CopyUnattendxml
     {
         VhdPath       = $vhdPath
-        FileDirectory = MSFT_xFileDirectory
+        FileDirectory = DSC_FileDirectory
         {
             SourcePath      = $unattendedFilePathToCopy
             DestinationPath = 'unattended.xml'
@@ -47,7 +47,7 @@ Configuration Sample_EndToEndXHyperV_RunningVM
     }
 
     # create the testVM out of the vhd.
-    xVMHyperV testvm
+    VMHyperV testvm
     {
         Name            = "$($name)_vm"
         SwitchName      = 'Test-Switch'
@@ -56,7 +56,7 @@ Configuration Sample_EndToEndXHyperV_RunningVM
         MaximumMemory   = 1GB
         MinimumMemory   = 512MB
         RestartIfNeeded = $true
-        DependsOn       = '[xVHD]NewVHD1', '[xVMSwitch]switch', '[xVhdFile]CopyUnattendxml'
+        DependsOn       = '[VHD]NewVHD1', '[VMSwitch]switch', '[VhdFile]CopyUnattendxml'
         State           = 'Running'
     }
 }
diff --git a/source/Examples/Sample_xVMHardDiskDrive_VMWith4AdditionalDisks.ps1 b/source/Examples/Sample_VMHardDiskDrive_VMWith4AdditionalDisks.ps1
similarity index 83%
rename from source/Examples/Sample_xVMHardDiskDrive_VMWith4AdditionalDisks.ps1
rename to source/Examples/Sample_VMHardDiskDrive_VMWith4AdditionalDisks.ps1
index 69f889c..23b160c 100644
--- a/source/Examples/Sample_xVMHardDiskDrive_VMWith4AdditionalDisks.ps1
+++ b/source/Examples/Sample_VMHardDiskDrive_VMWith4AdditionalDisks.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVMHardDiskDrive_VMWith4AdditionalDisks
+configuration Sample_VMHardDiskDrive_VMWith4AdditionalDisks
 {
     param
     (
@@ -15,7 +15,7 @@ configuration Sample_xVMHardDiskDrive_VMWith4AdditionalDisks
         $VhdPath
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
     Import-DscResource -ModuleName 'PSDesiredStateConfiguration'
 
     Node $NodeName
@@ -36,7 +36,7 @@ configuration Sample_xVMHardDiskDrive_VMWith4AdditionalDisks
         }
 
         # Create the VHD for the OS
-        xVHD DiskOS
+        VHD DiskOS
         {
 
             Name             = $diskNameOS
@@ -48,22 +48,22 @@ configuration Sample_xVMHardDiskDrive_VMWith4AdditionalDisks
         }
 
         # Create the VM
-        xVMHyperV NewVM
+        VMHyperV NewVM
         {
             Name       = $VMName
             VhdPath    = Join-Path $VhdPath -ChildPath $diskNameOS
             Generation = 1
             Ensure     = 'Present'
-            DependsOn  = '[xVHD]DiskOS'
+            DependsOn  = '[VHD]DiskOS'
         }
 
         # Ensures a SCSI controller exists on the VM
-        xVMScsiController Controller
+        VMScsiController Controller
         {
             Ensure           = 'Present'
             VMName           = $VMName
             ControllerNumber = 0
-            DependsOn        = '[xVMHyperV]NewVM'
+            DependsOn        = '[VMHyperV]NewVM'
         }
 
         foreach ($i in 0 .. 3)
@@ -71,7 +71,7 @@ configuration Sample_xVMHardDiskDrive_VMWith4AdditionalDisks
             $diskName = "$VMName-Disk-$i.vhdx"
 
             # Create the VHD
-            xVHD "Disk-$i"
+            VHD "Disk-$i"
             {
 
                 Name             = $diskName
@@ -83,14 +83,14 @@ configuration Sample_xVMHardDiskDrive_VMWith4AdditionalDisks
             }
 
             # Attach the VHD
-            xVMHardDiskDrive "ExtraDisk-$i"
+            VMHardDiskDrive "ExtraDisk-$i"
             {
                 VMName             = $VMName
                 Path               = Join-Path $VhdPath -ChildPath $diskName
                 ControllerType     = 'SCSI'
                 ControllerLocation = $i
                 Ensure             = 'Present'
-                DependsOn          = '[xVMScsiController]Controller', "[xVHD]Disk-$i"
+                DependsOn          = '[VMScsiController]Controller', "[VHD]Disk-$i"
             }
         }
     }
diff --git a/source/Examples/Sample_xVMHardDiskDrive_VMWithExtraDisk.ps1 b/source/Examples/Sample_VMHardDiskDrive_VMWithExtraDisk.ps1
similarity index 86%
rename from source/Examples/Sample_xVMHardDiskDrive_VMWithExtraDisk.ps1
rename to source/Examples/Sample_VMHardDiskDrive_VMWithExtraDisk.ps1
index c04da8f..bbfb543 100644
--- a/source/Examples/Sample_xVMHardDiskDrive_VMWithExtraDisk.ps1
+++ b/source/Examples/Sample_VMHardDiskDrive_VMWithExtraDisk.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVMHardDiskDrive_VMWithExtraDisk
+configuration Sample_VMHardDiskDrive_VMWithExtraDisk
 {
     param
     (
@@ -15,7 +15,7 @@ configuration Sample_xVMHardDiskDrive_VMWithExtraDisk
         $VhdPath
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
     Import-DscResource -ModuleName 'PSDesiredStateConfiguration'
 
     Node $NodeName
@@ -36,7 +36,7 @@ configuration Sample_xVMHardDiskDrive_VMWithExtraDisk
             Name   = 'Hyper-V-PowerShell'
         }
 
-        xVHD DiskOS
+        VHD DiskOS
         {
             Name             = $diskNameOS
             Path             = $VhdPath
@@ -46,7 +46,7 @@ configuration Sample_xVMHardDiskDrive_VMWithExtraDisk
             DependsOn        = '[WindowsFeature]HyperV'
         }
 
-        xVHD Disk1
+        VHD Disk1
         {
             Name             = $diskNameExtra1
             Path             = $VhdPath
@@ -56,16 +56,16 @@ configuration Sample_xVMHardDiskDrive_VMWithExtraDisk
             DependsOn        = '[WindowsFeature]HyperV'
         }
 
-        xVMHyperV NewVM
+        VMHyperV NewVM
         {
             Ensure     = 'Present'
             Name       = $VMName
             VhdPath    = Join-Path $VhdPath -ChildPath $diskNameOS
             Generation = 1
-            DependsOn  = '[xVHD]DiskOS'
+            DependsOn  = '[VHD]DiskOS'
         }
 
-        xVMHardDiskDrive ExtraDisk
+        VMHardDiskDrive ExtraDisk
         {
             VMName             = $VMName
             Path               = Join-Path $VhdPath -ChildPath $diskNameExtra1
@@ -73,7 +73,7 @@ configuration Sample_xVMHardDiskDrive_VMWithExtraDisk
             ControllerNumber   = 0
             ControllerLocation = 1
             Ensure             = 'Present'
-            DependsOn          = '[xVHD]Disk1'
+            DependsOn          = '[VHD]Disk1'
         }
     }
 }
diff --git a/source/Examples/Sample_xVMHost_Paths.ps1 b/source/Examples/Sample_VMHost_Paths.ps1
similarity index 73%
rename from source/Examples/Sample_xVMHost_Paths.ps1
rename to source/Examples/Sample_VMHost_Paths.ps1
index ddde243..fb39228 100644
--- a/source/Examples/Sample_xVMHost_Paths.ps1
+++ b/source/Examples/Sample_VMHost_Paths.ps1
@@ -1,4 +1,4 @@
-Configuration Sample_xVMHost_Paths
+Configuration Sample_VMHost_Paths
 {
     param
     (
@@ -9,9 +9,9 @@ Configuration Sample_xVMHost_Paths
         $VirtualMachinePath = 'C:\VMs'
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
-    xVMHost HyperVHostPaths
+    VMHost HyperVHostPaths
     {
         IsSingleInstance    = 'Yes'
         VirtualHardDiskPath = $VirtualHardDiskPath
diff --git a/source/Examples/Sample_xVMHyperV_Complete.ps1 b/source/Examples/Sample_VMHyperV_Complete.ps1
similarity index 94%
rename from source/Examples/Sample_xVMHyperV_Complete.ps1
rename to source/Examples/Sample_VMHyperV_Complete.ps1
index 1f94de4..19122ee 100644
--- a/source/Examples/Sample_xVMHyperV_Complete.ps1
+++ b/source/Examples/Sample_VMHyperV_Complete.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVMHyperV_Complete
+configuration Sample_VMHyperV_Complete
 {
     param
     (
@@ -48,7 +48,7 @@ configuration Sample_xVMHyperV_Complete
         $AutomaticCheckpointsEnabled
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node $NodeName
     {
@@ -81,7 +81,7 @@ configuration Sample_xVMHyperV_Complete
         }
 
         # Create new VHD
-        xVhd NewVhd
+        Vhd NewVhd
         {
             Ensure           = 'Present'
             Name             = "$VMName-OSDisk.vhdx"
@@ -92,7 +92,7 @@ configuration Sample_xVMHyperV_Complete
         }
 
         # Ensures a VM with all the properties
-        xVMHyperV NewVM
+        VMHyperV NewVM
         {
             Ensure          = 'Present'
             Name            = $VMName
@@ -109,7 +109,7 @@ configuration Sample_xVMHyperV_Complete
             RestartIfNeeded = $true
             WaitForIP       = $WaitForIP
             AutomaticCheckpointsEnabled = $AutomaticCheckpointsEnabled
-            DependsOn       = '[xVhd]NewVhd'
+            DependsOn       = '[Vhd]NewVhd'
         }
     }
 }
diff --git a/source/Examples/Sample_xVMHyperV_DynamicMemory.ps1 b/source/Examples/Sample_VMHyperV_DynamicMemory.ps1
similarity index 90%
rename from source/Examples/Sample_xVMHyperV_DynamicMemory.ps1
rename to source/Examples/Sample_VMHyperV_DynamicMemory.ps1
index 9465f88..1afbb75 100644
--- a/source/Examples/Sample_xVMHyperV_DynamicMemory.ps1
+++ b/source/Examples/Sample_VMHyperV_DynamicMemory.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVMHyperV_DynamicMemory
+configuration Sample_VMHyperV_DynamicMemory
 {
     param
     (
@@ -26,7 +26,7 @@ configuration Sample_xVMHyperV_DynamicMemory
         $MaximumMemory
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node $NodeName
     {
@@ -38,7 +38,7 @@ configuration Sample_xVMHyperV_DynamicMemory
         }
 
         # Ensures a VM with dynamic memory
-        xVMHyperV NewVM
+        VMHyperV NewVM
         {
             Ensure        = 'Present'
             Name          = $VMName
diff --git a/source/Examples/Sample_xVMHyperV_MultipleNICs.ps1 b/source/Examples/Sample_VMHyperV_MultipleNICs.ps1
similarity index 79%
rename from source/Examples/Sample_xVMHyperV_MultipleNICs.ps1
rename to source/Examples/Sample_VMHyperV_MultipleNICs.ps1
index d4ce83b..ac78a32 100644
--- a/source/Examples/Sample_xVMHyperV_MultipleNICs.ps1
+++ b/source/Examples/Sample_VMHyperV_MultipleNICs.ps1
@@ -1,4 +1,4 @@
-Configuration Sample_xVMHyperV_MultipleNICs
+Configuration Sample_VMHyperV_MultipleNICs
 {
     param
     (
@@ -23,7 +23,7 @@ Configuration Sample_xVMHyperV_MultipleNICs
         $MACAddress = '0000000'
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node $NodeName
     {
@@ -40,9 +40,9 @@ Configuration Sample_xVMHyperV_MultipleNICs
             Name   = 'Hyper-V-PowerShell'
         }
 
-        # Dynamically build the 'DependsOn' array for the 'xVMHyperV' feature
+        # Dynamically build the 'DependsOn' array for the 'VMHyperV' feature
         # based on the number of virtual switches specified
-        $xVMHyperVDependsOn = @('[WindowsFeature]HyperV','[WindowsFeature]HyperVPowerShell')
+        $VMHyperVDependsOn = @('[WindowsFeature]HyperV','[WindowsFeature]HyperVPowerShell')
 
         # Create each virtual switch
         foreach ($vmSwitch in $SwitchName)
@@ -50,9 +50,9 @@ Configuration Sample_xVMHyperV_MultipleNICs
             # Remove spaces and hyphens from the identifier
             $vmSwitchName = $vmSwitch -replace ' ','' -replace '-',''
             # Add the virtual switch dependency
-            $xVMHyperVDependsOn += "[xVMSwitch]$vmSwitchName"
+            $VMHyperVDependsOn += "[VMSwitch]$vmSwitchName"
 
-            xVMSwitch $vmSwitchName
+            VMSwitch $vmSwitchName
             {
                 Ensure         = 'Present'
                 Name           = $vmSwitch
@@ -62,7 +62,7 @@ Configuration Sample_xVMHyperV_MultipleNICs
         }
 
         # Ensures a VM with all the properties
-        xVMHyperV $VMName
+        VMHyperV $VMName
         {
             Ensure     = 'Present'
             Name       = $VMName
@@ -70,7 +70,7 @@ Configuration Sample_xVMHyperV_MultipleNICs
             SwitchName = $SwitchName
             MACAddress = $MACAddress
             # Use the dynamically created dependency list/array
-            DependsOn  = $xVMHyperVDependsOn
+            DependsOn  = $VMHyperVDependsOn
         }
     }
 }
diff --git a/source/Examples/Sample_xVMHyperV_Simple.ps1 b/source/Examples/Sample_VMHyperV_Simple.ps1
similarity index 86%
rename from source/Examples/Sample_xVMHyperV_Simple.ps1
rename to source/Examples/Sample_VMHyperV_Simple.ps1
index f502249..20586fb 100644
--- a/source/Examples/Sample_xVMHyperV_Simple.ps1
+++ b/source/Examples/Sample_VMHyperV_Simple.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVMHyperV_Simple
+configuration Sample_VMHyperV_Simple
 {
     param
     (
@@ -14,7 +14,7 @@ configuration Sample_xVMHyperV_Simple
         $VhdPath
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node $NodeName
     {
@@ -26,7 +26,7 @@ configuration Sample_xVMHyperV_Simple
         }
 
         # Ensures a VM with default settings
-        xVMHyperV NewVM
+        VMHyperV NewVM
         {
             Ensure    = 'Present'
             Name      = $VMName
diff --git a/source/Examples/Sample_xVMHyperV_SimpleWithDVDDrive.ps1 b/source/Examples/Sample_VMHyperV_SimpleWithDVDDrive.ps1
similarity index 82%
rename from source/Examples/Sample_xVMHyperV_SimpleWithDVDDrive.ps1
rename to source/Examples/Sample_VMHyperV_SimpleWithDVDDrive.ps1
index 0dafeae..71dd189 100644
--- a/source/Examples/Sample_xVMHyperV_SimpleWithDVDDrive.ps1
+++ b/source/Examples/Sample_VMHyperV_SimpleWithDVDDrive.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVMHyperV_SimpleWithDvdDrive
+configuration Sample_VMHyperV_SimpleWithDvdDrive
 {
     param
     (
@@ -17,7 +17,7 @@ configuration Sample_xVMHyperV_SimpleWithDvdDrive
         $ISOPath
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node $NodeName
     {
@@ -29,7 +29,7 @@ configuration Sample_xVMHyperV_SimpleWithDvdDrive
         }
 
         # Ensures a VM with default settings
-        xVMHyperV NewVM
+        VMHyperV NewVM
         {
             Ensure    = 'Present'
             Name      = $VMName
@@ -39,14 +39,14 @@ configuration Sample_xVMHyperV_SimpleWithDvdDrive
         }
 
         # Adds DVD Drive with ISO
-        xVMDvdDrive NewVMDvdDriveISO
+        VMDvdDrive NewVMDvdDriveISO
         {
             Ensure             = 'Present'
             VMName               = $VMName
             ControllerNumber   = 0
             ControllerLocation = 0
             Path               = $ISOPath
-            DependsOn          = '[xVMHyperV]NewVM'
+            DependsOn          = '[VMHyperV]NewVM'
         }
     }
 }
diff --git a/source/Examples/Sample_xVMHyperV_SimpleWithNestedVirtualization.ps1 b/source/Examples/Sample_VMHyperV_SimpleWithNestedVirtualization.ps1
similarity index 82%
rename from source/Examples/Sample_xVMHyperV_SimpleWithNestedVirtualization.ps1
rename to source/Examples/Sample_VMHyperV_SimpleWithNestedVirtualization.ps1
index 41475dc..a8a6155 100644
--- a/source/Examples/Sample_xVMHyperV_SimpleWithNestedVirtualization.ps1
+++ b/source/Examples/Sample_VMHyperV_SimpleWithNestedVirtualization.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVMHyperV_SimpleWithNestedVirtualization
+configuration Sample_VMHyperV_SimpleWithNestedVirtualization
 {
     param
     (
@@ -19,7 +19,7 @@ configuration Sample_xVMHyperV_SimpleWithNestedVirtualization
         $Memory
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node $NodeName
     {
@@ -31,7 +31,7 @@ configuration Sample_xVMHyperV_SimpleWithNestedVirtualization
         }
 
         # Ensures a VM with default settings
-        xVMHyperV NewVM
+        VMHyperV NewVM
         {
             Ensure        = 'Present'
             Name          = $VMName
@@ -44,11 +44,11 @@ configuration Sample_xVMHyperV_SimpleWithNestedVirtualization
         }
 
         # Set the VM options
-        xVMProcessor NestedVirtualization
+        VMProcessor NestedVirtualization
         {
             VMName                         = $VMName
             ExposeVirtualizationExtensions = $true
-            DependsOn                      = '[xVMHyperV]NewVM'
+            DependsOn                      = '[VMHyperV]NewVM'
         }
     }
 }
diff --git a/source/Examples/Sample_xVMNetworkAdapter_ManagementOS.ps1 b/source/Examples/Sample_VMNetworkAdapter_ManagementOS.ps1
similarity index 60%
rename from source/Examples/Sample_xVMNetworkAdapter_ManagementOS.ps1
rename to source/Examples/Sample_VMNetworkAdapter_ManagementOS.ps1
index b567156..7a5c284 100644
--- a/source/Examples/Sample_xVMNetworkAdapter_ManagementOS.ps1
+++ b/source/Examples/Sample_VMNetworkAdapter_ManagementOS.ps1
@@ -1,9 +1,9 @@
-Configuration Sample_xVMNetworkAdapter_ManagementOS
+Configuration Sample_VMNetworkAdapter_ManagementOS
 {
-    Import-DscResource -ModuleName 'xHyper-V' -Name xVMNetworkAdapter
+    Import-DscResource -ModuleName 'HyperVDsc' -Name VMNetworkAdapter
     Import-DscResource -ModuleName PSDesiredStateConfiguration
 
-    xVMNetworkAdapter HostOSAdapter {
+    VMNetworkAdapter HostOSAdapter {
         Id = 'Management-NIC'
         Name = 'Management-NIC'
         SwitchName = 'SETSwitch'
diff --git a/source/Examples/Sample_xVMNetworkAdapter_MultipleManagementOS.ps1 b/source/Examples/Sample_VMNetworkAdapter_MultipleManagementOS.ps1
similarity index 65%
rename from source/Examples/Sample_xVMNetworkAdapter_MultipleManagementOS.ps1
rename to source/Examples/Sample_VMNetworkAdapter_MultipleManagementOS.ps1
index 84bfd44..9cb2225 100644
--- a/source/Examples/Sample_xVMNetworkAdapter_MultipleManagementOS.ps1
+++ b/source/Examples/Sample_VMNetworkAdapter_MultipleManagementOS.ps1
@@ -1,9 +1,9 @@
-Configuration Sample_xVMNetworkAdapter_MultipleManagementOS
+Configuration Sample_VMNetworkAdapter_MultipleManagementOS
 {
-    Import-DscResource -ModuleName 'xHyper-V' -Name xVMNetworkAdapter
+    Import-DscResource -ModuleName 'HyperVDsc' -Name VMNetworkAdapter
     Import-DscResource -ModuleName PSDesiredStateConfiguration
 
-    xVMNetworkAdapter ManagementAdapter {
+    VMNetworkAdapter ManagementAdapter {
         Id = 'Management-NIC'
         Name = 'Management-NIC'
         SwitchName = 'SETSwitch'
@@ -11,7 +11,7 @@ Configuration Sample_xVMNetworkAdapter_MultipleManagementOS
         Ensure = 'Present'
     }
 
-    xVMNetworkAdapter ClusterAdapter {
+    VMNetworkAdapter ClusterAdapter {
         Id = 'Cluster-NIC'
         Name = 'Cluster-NIC'
         SwitchName = 'SETSwitch'
diff --git a/source/Examples/Sample_xVMNetworkAdapter_MultipleVM.ps1 b/source/Examples/Sample_VMNetworkAdapter_MultipleVM.ps1
similarity index 70%
rename from source/Examples/Sample_xVMNetworkAdapter_MultipleVM.ps1
rename to source/Examples/Sample_VMNetworkAdapter_MultipleVM.ps1
index 8a4bc78..7d569a9 100644
--- a/source/Examples/Sample_xVMNetworkAdapter_MultipleVM.ps1
+++ b/source/Examples/Sample_VMNetworkAdapter_MultipleVM.ps1
@@ -1,9 +1,9 @@
-Configuration Sample_xVMNetworkAdapter_MultipleVM
+Configuration Sample_VMNetworkAdapter_MultipleVM
 {
-    Import-DscResource -ModuleName 'xHyper-V' -Name xVMNetworkAdapter
+    Import-DscResource -ModuleName 'HyperVDsc' -Name VMNetworkAdapter
     Import-DscResource -ModuleName PSDesiredStateConfiguration
 
-    xVMNetworkAdapter MyVM01NIC {
+    VMNetworkAdapter MyVM01NIC {
         Id = 'MyVM01-NIC'
         Name = 'MyVM01-NIC'
         SwitchName = 'SETSwitch'
@@ -11,7 +11,7 @@ Configuration Sample_xVMNetworkAdapter_MultipleVM
         Ensure = 'Present'
     }
 
-    xVMNetworkAdapter MyVM02NIC {
+    VMNetworkAdapter MyVM02NIC {
         Id = 'MyVM02-NIC'
         Name = 'NetAdapter'
         SwitchName = 'SETSwitch'
@@ -19,7 +19,7 @@ Configuration Sample_xVMNetworkAdapter_MultipleVM
         Ensure = 'Present'
     }
 
-    xVMNetworkAdapter MyVM03NIC {
+    VMNetworkAdapter MyVM03NIC {
         Id = 'MyVM03-NIC'
         Name = 'NetAdapter'
         SwitchName = 'SETSwitch'
diff --git a/source/Examples/Sample_xVMNetworkAdapter_MultipleVMMACAddress.ps1 b/source/Examples/Sample_VMNetworkAdapter_MultipleVMMACAddress.ps1
similarity index 69%
rename from source/Examples/Sample_xVMNetworkAdapter_MultipleVMMACAddress.ps1
rename to source/Examples/Sample_VMNetworkAdapter_MultipleVMMACAddress.ps1
index af48d1d..7b0d4c9 100644
--- a/source/Examples/Sample_xVMNetworkAdapter_MultipleVMMACAddress.ps1
+++ b/source/Examples/Sample_VMNetworkAdapter_MultipleVMMACAddress.ps1
@@ -1,9 +1,9 @@
-Configuration Sample_xVMNetworkAdapter_MultipleVMMACAddress
+Configuration Sample_VMNetworkAdapter_MultipleVMMACAddress
 {
-    Import-DscResource -ModuleName 'xHyper-V' -Name xVMNetworkAdapter
+    Import-DscResource -ModuleName 'HyperVDsc' -Name VMNetworkAdapter
     Import-DscResource -ModuleName PSDesiredStateConfiguration
 
-    xVMNetworkAdapter MyVM01NIC {
+    VMNetworkAdapter MyVM01NIC {
         Id = 'MyVM01-NIC'
         Name = 'MyVM01-NIC'
         SwitchName = 'SETSwitch'
@@ -12,7 +12,7 @@ Configuration Sample_xVMNetworkAdapter_MultipleVMMACAddress
         Ensure = 'Present'
     }
 
-    xVMNetworkAdapter MyVM02NIC {
+    VMNetworkAdapter MyVM02NIC {
         Id = 'MyVM02-NIC'
         Name = 'MyVM02-NIC'
         SwitchName = 'SETSwitch'
diff --git a/source/Examples/Sample_xVMNetworkAdapter_VMStaticNetworkSettings.ps1 b/source/Examples/Sample_VMNetworkAdapter_VMStaticNetworkSettings.ps1
similarity index 67%
rename from source/Examples/Sample_xVMNetworkAdapter_VMStaticNetworkSettings.ps1
rename to source/Examples/Sample_VMNetworkAdapter_VMStaticNetworkSettings.ps1
index b9321c3..85cfc49 100644
--- a/source/Examples/Sample_xVMNetworkAdapter_VMStaticNetworkSettings.ps1
+++ b/source/Examples/Sample_VMNetworkAdapter_VMStaticNetworkSettings.ps1
@@ -1,8 +1,8 @@
-Configuration Sample_xVMNetworkAdapter_VMStaticNetworkSettings
+Configuration Sample_VMNetworkAdapter_VMStaticNetworkSettings
 {
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
-    xVMNetworkAdapter MyVM01NIC
+    VMNetworkAdapter MyVM01NIC
     {
         Ensure = 'Present'
         Id = 'MyVM01-NIC'
@@ -10,7 +10,7 @@ Configuration Sample_xVMNetworkAdapter_VMStaticNetworkSettings
         SwitchName = 'SETSwitch'
         MacAddress = '001523be0c00'
         VMName = 'MyVM01'
-        NetworkSetting = xNetworkSettings
+        NetworkSetting = NetworkSettings
         {
             IpAddress = '192.168.0.100'
             Subnet = '255.255.255.255'
diff --git a/source/Examples/Sample_xVMNetworkAdapter_VMVlanTagging.ps1 b/source/Examples/Sample_VMNetworkAdapter_VMVlanTagging.ps1
similarity index 64%
rename from source/Examples/Sample_xVMNetworkAdapter_VMVlanTagging.ps1
rename to source/Examples/Sample_VMNetworkAdapter_VMVlanTagging.ps1
index e667364..18036cf 100644
--- a/source/Examples/Sample_xVMNetworkAdapter_VMVlanTagging.ps1
+++ b/source/Examples/Sample_VMNetworkAdapter_VMVlanTagging.ps1
@@ -1,9 +1,9 @@
-Configuration Sample_xVMNetworkAdapter_VMVlanTagging
+Configuration Sample_VMNetworkAdapter_VMVlanTagging
 {
-    Import-DscResource -ModuleName 'xHyper-V' -Name xVMNetworkAdapter
+    Import-DscResource -ModuleName 'HyperVDsc' -Name VMNetworkAdapter
     Import-DscResource -ModuleName PSDesiredStateConfiguration
 
-    xVMNetworkAdapter MyVM01NIC {
+    VMNetworkAdapter MyVM01NIC {
         Id = 'MyVM01-NIC'
         Name = 'MyVM01-NIC'
         SwitchName = 'SETSwitch'
diff --git a/source/Examples/Sample_xVMScsiController_AddControllers.ps1 b/source/Examples/Sample_VMScsiController_AddControllers.ps1
similarity index 82%
rename from source/Examples/Sample_xVMScsiController_AddControllers.ps1
rename to source/Examples/Sample_VMScsiController_AddControllers.ps1
index b22a54f..4b3530e 100644
--- a/source/Examples/Sample_xVMScsiController_AddControllers.ps1
+++ b/source/Examples/Sample_VMScsiController_AddControllers.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVMScsiController_AddControllers
+configuration Sample_VMScsiController_AddControllers
 {
     param
     (
@@ -15,7 +15,7 @@ configuration Sample_xVMScsiController_AddControllers
         $VhdPath
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
     Import-DscResource -ModuleName 'PSDesiredStateConfiguration'
 
     Node $NodeName
@@ -30,7 +30,7 @@ configuration Sample_xVMScsiController_AddControllers
         }
 
         # Create the VHD for the OS
-        xVHD DiskOS
+        VHD DiskOS
         {
             Ensure           = 'Present'
             Name             = $diskNameOS
@@ -41,22 +41,22 @@ configuration Sample_xVMScsiController_AddControllers
         }
 
         # Create the VM
-        xVMHyperV NewVM
+        VMHyperV NewVM
         {
             Ensure     = 'Present'
             Name       = $VMName
             VhdPath    = Join-Path -Path $VhdPath -ChildPath $diskNameOS
             Generation = 2
-            DependsOn  = '[xVHD]DiskOS'
+            DependsOn  = '[VHD]DiskOS'
         }
 
         # Add and additional SCSI controller
-        xVMScsiController Controller
+        VMScsiController Controller
         {
             Ensure           = 'Present'
             VMName           = $VMName
             ControllerNumber = 1
-            DependsOn        = '[xVMHyperV]NewVM'
+            DependsOn        = '[VMHyperV]NewVM'
         }
 
     }
diff --git a/source/Examples/Sample_xVMSwitch_External.ps1 b/source/Examples/Sample_VMSwitch_External.ps1
similarity index 86%
rename from source/Examples/Sample_xVMSwitch_External.ps1
rename to source/Examples/Sample_VMSwitch_External.ps1
index 7a5929b..79b102a 100644
--- a/source/Examples/Sample_xVMSwitch_External.ps1
+++ b/source/Examples/Sample_VMSwitch_External.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVMSwitch_External
+configuration Sample_VMSwitch_External
 {
     param
     (
@@ -14,7 +14,7 @@ configuration Sample_xVMSwitch_External
         $NetAdapterName
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node $NodeName
     {
@@ -26,7 +26,7 @@ configuration Sample_xVMSwitch_External
         }
 
         # Ensures a VM with default settings
-        xVMSwitch ExternalSwitch
+        VMSwitch ExternalSwitch
         {
             Ensure         = 'Present'
             Name           = $SwitchName
diff --git a/source/Examples/Sample_xVMSwitch_ExternalSET.ps1 b/source/Examples/Sample_VMSwitch_ExternalSET.ps1
similarity index 89%
rename from source/Examples/Sample_xVMSwitch_ExternalSET.ps1
rename to source/Examples/Sample_VMSwitch_ExternalSET.ps1
index b03c485..961290c 100644
--- a/source/Examples/Sample_xVMSwitch_ExternalSET.ps1
+++ b/source/Examples/Sample_VMSwitch_ExternalSET.ps1
@@ -1,4 +1,4 @@
-Configuration Sample_xVMSwitch_ExternalSET
+Configuration Sample_VMSwitch_ExternalSET
 {
     param
     (
@@ -15,7 +15,7 @@ Configuration Sample_xVMSwitch_ExternalSET
         $NetAdapterNames
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node $NodeName
     {
@@ -34,7 +34,7 @@ Configuration Sample_xVMSwitch_ExternalSET
         }
 
         # Ensures a VM with default settings
-        xVMSwitch ExternalSwitch
+        VMSwitch ExternalSwitch
         {
             Ensure                = 'Present'
             Name                  = $SwitchName
diff --git a/source/Examples/Sample_xVMSwitch_ExternalSET_LBMode.ps1 b/source/Examples/Sample_VMSwitch_ExternalSET_LBMode.ps1
similarity index 89%
rename from source/Examples/Sample_xVMSwitch_ExternalSET_LBMode.ps1
rename to source/Examples/Sample_VMSwitch_ExternalSET_LBMode.ps1
index b50ae89..a175540 100644
--- a/source/Examples/Sample_xVMSwitch_ExternalSET_LBMode.ps1
+++ b/source/Examples/Sample_VMSwitch_ExternalSET_LBMode.ps1
@@ -1,4 +1,4 @@
-Configuration Sample_xVMSwitch_ExternalSET_LBMode
+Configuration Sample_VMSwitch_ExternalSET_LBMode
 {
     param
     (
@@ -15,7 +15,7 @@ Configuration Sample_xVMSwitch_ExternalSET_LBMode
         $NetAdapterNames
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node $NodeName
     {
@@ -34,7 +34,7 @@ Configuration Sample_xVMSwitch_ExternalSET_LBMode
         }
 
         # Ensures a VM with Load Balancing Algorithm 'Hyper-V Port"
-        xVMSwitch ExternalSwitch
+        VMSwitch ExternalSwitch
         {
             Ensure                  = 'Present'
             Name                    = $SwitchName
diff --git a/source/Examples/Sample_xVMSwitch_Internal.ps1 b/source/Examples/Sample_VMSwitch_Internal.ps1
similarity index 83%
rename from source/Examples/Sample_xVMSwitch_Internal.ps1
rename to source/Examples/Sample_VMSwitch_Internal.ps1
index 8f8de1d..241227c 100644
--- a/source/Examples/Sample_xVMSwitch_Internal.ps1
+++ b/source/Examples/Sample_VMSwitch_Internal.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVMSwitch_Internal
+configuration Sample_VMSwitch_Internal
 {
     param
     (
@@ -10,7 +10,7 @@ configuration Sample_xVMSwitch_Internal
         $SwitchName
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node $NodeName
     {
@@ -22,7 +22,7 @@ configuration Sample_xVMSwitch_Internal
         }
 
         # Ensures a VM with default settings
-        xVMSwitch InternalSwitch
+        VMSwitch InternalSwitch
         {
             Ensure         = 'Present'
             Name           = $SwitchName
diff --git a/source/Examples/Sample_xVhd_AdditionalPropertyVHD.ps1 b/source/Examples/Sample_Vhd_AdditionalPropertyVHD.ps1
similarity index 88%
rename from source/Examples/Sample_xVhd_AdditionalPropertyVHD.ps1
rename to source/Examples/Sample_Vhd_AdditionalPropertyVHD.ps1
index 47e744f..19f5d92 100644
--- a/source/Examples/Sample_xVhd_AdditionalPropertyVHD.ps1
+++ b/source/Examples/Sample_Vhd_AdditionalPropertyVHD.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVHD_AdditionalPropertyVHD
+configuration Sample_Vhd_AdditionalPropertyVHD
 {
     param
     (
@@ -29,11 +29,11 @@ configuration Sample_xVHD_AdditionalPropertyVHD
         $Ensure = 'Present'
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node localhost
     {
-        xVHD WrongVHD
+        Vhd WrongVHD
         {
             Ensure           = $Ensure
             Name             = $Name
diff --git a/source/Examples/Sample_xVhd_ChangeAttribute.ps1 b/source/Examples/Sample_Vhd_ChangeAttribute.ps1
similarity index 75%
rename from source/Examples/Sample_xVhd_ChangeAttribute.ps1
rename to source/Examples/Sample_Vhd_ChangeAttribute.ps1
index eb9d87a..53597bb 100644
--- a/source/Examples/Sample_xVhd_ChangeAttribute.ps1
+++ b/source/Examples/Sample_Vhd_ChangeAttribute.ps1
@@ -1,4 +1,4 @@
-Configuration Sample_xVhd_ChangeAttribute
+Configuration Sample_Vhd_ChangeAttribute
 {
     param
     (
@@ -13,12 +13,12 @@ Configuration Sample_xVhd_ChangeAttribute
         $attribute = 'Archive'
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
-    xVhdFile Change-Attribute
+    VhdFile Change-Attribute
     {
         VhdPath       = $vhdPath
-        FileDirectory = MSFT_xFileDirectory
+        FileDirectory = DSC_FileDirectory
         {
             DestinationPath = $relativeDestinationPath
             Attributes      = $attribute
diff --git a/source/Examples/Sample_xVhd_CopyFileOrFolder.ps1 b/source/Examples/Sample_Vhd_CopyFileOrFolder.ps1
similarity index 70%
rename from source/Examples/Sample_xVhd_CopyFileOrFolder.ps1
rename to source/Examples/Sample_Vhd_CopyFileOrFolder.ps1
index 64f7da1..78b0e42 100644
--- a/source/Examples/Sample_xVhd_CopyFileOrFolder.ps1
+++ b/source/Examples/Sample_Vhd_CopyFileOrFolder.ps1
@@ -1,4 +1,4 @@
-Configuration Sample_xVhd_CopyFileOrFolder
+Configuration Sample_Vhd_CopyFileOrFolder
 {
     param
     (
@@ -12,12 +12,12 @@ Configuration Sample_xVhd_CopyFileOrFolder
         $relativeDestinationPath = 'Temp'
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
-    xVhdFile FileCopy
+    VhdFile FileCopy
     {
         VhdPath       = $vhdPath
-        FileDirectory = MSFT_xFileDirectory
+        FileDirectory = DSC_FileDirectory
         {
             SourcePath      = $itemToCopy
             DestinationPath = $relativeDestinationPath
diff --git a/source/Examples/Sample_xVhd_DiffVHD.ps1 b/source/Examples/Sample_Vhd_DiffVHD.ps1
similarity index 93%
rename from source/Examples/Sample_xVhd_DiffVHD.ps1
rename to source/Examples/Sample_Vhd_DiffVHD.ps1
index 053fea3..74a09af 100644
--- a/source/Examples/Sample_xVhd_DiffVHD.ps1
+++ b/source/Examples/Sample_Vhd_DiffVHD.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVhd_DiffVhd
+configuration Sample_Vhd_DiffVhd
 {
     param
     (
@@ -33,7 +33,7 @@ configuration Sample_xVhd_DiffVhd
         $Ensure = 'Present'
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node $NodeName
     {
@@ -50,7 +50,7 @@ configuration Sample_xVhd_DiffVhd
             Name   = 'Hyper-V-PowerShell'
         }
 
-        xVhd DiffVhd
+        Vhd DiffVhd
         {
             Ensure     = $Ensure
             Name       = $Name
diff --git a/source/Examples/Sample_xVhd_FixedVHD.ps1 b/source/Examples/Sample_Vhd_FixedVHD.ps1
similarity index 92%
rename from source/Examples/Sample_xVhd_FixedVHD.ps1
rename to source/Examples/Sample_Vhd_FixedVHD.ps1
index bb62a86..393ea5c 100644
--- a/source/Examples/Sample_xVhd_FixedVHD.ps1
+++ b/source/Examples/Sample_Vhd_FixedVHD.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVhd_FixedVhd
+configuration Sample_Vhd_FixedVhd
 {
     param
     (
@@ -30,7 +30,7 @@ configuration Sample_xVhd_FixedVhd
         $Ensure = 'Present'
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node $NodeName
     {
@@ -47,7 +47,7 @@ configuration Sample_xVhd_FixedVhd
             Name   = 'Hyper-V-PowerShell'
         }
 
-        xVhd DiffVhd
+        Vhd DiffVhd
         {
             Ensure     = $Ensure
             Name       = $Name
diff --git a/source/Examples/Sample_xVhd_MissingPropertyVHD.ps1 b/source/Examples/Sample_Vhd_MissingPropertyVHD.ps1
similarity index 84%
rename from source/Examples/Sample_xVhd_MissingPropertyVHD.ps1
rename to source/Examples/Sample_Vhd_MissingPropertyVHD.ps1
index ab6be7c..d702f2c 100644
--- a/source/Examples/Sample_xVhd_MissingPropertyVHD.ps1
+++ b/source/Examples/Sample_Vhd_MissingPropertyVHD.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVHD_MissingPropertyVHD
+configuration Sample_VHD_MissingPropertyVHD
 {
     param
     (
@@ -21,11 +21,11 @@ configuration Sample_xVHD_MissingPropertyVHD
         $Ensure = 'Present'
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node localhost
     {
-        xVHD WrongVHD
+        VHD WrongVHD
         {
             Ensure     = $Ensure
             Name       = $Name
diff --git a/source/Examples/Sample_xVhd_NewVHD.ps1 b/source/Examples/Sample_Vhd_NewVHD.ps1
similarity index 92%
rename from source/Examples/Sample_xVhd_NewVHD.ps1
rename to source/Examples/Sample_Vhd_NewVHD.ps1
index 5ebc0f8..47f57d4 100644
--- a/source/Examples/Sample_xVhd_NewVHD.ps1
+++ b/source/Examples/Sample_Vhd_NewVHD.ps1
@@ -1,4 +1,4 @@
-configuration Sample_xVHD_NewVhd
+configuration Sample_VHD_NewVhd
 {
     param
     (
@@ -28,7 +28,7 @@ configuration Sample_xVHD_NewVhd
         $Ensure = 'Present'
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     Node $NodeName
     {
@@ -45,7 +45,7 @@ configuration Sample_xVHD_NewVhd
             Name   = 'Hyper-V-PowerShell'
         }
 
-        xVhd NewVhd
+        Vhd NewVhd
         {
             Ensure           = $Ensure
             Name             = $Name
diff --git a/source/Examples/Sample_xVhd_RemoveFileOrFolderFromVHD.ps1 b/source/Examples/Sample_Vhd_RemoveFileOrFolderFromVHD.ps1
similarity index 68%
rename from source/Examples/Sample_xVhd_RemoveFileOrFolderFromVHD.ps1
rename to source/Examples/Sample_Vhd_RemoveFileOrFolderFromVHD.ps1
index 9046359..6caecee 100644
--- a/source/Examples/Sample_xVhd_RemoveFileOrFolderFromVHD.ps1
+++ b/source/Examples/Sample_Vhd_RemoveFileOrFolderFromVHD.ps1
@@ -1,4 +1,4 @@
-Configuration Sample_xVhd_RemoveFileOrFolderFromVHD
+Configuration Sample_Vhd_RemoveFileOrFolderFromVHD
 {
     param
     (
@@ -12,12 +12,12 @@ Configuration Sample_xVhd_RemoveFileOrFolderFromVHD
         $Ensure = 'Absent'
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
-    xVhdFile RemoveFile
+    VhdFile RemoveFile
     {
         VhdPath       = $vhdPath
-        FileDirectory = MSFT_xFileDirectory
+        FileDirectory = DSC_FileDirectory
         {
             DestinationPath = $relativeDestinationPath
             Ensure          = $Ensure
diff --git a/source/xHyper-V.psd1 b/source/HyperVDsc.psd1
similarity index 92%
rename from source/xHyper-V.psd1
rename to source/HyperVDsc.psd1
index eb40abe..18750cc 100644
--- a/source/xHyper-V.psd1
+++ b/source/HyperVDsc.psd1
@@ -47,10 +47,10 @@
             Tags         = @('DesiredStateConfiguration', 'DSC', 'DSCResourceKit', 'DSCResource')
 
             # A URL to the license for this module.
-            LicenseUri   = 'https://github.com/dsccommunity/xHyper-V/blob/master/LICENSE'
+            LicenseUri   = 'https://github.com/dsccommunity/HyperVDsc/blob/master/LICENSE'
 
             # A URL to the main website for this project.
-            ProjectUri   = 'https://github.com/dsccommunity/xHyper-V'
+            ProjectUri   = 'https://github.com/dsccommunity/HyperVDsc'
 
             # A URL to an icon representing this module.
             IconUri = 'https://dsccommunity.org/images/DSC_Logo_300p.png'
diff --git a/source/Modules/HyperVDsc.Common/HyperVDsc.Common.psd1 b/source/Modules/HyperVDsc.Common/HyperVDsc.Common.psd1
index 83cc2a7..1ad8b7f 100644
--- a/source/Modules/HyperVDsc.Common/HyperVDsc.Common.psd1
+++ b/source/Modules/HyperVDsc.Common/HyperVDsc.Common.psd1
@@ -27,7 +27,7 @@
     Copyright         = 'Copyright the DSC Community contributors. All rights reserved.'
 
     # Description of the functionality provided by this module
-    Description       = 'Functions used by the DSC resources in xHyper-V.'
+    Description       = 'Functions used by the DSC resources in HyperVDsc.'
 
     # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
     FunctionsToExport = @(
diff --git a/source/en-US/about_xHyper-V.help.txt b/source/en-US/about_HyperVDsc.help.txt
similarity index 74%
rename from source/en-US/about_xHyper-V.help.txt
rename to source/en-US/about_HyperVDsc.help.txt
index d0cf781..d0799df 100644
--- a/source/en-US/about_xHyper-V.help.txt
+++ b/source/en-US/about_HyperVDsc.help.txt
@@ -1,5 +1,5 @@
 TOPIC
-    about_xHyper-V
+    about_HyperVDsc
 
 SHORT DESCRIPTION
     DSC resources for deployment and configuration of Microsoft Hyper-V.
@@ -8,7 +8,7 @@ LONG DESCRIPTION
     This module contains DSC resources for deployment and configuration of Microsoft Hyper-V.
 
 EXAMPLES
-    PS C:\> Get-DscResource -Module xHyper-V
+    PS C:\> Get-DscResource -Module HyperVDsc
 
 NOTE:
     Thank you to the DSC Community contributors who contributed to this module by
@@ -16,10 +16,10 @@ NOTE:
 
 TROUBLESHOOTING NOTE:
     Go to the Github repository for read about issues, submit a new issue, and read
-    about new releases. https://github.com/dsccommunity/xHyper-V
+    about new releases. https://github.com/dsccommunity/HyperVDsc
 
 SEE ALSO
-    - https://github.com/dsccommunity/xHyper-V
+    - https://github.com/dsccommunity/HyperVDsc
 
 KEYWORDS
     DSC, DscResource, Hyper-V, HyperV
diff --git a/source/xHyper-V.psm1 b/source/xHyper-V.psm1
deleted file mode 100644
index 81d556e..0000000
--- a/source/xHyper-V.psm1
+++ /dev/null
@@ -1,4 +0,0 @@
-<#
-    This file is intentionally left empty. It is must be left here for the module
-    manifest to refer to. It is recreated during the build process.
-#>
diff --git a/tests/Integration/MSFT_xVMDvdDrive.Integration.Tests.ps1 b/tests/Integration/DSC_VMDvdDrive.Integration.Tests.ps1
similarity index 98%
rename from tests/Integration/MSFT_xVMDvdDrive.Integration.Tests.ps1
rename to tests/Integration/DSC_VMDvdDrive.Integration.Tests.ps1
index 595eda2..f176cf3 100644
--- a/tests/Integration/MSFT_xVMDvdDrive.Integration.Tests.ps1
+++ b/tests/Integration/DSC_VMDvdDrive.Integration.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVMDvdDrive'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_VMDvdDrive'
 
 try
 {
diff --git a/tests/Integration/MSFT_xVMDvdDrive_add.config.ps1 b/tests/Integration/DSC_VMDvdDrive_add.config.ps1
similarity index 69%
rename from tests/Integration/MSFT_xVMDvdDrive_add.config.ps1
rename to tests/Integration/DSC_VMDvdDrive_add.config.ps1
index 9cc5a1d..c3729ee 100644
--- a/tests/Integration/MSFT_xVMDvdDrive_add.config.ps1
+++ b/tests/Integration/DSC_VMDvdDrive_add.config.ps1
@@ -1,9 +1,9 @@
-configuration MSFT_xVMDvdDrive_Add_Config {
+configuration DSC_VMDvdDrive_Add_Config {
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     node localhost {
-        xVMDvdDrive Integration_Test {
+        VMDvdDrive Integration_Test {
             VMName             = $Node.VMName
             ControllerNumber   = $Node.ControllerNumber
             ControllerLocation = $Node.ControllerLocation
diff --git a/tests/Integration/MSFT_xVMDvdDrive_remove.config.ps1 b/tests/Integration/DSC_VMDvdDrive_remove.config.ps1
similarity index 68%
rename from tests/Integration/MSFT_xVMDvdDrive_remove.config.ps1
rename to tests/Integration/DSC_VMDvdDrive_remove.config.ps1
index 0086c60..26f921d 100644
--- a/tests/Integration/MSFT_xVMDvdDrive_remove.config.ps1
+++ b/tests/Integration/DSC_VMDvdDrive_remove.config.ps1
@@ -1,9 +1,9 @@
-configuration MSFT_xVMDvdDrive_Remove_Config {
+configuration DSC_VMDvdDrive_Remove_Config {
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     node localhost {
-        xVMDvdDrive Integration_Test {
+        VMDvdDrive Integration_Test {
             VMName             = $Node.VMName
             ControllerNumber   = $Node.ControllerNumber
             ControllerLocation = $Node.ControllerLocation
diff --git a/tests/Integration/MSFT_xVMHost.Integration.Tests.ps1 b/tests/Integration/DSC_VMHost.Integration.Tests.ps1
similarity index 97%
rename from tests/Integration/MSFT_xVMHost.Integration.Tests.ps1
rename to tests/Integration/DSC_VMHost.Integration.Tests.ps1
index f68c31b..e68b41d 100644
--- a/tests/Integration/MSFT_xVMHost.Integration.Tests.ps1
+++ b/tests/Integration/DSC_VMHost.Integration.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVMHost'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_VMHost'
 
 try
 {
diff --git a/tests/Integration/MSFT_xVMHost_set.config.ps1 b/tests/Integration/DSC_VMHost_set.config.ps1
similarity index 82%
rename from tests/Integration/MSFT_xVMHost_set.config.ps1
rename to tests/Integration/DSC_VMHost_set.config.ps1
index b94392b..e4d3fae 100644
--- a/tests/Integration/MSFT_xVMHost_set.config.ps1
+++ b/tests/Integration/DSC_VMHost_set.config.ps1
@@ -1,4 +1,4 @@
-configuration MSFT_xVMHost_Set_Config
+configuration DSC_VMHost_Set_Config
 {
     param
     (
@@ -15,10 +15,10 @@ configuration MSFT_xVMHost_Set_Config
         $EnableEnhancedSessionMode
     )
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'xHyperV'
 
     node localhost {
-        xVMHost Integration_Test {
+        VMHost Integration_Test {
             IsSingleInstance          = 'Yes'
             VirtualHardDiskPath       = $VirtualHardDiskPath
             VirtualMachinePath        = $VirtualMachinePath
diff --git a/tests/Integration/MSFT_xVMProcessor.Integration.Tests.ps1 b/tests/Integration/DSC_VMProcessor.Integration.Tests.ps1
similarity index 97%
rename from tests/Integration/MSFT_xVMProcessor.Integration.Tests.ps1
rename to tests/Integration/DSC_VMProcessor.Integration.Tests.ps1
index 2fe3a3a..d179a06 100644
--- a/tests/Integration/MSFT_xVMProcessor.Integration.Tests.ps1
+++ b/tests/Integration/DSC_VMProcessor.Integration.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVMProcessor'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_VMProcessor'
 
 try
 {
diff --git a/tests/Integration/MSFT_xVMProcessor_set.config.ps1 b/tests/Integration/DSC_VMProcessor_set.config.ps1
similarity index 79%
rename from tests/Integration/MSFT_xVMProcessor_set.config.ps1
rename to tests/Integration/DSC_VMProcessor_set.config.ps1
index 16ffdf5..12c269b 100644
--- a/tests/Integration/MSFT_xVMProcessor_set.config.ps1
+++ b/tests/Integration/DSC_VMProcessor_set.config.ps1
@@ -1,6 +1,6 @@
-configuration MSFT_xVMProcessor_Set_Config {
+configuration DSC_VMProcessor_Set_Config {
 
-    Import-DscResource -ModuleName 'xHyper-V'
+    Import-DscResource -ModuleName 'HyperVDsc'
 
     node localhost {
         xVMProcessor Integration_Test {
diff --git a/tests/Unit/MSFT_xVHD.Tests.ps1 b/tests/Unit/DSC_VHD.Tests.ps1
similarity index 97%
rename from tests/Unit/MSFT_xVHD.Tests.ps1
rename to tests/Unit/DSC_VHD.Tests.ps1
index 3a276b2..3b28e57 100644
--- a/tests/Unit/MSFT_xVHD.Tests.ps1
+++ b/tests/Unit/DSC_VHD.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVhd'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_Vhd'
 
 function Invoke-TestSetup
 {
@@ -32,7 +32,7 @@ Invoke-TestSetup
 try
 {
     InModuleScope $script:dscResourceName {
-        Describe 'MSFT_xVHD\Get-TargetResource' {
+        Describe 'DSC_Vhd\Get-TargetResource' {
             Context 'Should stop when Hyper-V module is missing' {
                 Mock -CommandName Get-Module -ParameterFilter { ($Name -eq 'Hyper-V') -and ($ListAvailable -eq $true) } -MockWith {
                     return $false
@@ -76,7 +76,7 @@ try
             }
         }
 
-        Describe 'MSFT_xVHD\GetNameWithExtension' {
+        Describe 'DSC_Vhd\GetNameWithExtension' {
             Context 'Name does not have extension' {
                 It 'Should return server.vhdx with generation vhdx' {
                     GetNameWithExtension -Name 'server' -Generation 'vhdx' |
@@ -107,7 +107,7 @@ try
             }
         }
 
-        Describe 'MSFT_xVHD\Test-TargetResource' {
+        Describe 'DSC_Vhd\Test-TargetResource' {
             # Create an empty function to be able to mock the missing Hyper-V cmdlet
             function Test-VHD
             {
@@ -212,7 +212,7 @@ try
             }
         }
 
-        Describe 'MSFT_xVHD\Set-TargetResource' {
+        Describe 'DSC_Vhd\Set-TargetResource' {
             Context 'Ensure is Absent' {
                 Mock -CommandName Test-Path -MockWith { $true }
                 Mock -CommandName Remove-Item
diff --git a/tests/Unit/MSFT_xVMDvdDrive.Tests.ps1 b/tests/Unit/DSC_VMDvdDrive.Tests.ps1
similarity index 98%
rename from tests/Unit/MSFT_xVMDvdDrive.Tests.ps1
rename to tests/Unit/DSC_VMDvdDrive.Tests.ps1
index a6be1a2..ecb892f 100644
--- a/tests/Unit/MSFT_xVMDvdDrive.Tests.ps1
+++ b/tests/Unit/DSC_VMDvdDrive.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVMDvdDrive'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_VMDvdDrive'
 
 function Invoke-TestSetup
 {
@@ -101,7 +101,7 @@ try
         #endregion
 
         #region function Get-TargetResource
-        Describe 'MSFT_xVMDvdDrive\Get-TargetResource' {
+        Describe 'DSC_VMDvdDrive\Get-TargetResource' {
             Context 'DVD Drive does not exist' {
                 # Verifiable (should be called) mocks
                 Mock `
@@ -207,7 +207,7 @@ try
         #endregion
 
         #region function Set-TargetResource
-        Describe 'MSFT_xVMDvdDrive\Set-TargetResource' {
+        Describe 'DSC_VMDvdDrive\Set-TargetResource' {
             Context 'DVD Drive does not exist but should' {
                 # Verifiable (should be called) mocks
                 Mock `
@@ -351,7 +351,7 @@ try
         #endregion
 
         #region function Test-TargetResource
-        Describe 'MSFT_xVMDvdDrive\Test-TargetResource' {
+        Describe 'DSC_VMDvdDrive\Test-TargetResource' {
             Context 'DVD Drive does not exist but should' {
                 # Verifiable (should be called) mocks
                 Mock `
@@ -440,7 +440,7 @@ try
         #endregion
 
         #region function Test-ParameterValid
-        Describe 'MSFT_xVMDvdDrive\Test-ParameterValid' {
+        Describe 'DSC_VMDvdDrive\Test-ParameterValid' {
             Context 'Hyper-V Module is not available' {
                 # Verifiable (should be called) mocks
                 Mock `
diff --git a/tests/Unit/MSFT_xVMHardDiskDrive.Tests.ps1 b/tests/Unit/DSC_VMHardDiskDrive.Tests.ps1
similarity index 97%
rename from tests/Unit/MSFT_xVMHardDiskDrive.Tests.ps1
rename to tests/Unit/DSC_VMHardDiskDrive.Tests.ps1
index 1eaea79..60ae4cc 100644
--- a/tests/Unit/MSFT_xVMHardDiskDrive.Tests.ps1
+++ b/tests/Unit/DSC_VMHardDiskDrive.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVMHardDiskDrive'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_VMHardDiskDrive'
 
 function Invoke-TestSetup
 {
@@ -36,7 +36,7 @@ try
         $testVMName = 'UnitTestVM'
         $testHardDiskPath = 'TestDrive:\{0}.vhdx' -f $testVMName
 
-        Describe 'MSFT_xVMHardDiskDrive\Get-TargetResource' {
+        Describe 'DSC_VMHardDiskDrive\Get-TargetResource' {
 
             $stubHardDiskDrive = [PSCustomObject] @{
                 VMName             = $testVMName
@@ -83,7 +83,7 @@ try
             }
         } # descrive Get-TargetResource
 
-        Describe 'MSFT_xVMHardDiskDrive\Test-TargetResource' {
+        Describe 'DSC_VMHardDiskDrive\Test-TargetResource' {
 
             # Guard mocks
             Mock -CommandName Assert-Module
@@ -208,7 +208,7 @@ try
             }
         } # describe Test-TargetResource
 
-        Describe 'MSFT_xVMHardDiskDrive\Set-TargetResource' {
+        Describe 'DSC_VMHardDiskDrive\Set-TargetResource' {
             # Guard mocks
             Mock -CommandName Assert-Module
             Mock -CommandName Get-VMHardDiskDrive
diff --git a/tests/Unit/MSFT_xVMHost.Tests.ps1 b/tests/Unit/DSC_VMHost.Tests.ps1
similarity index 98%
rename from tests/Unit/MSFT_xVMHost.Tests.ps1
rename to tests/Unit/DSC_VMHost.Tests.ps1
index 2191aa5..a53fef9 100644
--- a/tests/Unit/MSFT_xVMHost.Tests.ps1
+++ b/tests/Unit/DSC_VMHost.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVMHost'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_VMHost'
 
 function Invoke-TestSetup
 {
@@ -35,7 +35,7 @@ try
 
         $testVMName = 'UnitTestVM'
 
-        Describe 'MSFT_xVMHost\Get-TargetResource' {
+        Describe 'DSC_VMHost\Get-TargetResource' {
             $fakeVMHost = @{
                 ResourceMeteringSaveInterval = 60
             }
@@ -60,7 +60,7 @@ try
 
         } # describe Get-TargetResource
 
-        Describe 'MSFT_xVMHost\Test-TargetResource' {
+        Describe 'DSC_VMHost\Test-TargetResource' {
 
             # Guard mocks
             Mock -CommandName Assert-Module
@@ -249,7 +249,7 @@ try
 
         } # describe Test-TargetResource
 
-        Describe 'MSFT_xVMHost\Set-TargetResource' {
+        Describe 'DSC_VMHost\Set-TargetResource' {
             # Guard mocks
             Mock -CommandName Assert-Module
             Mock -CommandName Get-VMHost
diff --git a/tests/Unit/MSFT_xVMHyperV.Tests.ps1 b/tests/Unit/DSC_VMHyperV.Tests.ps1
similarity index 99%
rename from tests/Unit/MSFT_xVMHyperV.Tests.ps1
rename to tests/Unit/DSC_VMHyperV.Tests.ps1
index 13c06bf..13097b0 100644
--- a/tests/Unit/MSFT_xVMHyperV.Tests.ps1
+++ b/tests/Unit/DSC_VMHyperV.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVMHyperV'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_VMHyperV'
 
 function Invoke-TestSetup
 {
diff --git a/tests/Unit/MSFT_xVMNetworkAdapter.Tests.ps1 b/tests/Unit/DSC_VMNetworkAdapter.Tests.ps1
similarity index 96%
rename from tests/Unit/MSFT_xVMNetworkAdapter.Tests.ps1
rename to tests/Unit/DSC_VMNetworkAdapter.Tests.ps1
index c21cf58..c571a4a 100644
--- a/tests/Unit/MSFT_xVMNetworkAdapter.Tests.ps1
+++ b/tests/Unit/DSC_VMNetworkAdapter.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVMNetworkAdapter'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_VMNetworkAdapter'
 
 function Invoke-TestSetup
 {
@@ -45,7 +45,7 @@ try
             Subnet    = "255.255.255.0"
         }
 
-        $networkSettingsStatic = New-CimInstance -ClassName xNetworkSettings -Property $properties -Namespace root/microsoft/windows/desiredstateconfiguration -ClientOnly
+        $networkSettingsStatic = New-CimInstance -ClassName NetworkSettings -Property $properties -Namespace root/microsoft/windows/desiredstateconfiguration -ClientOnly
 
         $TestAdapter = [PSObject]@{
             Id         = $MockHostAdapter.Id
@@ -70,7 +70,7 @@ try
             AccessVlanId  = '1'
         }
 
-        Describe 'MSFT_xVMNetworkAdapter\Get-TargetResource' {
+        Describe 'DSC_VMNetworkAdapter\Get-TargetResource' {
             Context 'NetAdapter does not exist' {
                 Mock -CommandName Get-VMNetworkAdapter
                 Mock -CommandName Get-VMNetworkAdapterVlan
@@ -152,7 +152,7 @@ try
             }
         }
 
-        Describe 'MSFT_xVMNetworkAdapter\Set-TargetResource' {
+        Describe 'DSC_VMNetworkAdapter\Set-TargetResource' {
             $newAdapter = [PSObject]@{
                 Id             = 'UniqueString'
                 Name           = $TestAdapter.Name
@@ -211,7 +211,7 @@ try
             }
         }
 
-        Describe 'MSFT_xVMNetworkAdapter\Test-TargetResource' {
+        Describe 'DSC_VMNetworkAdapter\Test-TargetResource' {
             $newAdapter = [PSObject]@{
                 Id         = 'UniqueString'
                 Name       = $TestAdapter.Name
diff --git a/tests/Unit/MSFT_xVMProcessor.Tests.ps1 b/tests/Unit/DSC_VMProcessor.Tests.ps1
similarity index 97%
rename from tests/Unit/MSFT_xVMProcessor.Tests.ps1
rename to tests/Unit/DSC_VMProcessor.Tests.ps1
index 44834f8..f261477 100644
--- a/tests/Unit/MSFT_xVMProcessor.Tests.ps1
+++ b/tests/Unit/DSC_VMProcessor.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVMProcessor'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_VMProcessor'
 
 function Invoke-TestSetup
 {
@@ -36,7 +36,7 @@ try
         $testVMName = 'UnitTestVM'
         $testResourcePoolName = 'Unit Test Resource Pool'
 
-        Describe 'MSFT_xVMProcessor\Get-TargetResource' {
+        Describe 'DSC_VMProcessor\Get-TargetResource' {
 
             $fakeVMProcessor = @{
                 EnableHostResourceProtection = $true
@@ -69,7 +69,7 @@ try
             }
         } # descrive Get-TargetResource
 
-        Describe 'MSFT_xVMProcessor\Test-TargetResource' {
+        Describe 'DSC_VMProcessor\Test-TargetResource' {
 
             # Guard mocks
             Mock -CommandName Assert-Module
@@ -169,7 +169,7 @@ try
             }
         } # describe Test-TargetResource
 
-        Describe 'MSFT_xVMProcessor\Set-TargetResource' {
+        Describe 'DSC_VMProcessor\Set-TargetResource' {
             # Guard mocks
             Mock -CommandName Assert-Module
             Mock -CommandName Assert-TargetResourceParameter
@@ -260,7 +260,7 @@ try
             }
         } # describe Set-TargetResource
 
-        Describe 'MSFT_xVMProcessor\Assert-TargetResourceParameter' {
+        Describe 'DSC_VMProcessor\Assert-TargetResourceParameter' {
 
             # Return Windows Server 2012 R2/Windows 8.1 Update 1
             Mock -CommandName Get-CimInstance { return @{ BuildNumber = '9600' } }
diff --git a/tests/Unit/MSFT_xVMScsiController.Tests.ps1 b/tests/Unit/DSC_VMScsiController.Tests.ps1
similarity index 98%
rename from tests/Unit/MSFT_xVMScsiController.Tests.ps1
rename to tests/Unit/DSC_VMScsiController.Tests.ps1
index 1b8d1e7..7b455b5 100644
--- a/tests/Unit/MSFT_xVMScsiController.Tests.ps1
+++ b/tests/Unit/DSC_VMScsiController.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVMScsiController'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_VMScsiController'
 
 function Invoke-TestSetup
 {
@@ -35,7 +35,7 @@ try
 
         $testVMName = 'UnitTestVM'
 
-        Describe 'MSFT_xVMScsiController\Get-TargetResource' {
+        Describe 'DSC_VMScsiController\Get-TargetResource' {
 
             $stubScsiController = @{
                 VMName           = $testVMName
@@ -79,7 +79,7 @@ try
             }
         } # describe Get-TargetResource
 
-        Describe 'MSFT_xVMScsiController\Test-TargetResource' {
+        Describe 'DSC_VMScsiController\Test-TargetResource' {
 
             # Guard mocks
             Mock -CommandName Assert-Module
@@ -129,7 +129,7 @@ try
             }
         } # describe Test-TargetResource
 
-        Describe 'MSFT_xVMScsiController\Set-TargetResource' {
+        Describe 'DSC_VMScsiController\Set-TargetResource' {
             # Guard mocks
             Mock -CommandName Assert-Module
             Mock -CommandName Get-VMScsiController
diff --git a/tests/Unit/MSFT_xVMSwitch_BandwidthReservationMode.Tests.ps1 b/tests/Unit/DSC_VMSwitch_BandwidthReservationMode.Tests.ps1
similarity index 99%
rename from tests/Unit/MSFT_xVMSwitch_BandwidthReservationMode.Tests.ps1
rename to tests/Unit/DSC_VMSwitch_BandwidthReservationMode.Tests.ps1
index 0e2921d..95aee4a 100644
--- a/tests/Unit/MSFT_xVMSwitch_BandwidthReservationMode.Tests.ps1
+++ b/tests/Unit/DSC_VMSwitch_BandwidthReservationMode.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVMSwitch'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_VMSwitch'
 
 function Invoke-TestSetup
 {
diff --git a/tests/Unit/MSFT_xVMSwitch_EnableEmbeddedTeaming.Tests.ps1 b/tests/Unit/DSC_VMSwitch_EnableEmbeddedTeaming.Tests.ps1
similarity index 99%
rename from tests/Unit/MSFT_xVMSwitch_EnableEmbeddedTeaming.Tests.ps1
rename to tests/Unit/DSC_VMSwitch_EnableEmbeddedTeaming.Tests.ps1
index cca3d1d..c691353 100644
--- a/tests/Unit/MSFT_xVMSwitch_EnableEmbeddedTeaming.Tests.ps1
+++ b/tests/Unit/DSC_VMSwitch_EnableEmbeddedTeaming.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVMSwitch'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_VMSwitch'
 
 function Invoke-TestSetup
 {
@@ -75,7 +75,7 @@ try
             return $mockedVMSwitch
         }
 
-        Describe "MSFT_xVMSwitch" {
+        Describe "DSC_VMSwitch" {
             <#
                 Mocks Get-VMSwitch and will return $script:mockedVMSwitch which is
                 a variable that is created during most It statements to mock a VMSwitch
diff --git a/tests/Unit/MSFT_xVMSwitch_Id.Tests.ps1 b/tests/Unit/DSC_VMSwitch_Id.Tests.ps1
similarity index 98%
rename from tests/Unit/MSFT_xVMSwitch_Id.Tests.ps1
rename to tests/Unit/DSC_VMSwitch_Id.Tests.ps1
index 806d6bd..f63b968 100644
--- a/tests/Unit/MSFT_xVMSwitch_Id.Tests.ps1
+++ b/tests/Unit/DSC_VMSwitch_Id.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVMSwitch'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_VMSwitch'
 
 function Invoke-TestSetup
 {
@@ -158,7 +158,7 @@ try
             }
         }
 
-        Describe 'MSFT_xVMSwitch\Get-TargetResource' -Tag 'Get' {
+        Describe 'DSC_VMSwitch\Get-TargetResource' -Tag 'Get' {
 
             Context 'When the system is in the desired state (VMSwitch has the desired Id)' {
                 $script:MockedVMSwitch = New-MockedVMSwitch -Name 'TestSwitch'
@@ -182,7 +182,7 @@ try
             }
         }
 
-        Describe 'MSFT_xVMSwitch\Set-TargetResource' -Tag 'Set' {
+        Describe 'DSC_VMSwitch\Set-TargetResource' -Tag 'Set' {
 
             Context 'When the system is in the desired state (VMSwitch has the desired Id)' {
                 $desiredVMSwitchID = New-Guid
@@ -276,7 +276,7 @@ try
             }
         }
 
-        Describe 'MSFT_xVMSwitch\Test-TargetResource' -Tag 'Test' {
+        Describe 'DSC_VMSwitch\Test-TargetResource' -Tag 'Test' {
             Context 'When the system is in the desired state (VMSwitch has the desired Id)' {
 
                 $desiredVMSwitchID = New-Guid
diff --git a/tests/Unit/MSFT_xVhdFileDirectory.Tests.ps1 b/tests/Unit/DSC_VhdFileDirectory.Tests.ps1
similarity index 97%
rename from tests/Unit/MSFT_xVhdFileDirectory.Tests.ps1
rename to tests/Unit/DSC_VhdFileDirectory.Tests.ps1
index 7b448bb..41a9a66 100644
--- a/tests/Unit/MSFT_xVhdFileDirectory.Tests.ps1
+++ b/tests/Unit/DSC_VhdFileDirectory.Tests.ps1
@@ -1,5 +1,5 @@
-$script:dscModuleName = 'xHyper-V'
-$script:dscResourceName = 'MSFT_xVhdFileDirectory'
+$script:dscModuleName = 'HyperVDsc'
+$script:dscResourceName = 'DSC_VhdFileDirectory'
 
 function Invoke-TestSetup
 {
@@ -95,7 +95,7 @@ $script:vhdDriveLetter = Get-FreeDriveLetter
 # function Get-Partition {}
 # function Get-Volume {}
 
-$script:dscFileDirClassName = 'MSFT_FileDirectoryConfiguration'
+$script:dscFileDirClassName = 'DSC_FileDirectoryConfiguration'
 $script:dscNamespace = 'root/microsoft/windows/desiredstateconfiguration'
 
 Mock -CommandName Mount-Vhd { [PSCustomObject] @{ Path = 'TestDrive:\VhdExists.vhdx' } }
@@ -107,13 +107,13 @@ Mock -CommandName Get-Disk {
 }
 
 Mock -CommandName Get-Partition {
-    New-CimInstance -ClassName MSFT_Partitions -Namespace ROOT/Microsoft/Windows/Storage -ClientOnly |
+    New-CimInstance -ClassName DSC_Partitions -Namespace ROOT/Microsoft/Windows/Storage -ClientOnly |
         Add-Member -MemberType NoteProperty -Name Type -Value 'Mocked' -Force -PassThru |
             Add-Member -MemberType NoteProperty -Name DriveLetter -Value $script:vhdDriveLetter -PassThru
 }
 
 Mock -CommandName Get-Volume {
-    New-CimInstance -ClassName MSFT_Volumes -Namespace ROOT/Microsoft/Windows/Storage -ClientOnly |
+    New-CimInstance -ClassName DSC_Volumes -Namespace ROOT/Microsoft/Windows/Storage -ClientOnly |
         Add-Member -MemberType NoteProperty -Name DriveLetter -Value $script:vhdDriveLetter -PassThru
 }
 
@@ -123,7 +123,7 @@ Mock -CommandName Get-Module {
 
 #endregion
 
-Describe 'MSFT_xVhdFileDirectory\Get-TargetResource' -Tag 'Get' {
+Describe 'DSC_VhdFileDirectory\Get-TargetResource' -Tag 'Get' {
 
     BeforeAll {
         New-TestDriveLayout -DriveLetter $script:vhdDriveLetter
@@ -141,7 +141,7 @@ Describe 'MSFT_xVhdFileDirectory\Get-TargetResource' -Tag 'Get' {
             Ensure          = 'Present'
         }
 
-        $fileDirectory = New-CimInstance -Property $fdProperties -ClassName $script:dscFileDirClassName -Namespace $script:dscNamespace  -ClientOnly
+        $fileDirectory = New-CimInstance -Property $fdProperties -ClassName $script:dscFileDirClassName -Namespace $script:dscNamespace -ClientOnly
         $result = Get-TargetResource -VhdPath TestDrive:\VhdExists.vhdx -FileDirectory $fileDirectory
 
         $result -is [System.Collections.Hashtable] |
@@ -272,7 +272,7 @@ Describe 'MSFT_xVhdFileDirectory\Get-TargetResource' -Tag 'Get' {
     }
 }
 
-Describe "MSFT_xVhdFileDirectory\Test-TargetResource" -Tag 'Test' {
+Describe "DSC_VhdFileDirectory\Test-TargetResource" -Tag 'Test' {
 
     BeforeAll {
         New-TestDriveLayout -DriveLetter $script:vhdDriveLetter
@@ -415,7 +415,7 @@ Describe "MSFT_xVhdFileDirectory\Test-TargetResource" -Tag 'Test' {
     }
 }
 
-Describe "MSFT_xVhdFileDirectory\Set-TargetResource" -Tag 'Set' {
+Describe "DSC_VhdFileDirectory\Set-TargetResource" -Tag 'Set' {
     BeforeAll {
         New-TestDriveLayout -DriveLetter $script:vhdDriveLetter
     }