From ea0f5e4050c0a04e2c1fb93e3fb648e46a84c437 Mon Sep 17 00:00:00 2001
From: Daniel Scott-Raynsford <plagueho@gmail.com>
Date: Sun, 24 Dec 2017 08:59:34 +1300
Subject: [PATCH 1/8] Prepared conversion to AdcsDeploymentDsc

---
 .github/ISSUE_TEMPLATE.md                     |  2 +-
 .github/PULL_REQUEST_TEMPLATE.md              |  4 +-
 ...sDeployment.psd1 => AdcsDeploymentDsc.psd1 |  8 +--
 .../MSFT_AdcsCertificationAuthority.psm1}     | 14 ++--
 ...SFT_AdcsCertificationAuthority.schema.mof} |  4 +-
 ...T_AdcsCertificationAuthority.strings.psd1} |  2 +-
 .../MSFT_AdcsOnlineResponder.psm1}            |  2 +-
 .../MSFT_AdcsOnlineResponder.schema.mof}      | 14 ++--
 .../MSFT_AdcsOnlineResponder.strings.psd1}    |  2 +-
 .../MSFT_AdcsWebEnrollment.psm1}              |  2 +-
 .../MSFT_AdcsWebEnrollment.schema.mof}        |  4 +-
 .../MSFT_AdcsWebEnrollment.strings.psd1}      |  2 +-
 .../1-InstallCertificationAthority.ps1        | 38 ++++++++++
 .../2-RetireCertificationAthority.ps1         | 46 ++++++++++++
 .../1-InstallOnlineResponder.ps1              | 39 ++++++++++
 .../1-InstallWebEnrollment.ps1                | 39 ++++++++++
 .../1-InstallCertificationAthority.ps1        |  4 +-
 .../2-RetireCertificationAthority.ps1         |  6 +-
 .../1-InstallOnlineResponder.ps1              |  4 +-
 .../1-InstallWebEnrollment.ps1                |  4 +-
 README.md                                     | 72 ++++++++++---------
 ...MSFT_AdcsCertificationAuthority.Tests.ps1} |  4 +-
 ...sCertificationAuthority_Install.config.ps1 | 11 +++
 ...ertificationAuthority_Uninstall.config.ps1 | 11 +++
 ...sCertificationAuthority_Install.config.ps1 | 11 ---
 ...ertificationAuthority_Uninstall.config.ps1 | 11 ---
 ...MSFT_AdcsCertificationAuthority.Tests.ps1} |  6 +-
 ...ps1 => MSFT_AdcsOnlineResponder.Tests.ps1} |  6 +-
 ...s.ps1 => MSFT_AdcsWebEnrollment.Tests.ps1} |  6 +-
 29 files changed, 271 insertions(+), 107 deletions(-)
 rename xAdcsDeployment.psd1 => AdcsDeploymentDsc.psd1 (84%)
 rename DSCResources/{MSFT_xAdcsCertificationAuthority/MSFT_xAdcsCertificationAuthority.psm1 => MSFT_AdcsCertificationAuthority/MSFT_AdcsCertificationAuthority.psm1} (99%)
 rename DSCResources/{MSFT_xAdcsCertificationAuthority/MSFT_xAdcsCertificationAuthority.schema.mof => MSFT_AdcsCertificationAuthority/MSFT_AdcsCertificationAuthority.schema.mof} (96%)
 rename DSCResources/{MSFT_xAdcsCertificationAuthority/en-us/MSFT_xAdcsCertificationAuthority.strings.psd1 => MSFT_AdcsCertificationAuthority/en-us/MSFT_AdcsCertificationAuthority.strings.psd1} (92%)
 rename DSCResources/{MSFT_xAdcsOnlineResponder/MSFT_xAdcsOnlineResponder.psm1 => MSFT_AdcsOnlineResponder/MSFT_AdcsOnlineResponder.psm1} (99%)
 rename DSCResources/{MSFT_xAdcsOnlineResponder/MSFT_xAdcsOnlineResponder.schema.mof => MSFT_AdcsOnlineResponder/MSFT_AdcsOnlineResponder.schema.mof} (85%)
 rename DSCResources/{MSFT_xAdcsOnlineResponder/en-us/MSFT_xAdcsOnlineResponder.strings.psd1 => MSFT_AdcsOnlineResponder/en-us/MSFT_AdcsOnlineResponder.strings.psd1} (94%)
 rename DSCResources/{MSFT_xAdcsWebEnrollment/MSFT_xAdcsWebEnrollment.psm1 => MSFT_AdcsWebEnrollment/MSFT_AdcsWebEnrollment.psm1} (99%)
 rename DSCResources/{MSFT_xAdcsWebEnrollment/MSFT_xAdcsWebEnrollment.schema.mof => MSFT_AdcsWebEnrollment/MSFT_AdcsWebEnrollment.schema.mof} (88%)
 rename DSCResources/{MSFT_xAdcsWebEnrollment/en-us/MSFT_xAdcsWebEnrollment.strings.psd1 => MSFT_AdcsWebEnrollment/en-us/MSFT_AdcsWebEnrollment.strings.psd1} (94%)
 create mode 100644 Examples/Resources/AdcsCertificationAuthority/1-InstallCertificationAthority.ps1
 create mode 100644 Examples/Resources/AdcsCertificationAuthority/2-RetireCertificationAthority.ps1
 create mode 100644 Examples/Resources/AdcsOnlineResponder/1-InstallOnlineResponder.ps1
 create mode 100644 Examples/Resources/AdcsWebEnrollment/1-InstallWebEnrollment.ps1
 rename Tests/Integration/{MSFT_xAdcsCertificationAuthority.Tests.ps1 => MSFT_AdcsCertificationAuthority.Tests.ps1} (98%)
 create mode 100644 Tests/Integration/MSFT_AdcsCertificationAuthority_Install.config.ps1
 create mode 100644 Tests/Integration/MSFT_AdcsCertificationAuthority_Uninstall.config.ps1
 delete mode 100644 Tests/Integration/MSFT_xAdcsCertificationAuthority_Install.config.ps1
 delete mode 100644 Tests/Integration/MSFT_xAdcsCertificationAuthority_Uninstall.config.ps1
 rename Tests/Unit/{MSFT_xAdcsCertificationAuthority.Tests.ps1 => MSFT_AdcsCertificationAuthority.Tests.ps1} (98%)
 rename Tests/Unit/{MSFT_xAdcsOnlineResponder.Tests.ps1 => MSFT_AdcsOnlineResponder.Tests.ps1} (98%)
 rename Tests/Unit/{MSFT_xAdcsWebEnrollment.Tests.ps1 => MSFT_AdcsWebEnrollment.Tests.ps1} (98%)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 1b25b6a..ec6b29c 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!--
 Your feedback and support is greatly appreciated, thanks for contributing!
 
-Please prefix the issue title with the resource name, i.e. 'xAdcsCertificateAuthority: Short description of my issue'
+Please prefix the issue title with the resource name, i.e. 'AdcsCertificateAuthority: Short description of my issue'
 Please provide the following information regarding your issue (place N/A if the fields that don't apply to your issue):
 -->
 **Details of the scenario you tried and the problem that is occurring:**
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d64a802..afa68be 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,8 @@
 <!--
 Thanks for submitting a Pull Request (PR) to this project. Your contribution to this project is greatly appreciated!
 
-Please prefix the PR title with the resource name, i.e. 'xAdcsCertificateAuthority: My short description'
-If this is a breaking change, then also prefix the PR title with 'BREAKING CHANGE:', i.e. 'BREAKING CHANGE: xAdcsCertificateAuthority: My short description'
+Please prefix the PR title with the resource name, i.e. 'AdcsCertificateAuthority: My short description'
+If this is a breaking change, then also prefix the PR title with 'BREAKING CHANGE:', i.e. 'BREAKING CHANGE: AdcsCertificateAuthority: My short description'
 
 To aid community reviewers in reviewing and merging your PR, please take the time to run through the below checklist.
 Change to [x] for each task in the task list that applies to this PR.
diff --git a/xAdcsDeployment.psd1 b/AdcsDeploymentDsc.psd1
similarity index 84%
rename from xAdcsDeployment.psd1
rename to AdcsDeploymentDsc.psd1
index a58a0f3..19d5456 100644
--- a/xAdcsDeployment.psd1
+++ b/AdcsDeploymentDsc.psd1
@@ -38,17 +38,17 @@
             Tags         = @('DesiredStateConfiguration', 'DSC', 'DSCResourceKit', 'DSCResource')
 
             # A URL to the license for this module.
-            LicenseUri   = 'https://github.com/PowerShell/xAdcsDeployment/blob/master/LICENSE'
+            LicenseUri   = 'https://github.com/PowerShell/AdcsDeploymentDsc/blob/master/LICENSE'
 
             # A URL to the main website for this project.
-            ProjectUri   = 'https://github.com/PowerShell/xAdcsDeployment'
+            ProjectUri   = 'https://github.com/PowerShell/AdcsDeploymentDsc'
 
             # A URL to an icon representing this module.
             # IconUri = ''
 
             # ReleaseNotes of this module
-        ReleaseNotes = '- xAdcsCertificateAuthority: CertFilePassword invalid type - fixes
-  [issue 36](https://github.com/PowerShell/xAdcsDeployment/issues/36)
+        ReleaseNotes = '- AdcsCertificateAuthority: CertFilePassword invalid type - fixes
+  [issue 36](https://github.com/PowerShell/AdcsDeploymentDsc/issues/36)
 
 '
         } # End of PSData hashtable
diff --git a/DSCResources/MSFT_xAdcsCertificationAuthority/MSFT_xAdcsCertificationAuthority.psm1 b/DSCResources/MSFT_AdcsCertificationAuthority/MSFT_AdcsCertificationAuthority.psm1
similarity index 99%
rename from DSCResources/MSFT_xAdcsCertificationAuthority/MSFT_xAdcsCertificationAuthority.psm1
rename to DSCResources/MSFT_AdcsCertificationAuthority/MSFT_AdcsCertificationAuthority.psm1
index 085c70d..0797ddb 100644
--- a/DSCResources/MSFT_xAdcsCertificationAuthority/MSFT_xAdcsCertificationAuthority.psm1
+++ b/DSCResources/MSFT_AdcsCertificationAuthority/MSFT_AdcsCertificationAuthority.psm1
@@ -7,7 +7,7 @@ Import-Module -Name (Join-Path -Path $modulePath `
 
 # Import Localization Strings.
 $LocalizedData = Get-LocalizedData `
-    -ResourceName 'MSFT_xAdcsCertificationAuthority' `
+    -ResourceName 'MSFT_AdcsCertificationAuthority' `
     -ResourcePath (Split-Path -Parent $script:MyInvocation.MyCommand.Path)
 
 <#
@@ -201,12 +201,12 @@ Function Get-TargetResource
     $null = $adcsParameters.Remove('Ensure')
     $null = $adcsParameters.Remove('Debug')
     $null = $adcsParameters.Remove('ErrorAction')
-    
+
     if ($CertFilePassword)
     {
         $adcsParameters['CertFilePassword'] = $CertFilePassword.Password
     }
-    
+
     try
     {
         $null = Install-AdcsCertificationAuthority @adcsParameters -WhatIf
@@ -421,12 +421,12 @@ Function Set-TargetResource
     $null = $adcsParameters.Remove('ErrorAction')
 
     $errorMessage = ''
-    
+
     if ($CertFilePassword)
     {
         $adcsParameters['CertFilePassword'] = $CertFilePassword.Password
     }
-    
+
     switch ($Ensure)
     {
         'Present'
@@ -647,12 +647,12 @@ Function Test-TargetResource
     $null = $adcsParameters.Remove('Ensure')
     $null = $adcsParameters.Remove('Debug')
     $null = $adcsParameters.Remove('ErrorAction')
-    
+
     if ($CertFilePassword)
     {
         $adcsParameters['CertFilePassword'] = $CertFilePassword.Password
     }
-    
+
     try
     {
         $null = Install-AdcsCertificationAuthority @adcsParameters -WhatIf
diff --git a/DSCResources/MSFT_xAdcsCertificationAuthority/MSFT_xAdcsCertificationAuthority.schema.mof b/DSCResources/MSFT_AdcsCertificationAuthority/MSFT_AdcsCertificationAuthority.schema.mof
similarity index 96%
rename from DSCResources/MSFT_xAdcsCertificationAuthority/MSFT_xAdcsCertificationAuthority.schema.mof
rename to DSCResources/MSFT_AdcsCertificationAuthority/MSFT_AdcsCertificationAuthority.schema.mof
index 3dc6cea..f91f58a 100644
--- a/DSCResources/MSFT_xAdcsCertificationAuthority/MSFT_xAdcsCertificationAuthority.schema.mof
+++ b/DSCResources/MSFT_AdcsCertificationAuthority/MSFT_AdcsCertificationAuthority.schema.mof
@@ -1,5 +1,5 @@
-[ClassVersion("0.1.0.0"), FriendlyName("xAdcsCertificationAuthority")]
-class MSFT_xAdcsCertificationAuthority : OMI_BaseResource
+[ClassVersion("0.1.0.0"), FriendlyName("AdcsCertificationAuthority")]
+class MSFT_AdcsCertificationAuthority : OMI_BaseResource
 {
     [key, Description("Specifies the type of certification authority to install. The possible values are EnterpriseRootCA, EnterpriseSubordinateCA, StandaloneRootCA, or StandaloneSubordinateCA."), ValueMap{"EnterpriseRootCA","EnterpriseSubordinateCA","StandaloneRootCA","StandaloneSubordinateCA"}, Values{"EnterpriseRootCA","EnterpriseSubordinateCA","StandaloneRootCA","StandaloneSubordinateCA"}] String CAType;
     [Required, Description("To install an enterprise certification authority, the computer must be joined to an Active Directory Domain Services domain and a user account that is a member of the Enterprise Admin group is required. To install a standalone certification authority, the computer can be in a workgroup or AD DS domain. If the computer is in a workgroup, a user account that is a member of Administrators is required. If the computer is in an AD DS domain, a user account that is a member of Domain Admins is required."), EmbeddedInstance("MSFT_Credential")] String Credential;
diff --git a/DSCResources/MSFT_xAdcsCertificationAuthority/en-us/MSFT_xAdcsCertificationAuthority.strings.psd1 b/DSCResources/MSFT_AdcsCertificationAuthority/en-us/MSFT_AdcsCertificationAuthority.strings.psd1
similarity index 92%
rename from DSCResources/MSFT_xAdcsCertificationAuthority/en-us/MSFT_xAdcsCertificationAuthority.strings.psd1
rename to DSCResources/MSFT_AdcsCertificationAuthority/en-us/MSFT_AdcsCertificationAuthority.strings.psd1
index a5a9de1..7fbfcfc 100644
--- a/DSCResources/MSFT_xAdcsCertificationAuthority/en-us/MSFT_xAdcsCertificationAuthority.strings.psd1
+++ b/DSCResources/MSFT_AdcsCertificationAuthority/en-us/MSFT_AdcsCertificationAuthority.strings.psd1
@@ -1,4 +1,4 @@
-# Localized resources for MSFT_xAdcsCertificationAuthority
+# Localized resources for MSFT_AdcsCertificationAuthority
 
 ConvertFrom-StringData @'
     GettingAdcsCAStatusMessage = Getting ADCS {0} Status.
diff --git a/DSCResources/MSFT_xAdcsOnlineResponder/MSFT_xAdcsOnlineResponder.psm1 b/DSCResources/MSFT_AdcsOnlineResponder/MSFT_AdcsOnlineResponder.psm1
similarity index 99%
rename from DSCResources/MSFT_xAdcsOnlineResponder/MSFT_xAdcsOnlineResponder.psm1
rename to DSCResources/MSFT_AdcsOnlineResponder/MSFT_AdcsOnlineResponder.psm1
index 1e32a3d..b8e719c 100644
--- a/DSCResources/MSFT_xAdcsOnlineResponder/MSFT_xAdcsOnlineResponder.psm1
+++ b/DSCResources/MSFT_AdcsOnlineResponder/MSFT_AdcsOnlineResponder.psm1
@@ -7,7 +7,7 @@ Import-Module -Name (Join-Path -Path $modulePath `
 
 # Import Localization Strings.
 $LocalizedData = Get-LocalizedData `
-    -ResourceName 'MSFT_xAdcsOnlineResponder' `
+    -ResourceName 'MSFT_AdcsOnlineResponder' `
     -ResourcePath (Split-Path -Parent $script:MyInvocation.MyCommand.Path)
 
 <#
diff --git a/DSCResources/MSFT_xAdcsOnlineResponder/MSFT_xAdcsOnlineResponder.schema.mof b/DSCResources/MSFT_AdcsOnlineResponder/MSFT_AdcsOnlineResponder.schema.mof
similarity index 85%
rename from DSCResources/MSFT_xAdcsOnlineResponder/MSFT_xAdcsOnlineResponder.schema.mof
rename to DSCResources/MSFT_AdcsOnlineResponder/MSFT_AdcsOnlineResponder.schema.mof
index 88b11dd..ffbd59d 100644
--- a/DSCResources/MSFT_xAdcsOnlineResponder/MSFT_xAdcsOnlineResponder.schema.mof
+++ b/DSCResources/MSFT_AdcsOnlineResponder/MSFT_AdcsOnlineResponder.schema.mof
@@ -1,7 +1,7 @@
-[ClassVersion("0.1.0.0"), FriendlyName("xAdcsOnlineResponder")]
-class MSFT_xAdcsOnlineResponder : OMI_BaseResource
-{
-    [Key, Description("Specifies the resource is a single instance, the value must be 'Yes'"), ValueMap{"Yes"}, Values{"Yes"}] String IsSingleInstance;
-    [Required, Description("If the Online Responder service is configured to use Standalone certification authority, then an account that is a member of the local Administrators on the CA is required. If the Online Responder service is configured to use an Enterprise CA, then an account that is a member of Domain Admins is required."), EmbeddedInstance("MSFT_Credential")] String Credential;
-    [Write, Description("Specifies whether the Online Responder feature should be installed or uninstalled."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
-};
+[ClassVersion("0.1.0.0"), FriendlyName("AdcsOnlineResponder")]
+class MSFT_AdcsOnlineResponder : OMI_BaseResource
+{
+    [Key, Description("Specifies the resource is a single instance, the value must be 'Yes'"), ValueMap{"Yes"}, Values{"Yes"}] String IsSingleInstance;
+    [Required, Description("If the Online Responder service is configured to use Standalone certification authority, then an account that is a member of the local Administrators on the CA is required. If the Online Responder service is configured to use an Enterprise CA, then an account that is a member of Domain Admins is required."), EmbeddedInstance("MSFT_Credential")] String Credential;
+    [Write, Description("Specifies whether the Online Responder feature should be installed or uninstalled."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
+};
diff --git a/DSCResources/MSFT_xAdcsOnlineResponder/en-us/MSFT_xAdcsOnlineResponder.strings.psd1 b/DSCResources/MSFT_AdcsOnlineResponder/en-us/MSFT_AdcsOnlineResponder.strings.psd1
similarity index 94%
rename from DSCResources/MSFT_xAdcsOnlineResponder/en-us/MSFT_xAdcsOnlineResponder.strings.psd1
rename to DSCResources/MSFT_AdcsOnlineResponder/en-us/MSFT_AdcsOnlineResponder.strings.psd1
index 73ed291..396ad0a 100644
--- a/DSCResources/MSFT_xAdcsOnlineResponder/en-us/MSFT_xAdcsOnlineResponder.strings.psd1
+++ b/DSCResources/MSFT_AdcsOnlineResponder/en-us/MSFT_AdcsOnlineResponder.strings.psd1
@@ -1,4 +1,4 @@
-# Localized resources for MSFT_xAdcsOnlineResponder
+# Localized resources for MSFT_AdcsOnlineResponder
 
 ConvertFrom-StringData @'
     GettingAdcsOnlineResponderStatusMessage = Getting ADCS Online Responder Status.
diff --git a/DSCResources/MSFT_xAdcsWebEnrollment/MSFT_xAdcsWebEnrollment.psm1 b/DSCResources/MSFT_AdcsWebEnrollment/MSFT_AdcsWebEnrollment.psm1
similarity index 99%
rename from DSCResources/MSFT_xAdcsWebEnrollment/MSFT_xAdcsWebEnrollment.psm1
rename to DSCResources/MSFT_AdcsWebEnrollment/MSFT_AdcsWebEnrollment.psm1
index d73e4a4..355bca8 100644
--- a/DSCResources/MSFT_xAdcsWebEnrollment/MSFT_xAdcsWebEnrollment.psm1
+++ b/DSCResources/MSFT_AdcsWebEnrollment/MSFT_AdcsWebEnrollment.psm1
@@ -7,7 +7,7 @@ Import-Module -Name (Join-Path -Path $modulePath `
 
 # Import Localization Strings.
 $LocalizedData = Get-LocalizedData `
-    -ResourceName 'MSFT_xAdcsWebEnrollment' `
+    -ResourceName 'MSFT_AdcsWebEnrollment' `
     -ResourcePath (Split-Path -Parent $script:MyInvocation.MyCommand.Path)
 
 <#
diff --git a/DSCResources/MSFT_xAdcsWebEnrollment/MSFT_xAdcsWebEnrollment.schema.mof b/DSCResources/MSFT_AdcsWebEnrollment/MSFT_AdcsWebEnrollment.schema.mof
similarity index 88%
rename from DSCResources/MSFT_xAdcsWebEnrollment/MSFT_xAdcsWebEnrollment.schema.mof
rename to DSCResources/MSFT_AdcsWebEnrollment/MSFT_AdcsWebEnrollment.schema.mof
index ccb4105..d48b104 100644
--- a/DSCResources/MSFT_xAdcsWebEnrollment/MSFT_xAdcsWebEnrollment.schema.mof
+++ b/DSCResources/MSFT_AdcsWebEnrollment/MSFT_AdcsWebEnrollment.schema.mof
@@ -1,5 +1,5 @@
-[ClassVersion("0.1.0.0"), FriendlyName("xAdcsWebEnrollment")]
-class MSFT_xAdcsWebEnrollment : OMI_BaseResource
+[ClassVersion("0.1.0.0"), FriendlyName("AdcsWebEnrollment")]
+class MSFT_AdcsWebEnrollment : OMI_BaseResource
 {
     [Key, Description("Specifies the resource is a single instance, the value must be 'Yes'"), ValueMap{"Yes"}, Values{"Yes"}] String IsSingleInstance;
     [Write, Description("CAConfig parameter string. Do not specify this if there is a local CA installed.")] String CAConfig;
diff --git a/DSCResources/MSFT_xAdcsWebEnrollment/en-us/MSFT_xAdcsWebEnrollment.strings.psd1 b/DSCResources/MSFT_AdcsWebEnrollment/en-us/MSFT_AdcsWebEnrollment.strings.psd1
similarity index 94%
rename from DSCResources/MSFT_xAdcsWebEnrollment/en-us/MSFT_xAdcsWebEnrollment.strings.psd1
rename to DSCResources/MSFT_AdcsWebEnrollment/en-us/MSFT_AdcsWebEnrollment.strings.psd1
index 360dd65..174e0bb 100644
--- a/DSCResources/MSFT_xAdcsWebEnrollment/en-us/MSFT_xAdcsWebEnrollment.strings.psd1
+++ b/DSCResources/MSFT_AdcsWebEnrollment/en-us/MSFT_AdcsWebEnrollment.strings.psd1
@@ -1,4 +1,4 @@
-# Localized resources for MSFT_xAdcsWebEnrollment
+# Localized resources for MSFT_AdcsWebEnrollment
 
 ConvertFrom-StringData @'
     GettingAdcsWebEnrollmentStatusMessage = Getting ADCS Web Enrollment Status.
diff --git a/Examples/Resources/AdcsCertificationAuthority/1-InstallCertificationAthority.ps1 b/Examples/Resources/AdcsCertificationAuthority/1-InstallCertificationAthority.ps1
new file mode 100644
index 0000000..8ebf2e2
--- /dev/null
+++ b/Examples/Resources/AdcsCertificationAuthority/1-InstallCertificationAthority.ps1
@@ -0,0 +1,38 @@
+<#
+    .EXAMPLE
+        This example will add the Active Directory Certificate Services Certificate Authority
+        feature to a server and configure it as a certificate authority enterprise root CA.
+#>
+Configuration Example
+{
+    param
+    (
+        [Parameter()]
+        [System.String[]]
+        $NodeName = 'localhost',
+
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullorEmpty()]
+        [System.Management.Automation.PSCredential]
+        $Credential
+    )
+
+    Import-DscResource -Module AdcsDeploymentDsc
+
+    Node $AllNodes.NodeName
+    {
+        WindowsFeature ADCS-Cert-Authority
+        {
+            Ensure = 'Present'
+            Name   = 'ADCS-Cert-Authority'
+        }
+
+        AdcsCertificationAuthority CertificateAuthority
+        {
+            Ensure     = 'Present'
+            Credential = $Credential
+            CAType     = 'EnterpriseRootCA'
+            DependsOn  = '[WindowsFeature]ADCS-Cert-Authority'
+        }
+    }
+}
diff --git a/Examples/Resources/AdcsCertificationAuthority/2-RetireCertificationAthority.ps1 b/Examples/Resources/AdcsCertificationAuthority/2-RetireCertificationAthority.ps1
new file mode 100644
index 0000000..d67eba1
--- /dev/null
+++ b/Examples/Resources/AdcsCertificationAuthority/2-RetireCertificationAthority.ps1
@@ -0,0 +1,46 @@
+<#
+    .EXAMPLE
+        This example will add the retire an Active Directory Certificate Services
+        certificate authority from a node and uninstall the Active Directory Certificate
+        Services certification authority feature.
+
+        It will set the Root CA common came to 'Contoso Root CA' and the CA distinguished
+        name suffix to 'DC=CONTOSO,DC=COM'. If an existing CA root certificate exists
+        in the Active Directory then it will be overwritten.
+#>
+Configuration Example
+{
+    param
+    (
+        [Parameter()]
+        [System.String[]]
+        $NodeName = 'localhost',
+
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullorEmpty()]
+        [System.Management.Automation.PSCredential]
+        $Credential
+    )
+
+    Import-DscResource -Module AdcsDeploymentDsc
+
+    Node $AllNodes.NodeName
+    {
+        AdcsCertificationAuthority CertificateAuthority
+        {
+            Ensure                    = 'Absent'
+            Credential                = $Credential
+            CAType                    = 'EnterpriseRootCA'
+            CACommonName              = 'Contoso Root CA'
+            CADistinguishedNameSuffix = 'DC=CONTOSO,DC=COM'
+            OverwriteExistingCAinDS   = $True
+        }
+
+        WindowsFeature ADCS-Cert-Authority
+        {
+            Ensure    = 'Absent'
+            Name      = 'ADCS-Cert-Authority'
+            DependsOn = '[AdcsCertificationAuthority]CertificateAuthority'
+        }
+    }
+}
diff --git a/Examples/Resources/AdcsOnlineResponder/1-InstallOnlineResponder.ps1 b/Examples/Resources/AdcsOnlineResponder/1-InstallOnlineResponder.ps1
new file mode 100644
index 0000000..1343647
--- /dev/null
+++ b/Examples/Resources/AdcsOnlineResponder/1-InstallOnlineResponder.ps1
@@ -0,0 +1,39 @@
+<#
+    .EXAMPLE
+        This example will add the Active Directory Certificate Services Online Responder
+        feature to a server and configure it as an Online Certificate Status Protocol (OCSP)
+        server.
+#>
+Configuration Example
+{
+    param
+    (
+        [Parameter()]
+        [System.String[]]
+        $NodeName = 'localhost',
+
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullorEmpty()]
+        [System.Management.Automation.PSCredential]
+        $Credential
+    )
+
+    Import-DscResource -Module AdcsDeploymentDsc
+
+    Node $AllNodes.NodeName
+    {
+        WindowsFeature ADCS-Online-Cert
+        {
+            Ensure = 'Present'
+            Name   = 'ADCS-Online-Cert'
+        }
+
+        AdcsOnlineResponder OnlineResponder
+        {
+            Ensure           = 'Present'
+            IsSingleInstance = 'Yes'
+            Credential       = $Credential
+            DependsOn        = '[WindowsFeature]ADCS-Online-Cert'
+        }
+    }
+}
diff --git a/Examples/Resources/AdcsWebEnrollment/1-InstallWebEnrollment.ps1 b/Examples/Resources/AdcsWebEnrollment/1-InstallWebEnrollment.ps1
new file mode 100644
index 0000000..67d7544
--- /dev/null
+++ b/Examples/Resources/AdcsWebEnrollment/1-InstallWebEnrollment.ps1
@@ -0,0 +1,39 @@
+<#
+    .EXAMPLE
+        This example will add the Active Directory Certificate Services Certification
+        Authority Web Enrollment feature to a server and configure it as a web
+        enrollment server.
+#>
+Configuration Example
+{
+    param
+    (
+        [Parameter()]
+        [System.String[]]
+        $NodeName = 'localhost',
+
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullorEmpty()]
+        [System.Management.Automation.PSCredential]
+        $Credential
+    )
+
+    Import-DscResource -Module AdcsDeploymentDsc
+
+    Node $AllNodes.NodeName
+    {
+        WindowsFeature ADCS-Web-Enrollment
+        {
+            Ensure = 'Present'
+            Name   = 'ADCS-Web-Enrollment'
+        }
+
+        AdcsWebEnrollment WebEnrollment
+        {
+            Ensure           = 'Present'
+            IsSingleInstance = 'Yes'
+            Credential       = $Credential
+            DependsOn        = '[WindowsFeature]ADCS-Web-Enrollment'
+        }
+    }
+}
diff --git a/Examples/Resources/xAdcsCertificationAuthority/1-InstallCertificationAthority.ps1 b/Examples/Resources/xAdcsCertificationAuthority/1-InstallCertificationAthority.ps1
index 8590adb..8ebf2e2 100644
--- a/Examples/Resources/xAdcsCertificationAuthority/1-InstallCertificationAthority.ps1
+++ b/Examples/Resources/xAdcsCertificationAuthority/1-InstallCertificationAthority.ps1
@@ -17,7 +17,7 @@ Configuration Example
         $Credential
     )
 
-    Import-DscResource -Module xAdcsDeployment
+    Import-DscResource -Module AdcsDeploymentDsc
 
     Node $AllNodes.NodeName
     {
@@ -27,7 +27,7 @@ Configuration Example
             Name   = 'ADCS-Cert-Authority'
         }
 
-        xAdcsCertificationAuthority CertificateAuthority
+        AdcsCertificationAuthority CertificateAuthority
         {
             Ensure     = 'Present'
             Credential = $Credential
diff --git a/Examples/Resources/xAdcsCertificationAuthority/2-RetireCertificationAthority.ps1 b/Examples/Resources/xAdcsCertificationAuthority/2-RetireCertificationAthority.ps1
index cb0e2e8..d67eba1 100644
--- a/Examples/Resources/xAdcsCertificationAuthority/2-RetireCertificationAthority.ps1
+++ b/Examples/Resources/xAdcsCertificationAuthority/2-RetireCertificationAthority.ps1
@@ -22,11 +22,11 @@ Configuration Example
         $Credential
     )
 
-    Import-DscResource -Module xAdcsDeployment
+    Import-DscResource -Module AdcsDeploymentDsc
 
     Node $AllNodes.NodeName
     {
-        xAdcsCertificationAuthority CertificateAuthority
+        AdcsCertificationAuthority CertificateAuthority
         {
             Ensure                    = 'Absent'
             Credential                = $Credential
@@ -40,7 +40,7 @@ Configuration Example
         {
             Ensure    = 'Absent'
             Name      = 'ADCS-Cert-Authority'
-            DependsOn = '[xADCSCertificationAuthority]CertificateAuthority'
+            DependsOn = '[AdcsCertificationAuthority]CertificateAuthority'
         }
     }
 }
diff --git a/Examples/Resources/xAdcsOnlineResponder/1-InstallOnlineResponder.ps1 b/Examples/Resources/xAdcsOnlineResponder/1-InstallOnlineResponder.ps1
index 413fc84..1343647 100644
--- a/Examples/Resources/xAdcsOnlineResponder/1-InstallOnlineResponder.ps1
+++ b/Examples/Resources/xAdcsOnlineResponder/1-InstallOnlineResponder.ps1
@@ -18,7 +18,7 @@ Configuration Example
         $Credential
     )
 
-    Import-DscResource -Module xAdcsDeployment
+    Import-DscResource -Module AdcsDeploymentDsc
 
     Node $AllNodes.NodeName
     {
@@ -28,7 +28,7 @@ Configuration Example
             Name   = 'ADCS-Online-Cert'
         }
 
-        xAdcsOnlineResponder OnlineResponder
+        AdcsOnlineResponder OnlineResponder
         {
             Ensure           = 'Present'
             IsSingleInstance = 'Yes'
diff --git a/Examples/Resources/xAdcsWebEnrollment/1-InstallWebEnrollment.ps1 b/Examples/Resources/xAdcsWebEnrollment/1-InstallWebEnrollment.ps1
index 785172e..67d7544 100644
--- a/Examples/Resources/xAdcsWebEnrollment/1-InstallWebEnrollment.ps1
+++ b/Examples/Resources/xAdcsWebEnrollment/1-InstallWebEnrollment.ps1
@@ -18,7 +18,7 @@ Configuration Example
         $Credential
     )
 
-    Import-DscResource -Module xAdcsDeployment
+    Import-DscResource -Module AdcsDeploymentDsc
 
     Node $AllNodes.NodeName
     {
@@ -28,7 +28,7 @@ Configuration Example
             Name   = 'ADCS-Web-Enrollment'
         }
 
-        xAdcsWebEnrollment WebEnrollment
+        AdcsWebEnrollment WebEnrollment
         {
             Ensure           = 'Present'
             IsSingleInstance = 'Yes'
diff --git a/README.md b/README.md
index ea7a8eb..f900e7a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# xAdcsDeployment
+# AdcsDeploymentDsc
 
-The **xAdcsDeployment** DSC resources have been specifically tested as a method
+The **AdcsDeploymentDscDsc** DSC resources have been specifically tested as a method
 to populate a Certificate Services server role on Windows Server 2012 R2 and above
 after the Certificate Services role and the Web Enrollment feature have been enabled.
 Active Directory Certificate Services (AD CS) is used to create certification
@@ -25,16 +25,16 @@ additional questions or comments.
 
 ### master
 
-[![Build status](https://ci.appveyor.com/api/projects/status/2uua9s0qgmfmqqrh/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/xAdcsDeployment/branch/master)
-[![codecov](https://codecov.io/gh/PowerShell/xAdcsDeployment/branch/master/graph/badge.svg)](https://codecov.io/gh/PowerShell/xAdcsDeployment/branch/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/2uua9s0qgmfmqqrh/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/AdcsDeploymentDsc/branch/master)
+[![codecov](https://codecov.io/gh/PowerShell/AdcsDeploymentDsc/branch/master/graph/badge.svg)](https://codecov.io/gh/PowerShell/AdcsDeploymentDsc/branch/master)
 
 This is the branch containing the latest release - no contributions should be made
 directly to this branch.
 
 ### dev
 
-[![Build status](https://ci.appveyor.com/api/projects/status/2uua9s0qgmfmqqrh/branch/dev?svg=true)](https://ci.appveyor.com/project/PowerShell/xAdcsDeployment/branch/dev)
-[![codecov](https://codecov.io/gh/PowerShell/xAdcsDeployment/branch/dev/graph/badge.svg)](https://codecov.io/gh/PowerShell/xAdcsDeployment/branch/dev)
+[![Build status](https://ci.appveyor.com/api/projects/status/2uua9s0qgmfmqqrh/branch/dev?svg=true)](https://ci.appveyor.com/project/PowerShell/AdcsDeploymentDsc/branch/dev)
+[![codecov](https://codecov.io/gh/PowerShell/AdcsDeploymentDsc/branch/dev/graph/badge.svg)](https://codecov.io/gh/PowerShell/AdcsDeploymentDsc/branch/dev)
 
 This is the development branch to which contributions should be proposed by contributors
 as pull requests. This development branch will periodically be merged to the master
@@ -46,14 +46,14 @@ Please check out common DSC Resources [contributing guidelines](https://github.c
 
 ## Resources
 
-- **xAdcsCertificationAuthority**: This resource can be used to install the ADCS
+- **AdcsCertificationAuthority**: This resource can be used to install the ADCS
   Certificate Authority after the feature has been installed on the server.
-- **xAdcsOnlineResponder**: This resource can be used to install an ADCS Online
+- **AdcsOnlineResponder**: This resource can be used to install an ADCS Online
   Responder after the feature has been installed on the server.
-- **xAdcsWebEnrollment**: This resource can be used to install the ADCS Web
+- **AdcsWebEnrollment**: This resource can be used to install the ADCS Web
   Enrollment service after the feature has been installed on the server.
 
-### xAdcsCertificationAuthority
+### AdcsCertificationAuthority
 
 This resource can be used to install the ADCS Certificate Authority after the
 feature has been installed on the server.
@@ -117,12 +117,12 @@ the `ADCS-Cert-Authority` feature has already been installed.
   authority certificate. If this is a subordinate CA, do not specify this parameter
     because the validity period is determined by the parent CA.
 
-#### xAdcsCertificationAuthority Examples
+#### AdcsCertificationAuthority Examples
 
-- [Install enterprise root certificate authority](/Examples/Resources/xAdcsCertificationAuthority/1-InstallCertificationAthority.ps1)
-- [Retire certificate authority](/Examples/Resources/xAdcsCertificationAuthority/2-RetireCertificationAthority.ps1)
+- [Install enterprise root certificate authority](/Examples/Resources/AdcsCertificationAuthority/1-InstallCertificationAthority.ps1)
+- [Retire certificate authority](/Examples/Resources/AdcsCertificationAuthority/2-RetireCertificationAthority.ps1)
 
-### xAdcsOnlineResponder
+### AdcsOnlineResponder
 
 This resource can be used to install an ADCS Online Responder after the feature
 has been installed on the server.
@@ -142,11 +142,11 @@ For more information on ADCS Online Responders, see [this article on TechNet](ht
 - **`[String]` Ensure** (_Write_): Specifies whether the Online Responder feature
   should be installed or uninstalled. { *Present* | Absent }
 
-#### xAdcsOnlineResponder Examples
+#### AdcsOnlineResponder Examples
 
-- [Install Online Certificate Status Protocol (OCSP) server](/Examples/Resources/xAdcsWebEnrollment/1-InstallOnlineResponder.ps1)
+- [Install Online Certificate Status Protocol (OCSP) server](/Examples/Resources/AdcsWebEnrollment/1-InstallOnlineResponder.ps1)
 
-### xAdcsWebEnrollment
+### AdcsWebEnrollment
 
 This resource can be used to install the ADCS Web Enrollment service after the
 feature has been installed on the server.
@@ -166,23 +166,25 @@ For more information on Web Enrollment services, see [this article on TechNet](h
 - **`[String]` Ensure** (_Write_): Specifies whether the Web Enrollment feature
   should be installed or uninstalled. { *Present* | Absent }
 
-#### xAdcsWebEnrollment Examples
+#### AdcsWebEnrollment Examples
 
-- [Install web enrollment server](/Examples/Resources/xAdcsWebEnrollment/1-InstallWebEnrollment.ps1)
+- [Install web enrollment server](/Examples/Resources/AdcsWebEnrollment/1-InstallWebEnrollment.ps1)
 
 ## Versions
 
 ### Unreleased
 
+- BREAKING CHANGE: Converted module name to AdcsDeploymentDsc.
+
 ### 1.4.0.0
 
-- xAdcsCertificateAuthority: CertFilePassword invalid type - fixes
-  [issue #36](https://github.com/PowerShell/xAdcsDeployment/issues/36)
+- AdcsCertificateAuthority: CertFilePassword invalid type - fixes
+  [issue #36](https://github.com/PowerShell/AdcsDeploymentDsc/issues/36)
 
 ### 1.3.0.0
 
 - Updated to meet HQRM guidelines - fixes
-  [issue #33](https://github.com/PowerShell/xAdcsDeployment/issues/33).
+  [issue #33](https://github.com/PowerShell/AdcsDeploymentDsc/issues/33).
 - Fixed markdown rule violations in README.MD.
 - Change examples to meet HQRM standards and optin to Example validation
   tests.
@@ -197,23 +199,23 @@ For more information on Web Enrollment services, see [this article on TechNet](h
   - PULL_REQUEST_TEMPLATE.md
 - Resolved all PSScriptAnalyzer warnings and style guide warnings.
 - Converted all tests to meet Pester V4 guidelines - fixes
-  [issue #32](https://github.com/PowerShell/xAdcsDeployment/issues/32).
+  [issue #32](https://github.com/PowerShell/AdcsDeploymentDsc/issues/32).
 - Fixed spelling mistakes in README.MD.
 - Fix to ensure exception thrown if failed to install or uninstall service - fixes
-  [issue #3](https://github.com/PowerShell/xAdcsDeployment/issues/3).
+  [issue #3](https://github.com/PowerShell/AdcsDeploymentDsc/issues/3).
 - Converted AppVeyor.yml to use shared AppVeyor module in DSCResource.Tests - fixes
-  [issue #29](https://github.com/PowerShell/xAdcsDeployment/issues/29).
+  [issue #29](https://github.com/PowerShell/AdcsDeploymentDsc/issues/29).
 
 ### 1.2.0.0
 
-- xAdcsWebEnrollment:
-  - xAdcsWebEnrollment.psm1 - Change reference and variable from CAType to CAConfig
+- AdcsWebEnrollment:
+  - AdcsWebEnrollment.psm1 - Change reference and variable from CAType to CAConfig
 
 ### 1.1.0.0
 
 - Converted AppVeyor.yml to pull Pester from PSGallery instead of Chocolatey.
 - Changed AppVeyor.yml to use default image.
-- xAdcsCertificateAuthority:
+- AdcsCertificateAuthority:
   - Change property format in Readme.md to be standard layout.
   - Converted style to meet HQRM guidelines.
   - Added verbose logging support.
@@ -222,13 +224,13 @@ For more information on Web Enrollment services, see [this article on TechNet](h
     or not CA is installed.
   - Added unit tests.
   - Updated parameter format to meet HQRM guidelines.
-- xAdcsOnlineResponder:
+- AdcsOnlineResponder:
   - Change property format in Readme.md to be standard layout.
   - Added unit test header to be latest version.
   - Added function help.
   - Updated parameter format to meet HQRM guidelines.
   - Updated resource to meet HQRM guidelines.
-- xAdcsWebEnrollment:
+- AdcsWebEnrollment:
   - Change property format in Readme.md to be standard layout.
   - Added unit test header to be latest version.
   - Added function help.
@@ -245,10 +247,10 @@ For more information on Web Enrollment services, see [this article on TechNet](h
 - Moved Examples folder into root.
 - Removed legacy xCertificateServices folder.
 - Prevented Unit tests from Violating PSSA rules.
-- MSFT_xAdcsWebEnrollment: Created unit tests based on v1.0 Test Template.
+- MSFT_AdcsWebEnrollment: Created unit tests based on v1.0 Test Template.
                            Update to meet Style Guidelines and ensure consistency.
                            Updated to IsSingleInstance model. **Breaking change**
-- MSFT_xAdcsOnlineResponder: Update Unit tests to use v1.0 Test Template.
+- MSFT_AdcsOnlineResponder: Update Unit tests to use v1.0 Test Template.
                              Unit tests can be run without AD CS installed.
                              Update to meet Style Guidelines and ensure consistency.
 - Usage of WinRm.exe replaced in Config-SetupActiveDirectory.ps1 example file
@@ -257,12 +259,12 @@ For more information on Web Enrollment services, see [this article on TechNet](h
 ### 0.2.0.0
 
 - Added the following resources:
-  - MSFT_xADCSOnlineResponder resource to install the Online Responder service.
-- Correction to xAdcsCertificationAuthority property title in Readme.md.
+  - MSFT_AdcsOnlineResponder resource to install the Online Responder service.
+- Correction to AdcsCertificationAuthority property title in Readme.md.
 - Addition of .gitignore to ensure DSCResource.Tests folder is committed.
 - Updated AppVeyor.yml to use WMF 5 build environment.
 
 ### 0.1.0.0
 
 - Initial release with the following resources
-  - xAdcsCertificationAuthority and xAdcsWebEnrollment.
+  - AdcsCertificationAuthority and AdcsWebEnrollment.
diff --git a/Tests/Integration/MSFT_xAdcsCertificationAuthority.Tests.ps1 b/Tests/Integration/MSFT_AdcsCertificationAuthority.Tests.ps1
similarity index 98%
rename from Tests/Integration/MSFT_xAdcsCertificationAuthority.Tests.ps1
rename to Tests/Integration/MSFT_AdcsCertificationAuthority.Tests.ps1
index bdd659e..f168810 100644
--- a/Tests/Integration/MSFT_xAdcsCertificationAuthority.Tests.ps1
+++ b/Tests/Integration/MSFT_AdcsCertificationAuthority.Tests.ps1
@@ -14,8 +14,8 @@ param ()
 #>
 $script:adminUsername = 'AdcsAdmin'
 $script:adminPassword = 'NotPass12!'
-$script:DSCModuleName = 'xAdcsDeployment'
-$script:DSCResourceName = 'MSFT_xAdcsCertificationAuthority'
+$script:DSCModuleName = 'AdcsDeploymentDsc'
+$script:DSCResourceName = 'MSFT_AdcsCertificationAuthority'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
diff --git a/Tests/Integration/MSFT_AdcsCertificationAuthority_Install.config.ps1 b/Tests/Integration/MSFT_AdcsCertificationAuthority_Install.config.ps1
new file mode 100644
index 0000000..b4692a6
--- /dev/null
+++ b/Tests/Integration/MSFT_AdcsCertificationAuthority_Install.config.ps1
@@ -0,0 +1,11 @@
+configuration MSFT_AdcsCertificationAuthority_Install_Config {
+    Import-DscResource -ModuleName AdcsDeploymentDsc
+
+    node localhost {
+        AdcsCertificationAuthority Integration_Test {
+            CAType     = 'StandaloneRootCA'
+            Credential = $Node.AdminCred
+            Ensure     = 'Present'
+        }
+    }
+}
diff --git a/Tests/Integration/MSFT_AdcsCertificationAuthority_Uninstall.config.ps1 b/Tests/Integration/MSFT_AdcsCertificationAuthority_Uninstall.config.ps1
new file mode 100644
index 0000000..7459727
--- /dev/null
+++ b/Tests/Integration/MSFT_AdcsCertificationAuthority_Uninstall.config.ps1
@@ -0,0 +1,11 @@
+configuration MSFT_AdcsCertificationAuthority_Uninstall_Config {
+    Import-DscResource -ModuleName AdcsDeploymentDsc
+
+    node localhost {
+        AdcsCertificationAuthority Integration_Test {
+            CAType     = 'StandaloneRootCA'
+            Credential = $Node.AdminCred
+            Ensure     = 'Absent'
+        }
+    }
+}
diff --git a/Tests/Integration/MSFT_xAdcsCertificationAuthority_Install.config.ps1 b/Tests/Integration/MSFT_xAdcsCertificationAuthority_Install.config.ps1
deleted file mode 100644
index e6ca065..0000000
--- a/Tests/Integration/MSFT_xAdcsCertificationAuthority_Install.config.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-configuration MSFT_xADCSCertificationAuthority_Install_Config {
-    Import-DscResource -ModuleName xAdcsDeployment
-
-    node localhost {
-        xADCSCertificationAuthority Integration_Test {
-            CAType     = 'StandaloneRootCA'
-            Credential = $Node.AdminCred
-            Ensure     = 'Present'
-        }
-    }
-}
diff --git a/Tests/Integration/MSFT_xAdcsCertificationAuthority_Uninstall.config.ps1 b/Tests/Integration/MSFT_xAdcsCertificationAuthority_Uninstall.config.ps1
deleted file mode 100644
index 3e46af0..0000000
--- a/Tests/Integration/MSFT_xAdcsCertificationAuthority_Uninstall.config.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-configuration MSFT_xADCSCertificationAuthority_Uninstall_Config {
-    Import-DscResource -ModuleName xAdcsDeployment
-
-    node localhost {
-        xADCSCertificationAuthority Integration_Test {
-            CAType     = 'StandaloneRootCA'
-            Credential = $Node.AdminCred
-            Ensure     = 'Absent'
-        }
-    }
-}
diff --git a/Tests/Unit/MSFT_xAdcsCertificationAuthority.Tests.ps1 b/Tests/Unit/MSFT_AdcsCertificationAuthority.Tests.ps1
similarity index 98%
rename from Tests/Unit/MSFT_xAdcsCertificationAuthority.Tests.ps1
rename to Tests/Unit/MSFT_AdcsCertificationAuthority.Tests.ps1
index 97de664..3bc9b0e 100644
--- a/Tests/Unit/MSFT_xAdcsCertificationAuthority.Tests.ps1
+++ b/Tests/Unit/MSFT_AdcsCertificationAuthority.Tests.ps1
@@ -1,5 +1,5 @@
-$script:DSCModuleName   = 'xAdcsDeployment'
-$script:DSCResourceName = 'MSFT_xAdcsCertificationAuthority'
+$script:DSCModuleName   = 'AdcsDeploymentDsc'
+$script:DSCResourceName = 'MSFT_AdcsCertificationAuthority'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
@@ -24,7 +24,7 @@ try
 {
     #region Pester Tests
     InModuleScope $($script:DSCResourceName) {
-        $DSCResourceName = 'MSFT_xAdcsCertificationAuthority'
+        $DSCResourceName = 'MSFT_AdcsCertificationAuthority'
 
         if (-not ([System.Management.Automation.PSTypeName]'Microsoft.CertificateServices.Deployment.Common.CA.CertificationAuthoritySetupException').Type)
         {
diff --git a/Tests/Unit/MSFT_xAdcsOnlineResponder.Tests.ps1 b/Tests/Unit/MSFT_AdcsOnlineResponder.Tests.ps1
similarity index 98%
rename from Tests/Unit/MSFT_xAdcsOnlineResponder.Tests.ps1
rename to Tests/Unit/MSFT_AdcsOnlineResponder.Tests.ps1
index 91b558b..ccce81c 100644
--- a/Tests/Unit/MSFT_xAdcsOnlineResponder.Tests.ps1
+++ b/Tests/Unit/MSFT_AdcsOnlineResponder.Tests.ps1
@@ -1,5 +1,5 @@
-$script:DSCModuleName   = 'xAdcsDeployment'
-$script:DSCResourceName = 'MSFT_xAdcsOnlineResponder'
+$script:DSCModuleName   = 'AdcsDeploymentDsc'
+$script:DSCResourceName = 'MSFT_AdcsOnlineResponder'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
@@ -24,7 +24,7 @@ try
 {
     #region Pester Tests
     InModuleScope $script:DSCResourceName {
-        $DSCResourceName = 'MSFT_xAdcsOnlineResponder'
+        $DSCResourceName = 'MSFT_AdcsOnlineResponder'
 
         if (-not ([System.Management.Automation.PSTypeName]'Microsoft.CertificateServices.Deployment.Common.OCSP.OnlineResponderSetupException').Type)
         {
diff --git a/Tests/Unit/MSFT_xAdcsWebEnrollment.Tests.ps1 b/Tests/Unit/MSFT_AdcsWebEnrollment.Tests.ps1
similarity index 98%
rename from Tests/Unit/MSFT_xAdcsWebEnrollment.Tests.ps1
rename to Tests/Unit/MSFT_AdcsWebEnrollment.Tests.ps1
index 7c55694..f6466ff 100644
--- a/Tests/Unit/MSFT_xAdcsWebEnrollment.Tests.ps1
+++ b/Tests/Unit/MSFT_AdcsWebEnrollment.Tests.ps1
@@ -1,5 +1,5 @@
-$script:DSCModuleName = 'xAdcsDeployment'
-$script:DSCResourceName = 'MSFT_xAdcsWebEnrollment'
+$script:DSCModuleName = 'AdcsDeploymentDsc'
+$script:DSCResourceName = 'MSFT_AdcsWebEnrollment'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
@@ -39,7 +39,7 @@ namespace Microsoft.CertificateServices.Deployment.Common.WEP {
             Add-Type -TypeDefinition $ExceptionDefinition
         }
 
-        $DSCResourceName = 'MSFT_xAdcsWebEnrollment'
+        $DSCResourceName = 'MSFT_AdcsWebEnrollment'
 
         $dummyCredential = New-Object System.Management.Automation.PSCredential ("Administrator", (New-Object -Type SecureString))
 

From 89a1a94e3aac1a80edbdaf0ca702095240855bc2 Mon Sep 17 00:00:00 2001
From: Daniel Scott-Raynsford <plagueho@gmail.com>
Date: Sun, 24 Dec 2017 09:23:35 +1300
Subject: [PATCH 2/8] Minor change to trigger CI

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f900e7a..5909ea3 100644
--- a/README.md
+++ b/README.md
@@ -174,7 +174,7 @@ For more information on Web Enrollment services, see [this article on TechNet](h
 
 ### Unreleased
 
-- BREAKING CHANGE: Converted module name to AdcsDeploymentDsc.
+- BREAKING CHANGE: Renamed module to AdcsDeploymentDsc.
 
 ### 1.4.0.0
 

From e84e660277fe1f5b88e1958a017d29cb771ec65f Mon Sep 17 00:00:00 2001
From: Daniel Scott-Raynsford <plagueho@gmail.com>
Date: Sun, 24 Dec 2017 09:59:59 +1300
Subject: [PATCH 3/8] Update version numbers

---
 AdcsDeploymentDsc.psd1 | 2 +-
 appveyor.yml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/AdcsDeploymentDsc.psd1 b/AdcsDeploymentDsc.psd1
index 19d5456..f6ee1a6 100644
--- a/AdcsDeploymentDsc.psd1
+++ b/AdcsDeploymentDsc.psd1
@@ -1,6 +1,6 @@
 @{
     # Version number of this module.
-    ModuleVersion = '1.4.0.0'
+    ModuleVersion = '2.0.0.0'
 
     # ID used to uniquely identify this module
     GUID              = 'f8ddd7fc-c6d6-469e-8a80-c96efabe2fcc'
diff --git a/appveyor.yml b/appveyor.yml
index de888ac..deb5e40 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 #---------------------------------#
 #      environment configuration  #
 #---------------------------------#
-version: 1.1.{build}.0
+version: 2.0.{build}.0
 install:
     - git clone https://github.com/PowerShell/DscResource.Tests
 

From a6d711498371f41bd8f1a3c55995c05d80157a92 Mon Sep 17 00:00:00 2001
From: Daniel Scott-Raynsford <plagueho@gmail.com>
Date: Mon, 25 Dec 2017 08:04:53 +1300
Subject: [PATCH 4/8] Updates as per PR comments

---
 AdcsDeploymentDsc.psd1                        |  6 +--
 .../1-InstallCertificationAthority.ps1        | 38 ---------------
 .../2-RetireCertificationAthority.ps1         | 46 -------------------
 .../1-InstallOnlineResponder.ps1              | 39 ----------------
 .../1-InstallWebEnrollment.ps1                | 39 ----------------
 README.md                                     | 32 ++++++-------
 appveyor.yml                                  |  2 +-
 7 files changed, 20 insertions(+), 182 deletions(-)
 delete mode 100644 Examples/Resources/xAdcsCertificationAuthority/1-InstallCertificationAthority.ps1
 delete mode 100644 Examples/Resources/xAdcsCertificationAuthority/2-RetireCertificationAthority.ps1
 delete mode 100644 Examples/Resources/xAdcsOnlineResponder/1-InstallOnlineResponder.ps1
 delete mode 100644 Examples/Resources/xAdcsWebEnrollment/1-InstallWebEnrollment.ps1

diff --git a/AdcsDeploymentDsc.psd1 b/AdcsDeploymentDsc.psd1
index f6ee1a6..c49bec8 100644
--- a/AdcsDeploymentDsc.psd1
+++ b/AdcsDeploymentDsc.psd1
@@ -1,6 +1,6 @@
 @{
     # Version number of this module.
-    ModuleVersion = '2.0.0.0'
+    ModuleVersion = '1.4.0.0'
 
     # ID used to uniquely identify this module
     GUID              = 'f8ddd7fc-c6d6-469e-8a80-c96efabe2fcc'
@@ -47,8 +47,8 @@
             # IconUri = ''
 
             # ReleaseNotes of this module
-        ReleaseNotes = '- AdcsCertificateAuthority: CertFilePassword invalid type - fixes
-  [issue 36](https://github.com/PowerShell/AdcsDeploymentDsc/issues/36)
+        ReleaseNotes = '- xAdcsCertificateAuthority: CertFilePassword invalid type - fixes
+  [issue 36](https://github.com/PowerShell/xAdcsDeploymentDsc/issues/36)
 
 '
         } # End of PSData hashtable
diff --git a/Examples/Resources/xAdcsCertificationAuthority/1-InstallCertificationAthority.ps1 b/Examples/Resources/xAdcsCertificationAuthority/1-InstallCertificationAthority.ps1
deleted file mode 100644
index 8ebf2e2..0000000
--- a/Examples/Resources/xAdcsCertificationAuthority/1-InstallCertificationAthority.ps1
+++ /dev/null
@@ -1,38 +0,0 @@
-<#
-    .EXAMPLE
-        This example will add the Active Directory Certificate Services Certificate Authority
-        feature to a server and configure it as a certificate authority enterprise root CA.
-#>
-Configuration Example
-{
-    param
-    (
-        [Parameter()]
-        [System.String[]]
-        $NodeName = 'localhost',
-
-        [Parameter(Mandatory = $true)]
-        [ValidateNotNullorEmpty()]
-        [System.Management.Automation.PSCredential]
-        $Credential
-    )
-
-    Import-DscResource -Module AdcsDeploymentDsc
-
-    Node $AllNodes.NodeName
-    {
-        WindowsFeature ADCS-Cert-Authority
-        {
-            Ensure = 'Present'
-            Name   = 'ADCS-Cert-Authority'
-        }
-
-        AdcsCertificationAuthority CertificateAuthority
-        {
-            Ensure     = 'Present'
-            Credential = $Credential
-            CAType     = 'EnterpriseRootCA'
-            DependsOn  = '[WindowsFeature]ADCS-Cert-Authority'
-        }
-    }
-}
diff --git a/Examples/Resources/xAdcsCertificationAuthority/2-RetireCertificationAthority.ps1 b/Examples/Resources/xAdcsCertificationAuthority/2-RetireCertificationAthority.ps1
deleted file mode 100644
index d67eba1..0000000
--- a/Examples/Resources/xAdcsCertificationAuthority/2-RetireCertificationAthority.ps1
+++ /dev/null
@@ -1,46 +0,0 @@
-<#
-    .EXAMPLE
-        This example will add the retire an Active Directory Certificate Services
-        certificate authority from a node and uninstall the Active Directory Certificate
-        Services certification authority feature.
-
-        It will set the Root CA common came to 'Contoso Root CA' and the CA distinguished
-        name suffix to 'DC=CONTOSO,DC=COM'. If an existing CA root certificate exists
-        in the Active Directory then it will be overwritten.
-#>
-Configuration Example
-{
-    param
-    (
-        [Parameter()]
-        [System.String[]]
-        $NodeName = 'localhost',
-
-        [Parameter(Mandatory = $true)]
-        [ValidateNotNullorEmpty()]
-        [System.Management.Automation.PSCredential]
-        $Credential
-    )
-
-    Import-DscResource -Module AdcsDeploymentDsc
-
-    Node $AllNodes.NodeName
-    {
-        AdcsCertificationAuthority CertificateAuthority
-        {
-            Ensure                    = 'Absent'
-            Credential                = $Credential
-            CAType                    = 'EnterpriseRootCA'
-            CACommonName              = 'Contoso Root CA'
-            CADistinguishedNameSuffix = 'DC=CONTOSO,DC=COM'
-            OverwriteExistingCAinDS   = $True
-        }
-
-        WindowsFeature ADCS-Cert-Authority
-        {
-            Ensure    = 'Absent'
-            Name      = 'ADCS-Cert-Authority'
-            DependsOn = '[AdcsCertificationAuthority]CertificateAuthority'
-        }
-    }
-}
diff --git a/Examples/Resources/xAdcsOnlineResponder/1-InstallOnlineResponder.ps1 b/Examples/Resources/xAdcsOnlineResponder/1-InstallOnlineResponder.ps1
deleted file mode 100644
index 1343647..0000000
--- a/Examples/Resources/xAdcsOnlineResponder/1-InstallOnlineResponder.ps1
+++ /dev/null
@@ -1,39 +0,0 @@
-<#
-    .EXAMPLE
-        This example will add the Active Directory Certificate Services Online Responder
-        feature to a server and configure it as an Online Certificate Status Protocol (OCSP)
-        server.
-#>
-Configuration Example
-{
-    param
-    (
-        [Parameter()]
-        [System.String[]]
-        $NodeName = 'localhost',
-
-        [Parameter(Mandatory = $true)]
-        [ValidateNotNullorEmpty()]
-        [System.Management.Automation.PSCredential]
-        $Credential
-    )
-
-    Import-DscResource -Module AdcsDeploymentDsc
-
-    Node $AllNodes.NodeName
-    {
-        WindowsFeature ADCS-Online-Cert
-        {
-            Ensure = 'Present'
-            Name   = 'ADCS-Online-Cert'
-        }
-
-        AdcsOnlineResponder OnlineResponder
-        {
-            Ensure           = 'Present'
-            IsSingleInstance = 'Yes'
-            Credential       = $Credential
-            DependsOn        = '[WindowsFeature]ADCS-Online-Cert'
-        }
-    }
-}
diff --git a/Examples/Resources/xAdcsWebEnrollment/1-InstallWebEnrollment.ps1 b/Examples/Resources/xAdcsWebEnrollment/1-InstallWebEnrollment.ps1
deleted file mode 100644
index 67d7544..0000000
--- a/Examples/Resources/xAdcsWebEnrollment/1-InstallWebEnrollment.ps1
+++ /dev/null
@@ -1,39 +0,0 @@
-<#
-    .EXAMPLE
-        This example will add the Active Directory Certificate Services Certification
-        Authority Web Enrollment feature to a server and configure it as a web
-        enrollment server.
-#>
-Configuration Example
-{
-    param
-    (
-        [Parameter()]
-        [System.String[]]
-        $NodeName = 'localhost',
-
-        [Parameter(Mandatory = $true)]
-        [ValidateNotNullorEmpty()]
-        [System.Management.Automation.PSCredential]
-        $Credential
-    )
-
-    Import-DscResource -Module AdcsDeploymentDsc
-
-    Node $AllNodes.NodeName
-    {
-        WindowsFeature ADCS-Web-Enrollment
-        {
-            Ensure = 'Present'
-            Name   = 'ADCS-Web-Enrollment'
-        }
-
-        AdcsWebEnrollment WebEnrollment
-        {
-            Ensure           = 'Present'
-            IsSingleInstance = 'Yes'
-            Credential       = $Credential
-            DependsOn        = '[WindowsFeature]ADCS-Web-Enrollment'
-        }
-    }
-}
diff --git a/README.md b/README.md
index 5909ea3..105a9af 100644
--- a/README.md
+++ b/README.md
@@ -178,13 +178,13 @@ For more information on Web Enrollment services, see [this article on TechNet](h
 
 ### 1.4.0.0
 
-- AdcsCertificateAuthority: CertFilePassword invalid type - fixes
-  [issue #36](https://github.com/PowerShell/AdcsDeploymentDsc/issues/36)
+- xAdcsCertificateAuthority: CertFilePassword invalid type - fixes
+  [issue #36](https://github.com/PowerShell/xAdcsDeploymentDsc/issues/36)
 
 ### 1.3.0.0
 
 - Updated to meet HQRM guidelines - fixes
-  [issue #33](https://github.com/PowerShell/AdcsDeploymentDsc/issues/33).
+  [issue #33](https://github.com/PowerShell/xAdcsDeploymentDsc/issues/33).
 - Fixed markdown rule violations in README.MD.
 - Change examples to meet HQRM standards and optin to Example validation
   tests.
@@ -199,23 +199,23 @@ For more information on Web Enrollment services, see [this article on TechNet](h
   - PULL_REQUEST_TEMPLATE.md
 - Resolved all PSScriptAnalyzer warnings and style guide warnings.
 - Converted all tests to meet Pester V4 guidelines - fixes
-  [issue #32](https://github.com/PowerShell/AdcsDeploymentDsc/issues/32).
+  [issue #32](https://github.com/PowerShell/xAdcsDeploymentDsc/issues/32).
 - Fixed spelling mistakes in README.MD.
 - Fix to ensure exception thrown if failed to install or uninstall service - fixes
-  [issue #3](https://github.com/PowerShell/AdcsDeploymentDsc/issues/3).
+  [issue #3](https://github.com/PowerShell/xAdcsDeploymentDsc/issues/3).
 - Converted AppVeyor.yml to use shared AppVeyor module in DSCResource.Tests - fixes
-  [issue #29](https://github.com/PowerShell/AdcsDeploymentDsc/issues/29).
+  [issue #29](https://github.com/PowerShell/xAdcsDeploymentDsc/issues/29).
 
 ### 1.2.0.0
 
-- AdcsWebEnrollment:
-  - AdcsWebEnrollment.psm1 - Change reference and variable from CAType to CAConfig
+- xAdcsWebEnrollment:
+  - xAdcsWebEnrollment.psm1 - Change reference and variable from CAType to CAConfig
 
 ### 1.1.0.0
 
 - Converted AppVeyor.yml to pull Pester from PSGallery instead of Chocolatey.
 - Changed AppVeyor.yml to use default image.
-- AdcsCertificateAuthority:
+- xAdcsCertificateAuthority:
   - Change property format in Readme.md to be standard layout.
   - Converted style to meet HQRM guidelines.
   - Added verbose logging support.
@@ -224,13 +224,13 @@ For more information on Web Enrollment services, see [this article on TechNet](h
     or not CA is installed.
   - Added unit tests.
   - Updated parameter format to meet HQRM guidelines.
-- AdcsOnlineResponder:
+- xAdcsOnlineResponder:
   - Change property format in Readme.md to be standard layout.
   - Added unit test header to be latest version.
   - Added function help.
   - Updated parameter format to meet HQRM guidelines.
   - Updated resource to meet HQRM guidelines.
-- AdcsWebEnrollment:
+- xAdcsWebEnrollment:
   - Change property format in Readme.md to be standard layout.
   - Added unit test header to be latest version.
   - Added function help.
@@ -247,10 +247,10 @@ For more information on Web Enrollment services, see [this article on TechNet](h
 - Moved Examples folder into root.
 - Removed legacy xCertificateServices folder.
 - Prevented Unit tests from Violating PSSA rules.
-- MSFT_AdcsWebEnrollment: Created unit tests based on v1.0 Test Template.
+- MSFT_xAdcsWebEnrollment: Created unit tests based on v1.0 Test Template.
                            Update to meet Style Guidelines and ensure consistency.
                            Updated to IsSingleInstance model. **Breaking change**
-- MSFT_AdcsOnlineResponder: Update Unit tests to use v1.0 Test Template.
+- MSFT_xAdcsOnlineResponder: Update Unit tests to use v1.0 Test Template.
                              Unit tests can be run without AD CS installed.
                              Update to meet Style Guidelines and ensure consistency.
 - Usage of WinRm.exe replaced in Config-SetupActiveDirectory.ps1 example file
@@ -259,12 +259,12 @@ For more information on Web Enrollment services, see [this article on TechNet](h
 ### 0.2.0.0
 
 - Added the following resources:
-  - MSFT_AdcsOnlineResponder resource to install the Online Responder service.
-- Correction to AdcsCertificationAuthority property title in Readme.md.
+  - MSFT_xAdcsOnlineResponder resource to install the Online Responder service.
+- Correction to xAdcsCertificationAuthority property title in Readme.md.
 - Addition of .gitignore to ensure DSCResource.Tests folder is committed.
 - Updated AppVeyor.yml to use WMF 5 build environment.
 
 ### 0.1.0.0
 
 - Initial release with the following resources
-  - AdcsCertificationAuthority and AdcsWebEnrollment.
+  - xAdcsCertificationAuthority and xAdcsWebEnrollment.
diff --git a/appveyor.yml b/appveyor.yml
index deb5e40..de888ac 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 #---------------------------------#
 #      environment configuration  #
 #---------------------------------#
-version: 2.0.{build}.0
+version: 1.1.{build}.0
 install:
     - git clone https://github.com/PowerShell/DscResource.Tests
 

From 5c9d419f87436cb4f0eca1cee2b7c94c3abc2b7e Mon Sep 17 00:00:00 2001
From: Daniel Scott-Raynsford <plagueho@gmail.com>
Date: Mon, 25 Dec 2017 08:07:59 +1300
Subject: [PATCH 5/8] Further corrections to README.MD to revert renaming in
 release log

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 105a9af..f90cec1 100644
--- a/README.md
+++ b/README.md
@@ -179,12 +179,12 @@ For more information on Web Enrollment services, see [this article on TechNet](h
 ### 1.4.0.0
 
 - xAdcsCertificateAuthority: CertFilePassword invalid type - fixes
-  [issue #36](https://github.com/PowerShell/xAdcsDeploymentDsc/issues/36)
+  [issue #36](https://github.com/PowerShell/xAdcsDeployment/issues/36)
 
 ### 1.3.0.0
 
 - Updated to meet HQRM guidelines - fixes
-  [issue #33](https://github.com/PowerShell/xAdcsDeploymentDsc/issues/33).
+  [issue #33](https://github.com/PowerShell/xAdcsDeployment/issues/33).
 - Fixed markdown rule violations in README.MD.
 - Change examples to meet HQRM standards and optin to Example validation
   tests.
@@ -199,12 +199,12 @@ For more information on Web Enrollment services, see [this article on TechNet](h
   - PULL_REQUEST_TEMPLATE.md
 - Resolved all PSScriptAnalyzer warnings and style guide warnings.
 - Converted all tests to meet Pester V4 guidelines - fixes
-  [issue #32](https://github.com/PowerShell/xAdcsDeploymentDsc/issues/32).
+  [issue #32](https://github.com/PowerShell/xAdcsDeployment/issues/32).
 - Fixed spelling mistakes in README.MD.
 - Fix to ensure exception thrown if failed to install or uninstall service - fixes
-  [issue #3](https://github.com/PowerShell/xAdcsDeploymentDsc/issues/3).
+  [issue #3](https://github.com/PowerShell/xAdcsDeployment/issues/3).
 - Converted AppVeyor.yml to use shared AppVeyor module in DSCResource.Tests - fixes
-  [issue #29](https://github.com/PowerShell/xAdcsDeploymentDsc/issues/29).
+  [issue #29](https://github.com/PowerShell/xAdcsDeployment/issues/29).
 
 ### 1.2.0.0
 
@@ -259,7 +259,7 @@ For more information on Web Enrollment services, see [this article on TechNet](h
 ### 0.2.0.0
 
 - Added the following resources:
-  - MSFT_xAdcsOnlineResponder resource to install the Online Responder service.
+  - MSFT_xADCSOnlineResponder resource to install the Online Responder service.
 - Correction to xAdcsCertificationAuthority property title in Readme.md.
 - Addition of .gitignore to ensure DSCResource.Tests folder is committed.
 - Updated AppVeyor.yml to use WMF 5 build environment.

From d07e2e6d25a0a677d894b2c483d2438db2a68e9d Mon Sep 17 00:00:00 2001
From: Daniel Scott-Raynsford <plagueho@gmail.com>
Date: Mon, 25 Dec 2017 08:12:54 +1300
Subject: [PATCH 6/8] Last revert to Release Note in manifest

---
 AdcsDeploymentDsc.psd1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AdcsDeploymentDsc.psd1 b/AdcsDeploymentDsc.psd1
index c49bec8..405e4ce 100644
--- a/AdcsDeploymentDsc.psd1
+++ b/AdcsDeploymentDsc.psd1
@@ -48,7 +48,7 @@
 
             # ReleaseNotes of this module
         ReleaseNotes = '- xAdcsCertificateAuthority: CertFilePassword invalid type - fixes
-  [issue 36](https://github.com/PowerShell/xAdcsDeploymentDsc/issues/36)
+  [issue 36](https://github.com/PowerShell/xAdcsDeployment/issues/36)
 
 '
         } # End of PSData hashtable

From f302054d735d8cdf43723c50e638b9a6b2f4d9e9 Mon Sep 17 00:00:00 2001
From: Daniel Scott-Raynsford <plagueho@gmail.com>
Date: Fri, 2 Feb 2018 21:09:34 +1300
Subject: [PATCH 7/8] Rename to ActiveDirectoryCSDsc

---
 ...DeploymentDsc.psd1 => ActiveDirectoryCSDsc.psd1 |  4 ++--
 .../MSFT_AdcsCertificationAuthority.psm1           |  4 ++--
 .../MSFT_AdcsOnlineResponder.psm1                  |  4 ++--
 .../MSFT_AdcsWebEnrollment.psm1                    |  4 ++--
 .../1-InstallCertificationAthority.ps1             |  2 +-
 .../2-RetireCertificationAthority.ps1              |  2 +-
 .../1-InstallOnlineResponder.ps1                   |  2 +-
 .../AdcsWebEnrollment/1-InstallWebEnrollment.ps1   |  2 +-
 .../ActiveDirectoryCSDsc.ResourceHelper.psm1}      |  0
 README.md                                          | 14 +++++++-------
 .../MSFT_AdcsCertificationAuthority.Tests.ps1      |  2 +-
 ...T_AdcsCertificationAuthority_Install.config.ps1 |  2 +-
 ...AdcsCertificationAuthority_Uninstall.config.ps1 |  2 +-
 .../Unit/MSFT_AdcsCertificationAuthority.Tests.ps1 |  2 +-
 Tests/Unit/MSFT_AdcsOnlineResponder.Tests.ps1      |  2 +-
 Tests/Unit/MSFT_AdcsWebEnrollment.Tests.ps1        |  2 +-
 16 files changed, 25 insertions(+), 25 deletions(-)
 rename AdcsDeploymentDsc.psd1 => ActiveDirectoryCSDsc.psd1 (91%)
 rename Modules/{AdcsDeploymentDsc.ResourceHelper/AdcsDeploymentDsc.ResourceHelper.psm1 => ActiveDirectoryCSDsc.ResourceHelper/ActiveDirectoryCSDsc.ResourceHelper.psm1} (100%)

diff --git a/AdcsDeploymentDsc.psd1 b/ActiveDirectoryCSDsc.psd1
similarity index 91%
rename from AdcsDeploymentDsc.psd1
rename to ActiveDirectoryCSDsc.psd1
index 405e4ce..0b7a627 100644
--- a/AdcsDeploymentDsc.psd1
+++ b/ActiveDirectoryCSDsc.psd1
@@ -38,10 +38,10 @@
             Tags         = @('DesiredStateConfiguration', 'DSC', 'DSCResourceKit', 'DSCResource')
 
             # A URL to the license for this module.
-            LicenseUri   = 'https://github.com/PowerShell/AdcsDeploymentDsc/blob/master/LICENSE'
+            LicenseUri   = 'https://github.com/PowerShell/ActiveDirectoryCSDsc/blob/master/LICENSE'
 
             # A URL to the main website for this project.
-            ProjectUri   = 'https://github.com/PowerShell/AdcsDeploymentDsc'
+            ProjectUri   = 'https://github.com/PowerShell/ActiveDirectoryCSDsc'
 
             # A URL to an icon representing this module.
             # IconUri = ''
diff --git a/DSCResources/MSFT_AdcsCertificationAuthority/MSFT_AdcsCertificationAuthority.psm1 b/DSCResources/MSFT_AdcsCertificationAuthority/MSFT_AdcsCertificationAuthority.psm1
index 0797ddb..b2a1165 100644
--- a/DSCResources/MSFT_AdcsCertificationAuthority/MSFT_AdcsCertificationAuthority.psm1
+++ b/DSCResources/MSFT_AdcsCertificationAuthority/MSFT_AdcsCertificationAuthority.psm1
@@ -2,8 +2,8 @@ $modulePath = Join-Path -Path (Split-Path -Path (Split-Path -Path $PSScriptRoot
 
 # Import the ADCS Deployment Resource Helper Module.
 Import-Module -Name (Join-Path -Path $modulePath `
-        -ChildPath (Join-Path -Path 'AdcsDeploymentDsc.ResourceHelper' `
-            -ChildPath 'AdcsDeploymentDsc.ResourceHelper.psm1'))
+        -ChildPath (Join-Path -Path 'ActiveDirectoryCSDsc.ResourceHelper' `
+            -ChildPath 'ActiveDirectoryCSDsc.ResourceHelper.psm1'))
 
 # Import Localization Strings.
 $LocalizedData = Get-LocalizedData `
diff --git a/DSCResources/MSFT_AdcsOnlineResponder/MSFT_AdcsOnlineResponder.psm1 b/DSCResources/MSFT_AdcsOnlineResponder/MSFT_AdcsOnlineResponder.psm1
index b8e719c..a110c08 100644
--- a/DSCResources/MSFT_AdcsOnlineResponder/MSFT_AdcsOnlineResponder.psm1
+++ b/DSCResources/MSFT_AdcsOnlineResponder/MSFT_AdcsOnlineResponder.psm1
@@ -2,8 +2,8 @@ $modulePath = Join-Path -Path (Split-Path -Path (Split-Path -Path $PSScriptRoot
 
 # Import the ADCS Deployment Resource Helper Module.
 Import-Module -Name (Join-Path -Path $modulePath `
-        -ChildPath (Join-Path -Path 'AdcsDeploymentDsc.ResourceHelper' `
-            -ChildPath 'AdcsDeploymentDsc.ResourceHelper.psm1'))
+        -ChildPath (Join-Path -Path 'ActiveDirectoryCSDsc.ResourceHelper' `
+            -ChildPath 'ActiveDirectoryCSDsc.ResourceHelper.psm1'))
 
 # Import Localization Strings.
 $LocalizedData = Get-LocalizedData `
diff --git a/DSCResources/MSFT_AdcsWebEnrollment/MSFT_AdcsWebEnrollment.psm1 b/DSCResources/MSFT_AdcsWebEnrollment/MSFT_AdcsWebEnrollment.psm1
index 355bca8..98d189c 100644
--- a/DSCResources/MSFT_AdcsWebEnrollment/MSFT_AdcsWebEnrollment.psm1
+++ b/DSCResources/MSFT_AdcsWebEnrollment/MSFT_AdcsWebEnrollment.psm1
@@ -2,8 +2,8 @@ $modulePath = Join-Path -Path (Split-Path -Path (Split-Path -Path $PSScriptRoot
 
 # Import the ADCS Deployment Resource Helper Module.
 Import-Module -Name (Join-Path -Path $modulePath `
-        -ChildPath (Join-Path -Path 'AdcsDeploymentDsc.ResourceHelper' `
-            -ChildPath 'AdcsDeploymentDsc.ResourceHelper.psm1'))
+        -ChildPath (Join-Path -Path 'ActiveDirectoryCSDsc.ResourceHelper' `
+            -ChildPath 'ActiveDirectoryCSDsc.ResourceHelper.psm1'))
 
 # Import Localization Strings.
 $LocalizedData = Get-LocalizedData `
diff --git a/Examples/Resources/AdcsCertificationAuthority/1-InstallCertificationAthority.ps1 b/Examples/Resources/AdcsCertificationAuthority/1-InstallCertificationAthority.ps1
index 8ebf2e2..4fc48ec 100644
--- a/Examples/Resources/AdcsCertificationAuthority/1-InstallCertificationAthority.ps1
+++ b/Examples/Resources/AdcsCertificationAuthority/1-InstallCertificationAthority.ps1
@@ -17,7 +17,7 @@ Configuration Example
         $Credential
     )
 
-    Import-DscResource -Module AdcsDeploymentDsc
+    Import-DscResource -Module ActiveDirectoryCSDsc
 
     Node $AllNodes.NodeName
     {
diff --git a/Examples/Resources/AdcsCertificationAuthority/2-RetireCertificationAthority.ps1 b/Examples/Resources/AdcsCertificationAuthority/2-RetireCertificationAthority.ps1
index d67eba1..6f07267 100644
--- a/Examples/Resources/AdcsCertificationAuthority/2-RetireCertificationAthority.ps1
+++ b/Examples/Resources/AdcsCertificationAuthority/2-RetireCertificationAthority.ps1
@@ -22,7 +22,7 @@ Configuration Example
         $Credential
     )
 
-    Import-DscResource -Module AdcsDeploymentDsc
+    Import-DscResource -Module ActiveDirectoryCSDsc
 
     Node $AllNodes.NodeName
     {
diff --git a/Examples/Resources/AdcsOnlineResponder/1-InstallOnlineResponder.ps1 b/Examples/Resources/AdcsOnlineResponder/1-InstallOnlineResponder.ps1
index 1343647..6f1c09f 100644
--- a/Examples/Resources/AdcsOnlineResponder/1-InstallOnlineResponder.ps1
+++ b/Examples/Resources/AdcsOnlineResponder/1-InstallOnlineResponder.ps1
@@ -18,7 +18,7 @@ Configuration Example
         $Credential
     )
 
-    Import-DscResource -Module AdcsDeploymentDsc
+    Import-DscResource -Module ActiveDirectoryCSDsc
 
     Node $AllNodes.NodeName
     {
diff --git a/Examples/Resources/AdcsWebEnrollment/1-InstallWebEnrollment.ps1 b/Examples/Resources/AdcsWebEnrollment/1-InstallWebEnrollment.ps1
index 67d7544..e2cede2 100644
--- a/Examples/Resources/AdcsWebEnrollment/1-InstallWebEnrollment.ps1
+++ b/Examples/Resources/AdcsWebEnrollment/1-InstallWebEnrollment.ps1
@@ -18,7 +18,7 @@ Configuration Example
         $Credential
     )
 
-    Import-DscResource -Module AdcsDeploymentDsc
+    Import-DscResource -Module ActiveDirectoryCSDsc
 
     Node $AllNodes.NodeName
     {
diff --git a/Modules/AdcsDeploymentDsc.ResourceHelper/AdcsDeploymentDsc.ResourceHelper.psm1 b/Modules/ActiveDirectoryCSDsc.ResourceHelper/ActiveDirectoryCSDsc.ResourceHelper.psm1
similarity index 100%
rename from Modules/AdcsDeploymentDsc.ResourceHelper/AdcsDeploymentDsc.ResourceHelper.psm1
rename to Modules/ActiveDirectoryCSDsc.ResourceHelper/ActiveDirectoryCSDsc.ResourceHelper.psm1
diff --git a/README.md b/README.md
index f90cec1..eb6d7bd 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# AdcsDeploymentDsc
+# ActiveDirectoryCSDsc
 
-The **AdcsDeploymentDscDsc** DSC resources have been specifically tested as a method
+The **ActiveDirectoryCSDsc** DSC resources have been specifically tested as a method
 to populate a Certificate Services server role on Windows Server 2012 R2 and above
 after the Certificate Services role and the Web Enrollment feature have been enabled.
 Active Directory Certificate Services (AD CS) is used to create certification
@@ -25,16 +25,16 @@ additional questions or comments.
 
 ### master
 
-[![Build status](https://ci.appveyor.com/api/projects/status/2uua9s0qgmfmqqrh/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/AdcsDeploymentDsc/branch/master)
-[![codecov](https://codecov.io/gh/PowerShell/AdcsDeploymentDsc/branch/master/graph/badge.svg)](https://codecov.io/gh/PowerShell/AdcsDeploymentDsc/branch/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/2uua9s0qgmfmqqrh/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/ActiveDirectoryCSDsc/branch/master)
+[![codecov](https://codecov.io/gh/PowerShell/ActiveDirectoryCSDsc/branch/master/graph/badge.svg)](https://codecov.io/gh/PowerShell/ActiveDirectoryCSDsc/branch/master)
 
 This is the branch containing the latest release - no contributions should be made
 directly to this branch.
 
 ### dev
 
-[![Build status](https://ci.appveyor.com/api/projects/status/2uua9s0qgmfmqqrh/branch/dev?svg=true)](https://ci.appveyor.com/project/PowerShell/AdcsDeploymentDsc/branch/dev)
-[![codecov](https://codecov.io/gh/PowerShell/AdcsDeploymentDsc/branch/dev/graph/badge.svg)](https://codecov.io/gh/PowerShell/AdcsDeploymentDsc/branch/dev)
+[![Build status](https://ci.appveyor.com/api/projects/status/2uua9s0qgmfmqqrh/branch/dev?svg=true)](https://ci.appveyor.com/project/PowerShell/ActiveDirectoryCSDsc/branch/dev)
+[![codecov](https://codecov.io/gh/PowerShell/ActiveDirectoryCSDsc/branch/dev/graph/badge.svg)](https://codecov.io/gh/PowerShell/ActiveDirectoryCSDsc/branch/dev)
 
 This is the development branch to which contributions should be proposed by contributors
 as pull requests. This development branch will periodically be merged to the master
@@ -174,7 +174,7 @@ For more information on Web Enrollment services, see [this article on TechNet](h
 
 ### Unreleased
 
-- BREAKING CHANGE: Renamed module to AdcsDeploymentDsc.
+- BREAKING CHANGE: Renamed module to ActiveDirectoryCSDsc.
 
 ### 1.4.0.0
 
diff --git a/Tests/Integration/MSFT_AdcsCertificationAuthority.Tests.ps1 b/Tests/Integration/MSFT_AdcsCertificationAuthority.Tests.ps1
index f168810..f754b67 100644
--- a/Tests/Integration/MSFT_AdcsCertificationAuthority.Tests.ps1
+++ b/Tests/Integration/MSFT_AdcsCertificationAuthority.Tests.ps1
@@ -14,7 +14,7 @@ param ()
 #>
 $script:adminUsername = 'AdcsAdmin'
 $script:adminPassword = 'NotPass12!'
-$script:DSCModuleName = 'AdcsDeploymentDsc'
+$script:DSCModuleName = 'ActiveDirectoryCSDsc'
 $script:DSCResourceName = 'MSFT_AdcsCertificationAuthority'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
diff --git a/Tests/Integration/MSFT_AdcsCertificationAuthority_Install.config.ps1 b/Tests/Integration/MSFT_AdcsCertificationAuthority_Install.config.ps1
index b4692a6..8cdb481 100644
--- a/Tests/Integration/MSFT_AdcsCertificationAuthority_Install.config.ps1
+++ b/Tests/Integration/MSFT_AdcsCertificationAuthority_Install.config.ps1
@@ -1,5 +1,5 @@
 configuration MSFT_AdcsCertificationAuthority_Install_Config {
-    Import-DscResource -ModuleName AdcsDeploymentDsc
+    Import-DscResource -ModuleName ActiveDirectoryCSDsc
 
     node localhost {
         AdcsCertificationAuthority Integration_Test {
diff --git a/Tests/Integration/MSFT_AdcsCertificationAuthority_Uninstall.config.ps1 b/Tests/Integration/MSFT_AdcsCertificationAuthority_Uninstall.config.ps1
index 7459727..09eaa2d 100644
--- a/Tests/Integration/MSFT_AdcsCertificationAuthority_Uninstall.config.ps1
+++ b/Tests/Integration/MSFT_AdcsCertificationAuthority_Uninstall.config.ps1
@@ -1,5 +1,5 @@
 configuration MSFT_AdcsCertificationAuthority_Uninstall_Config {
-    Import-DscResource -ModuleName AdcsDeploymentDsc
+    Import-DscResource -ModuleName ActiveDirectoryCSDsc
 
     node localhost {
         AdcsCertificationAuthority Integration_Test {
diff --git a/Tests/Unit/MSFT_AdcsCertificationAuthority.Tests.ps1 b/Tests/Unit/MSFT_AdcsCertificationAuthority.Tests.ps1
index 3bc9b0e..6134c20 100644
--- a/Tests/Unit/MSFT_AdcsCertificationAuthority.Tests.ps1
+++ b/Tests/Unit/MSFT_AdcsCertificationAuthority.Tests.ps1
@@ -1,4 +1,4 @@
-$script:DSCModuleName   = 'AdcsDeploymentDsc'
+$script:DSCModuleName   = 'ActiveDirectoryCSDsc'
 $script:DSCResourceName = 'MSFT_AdcsCertificationAuthority'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
diff --git a/Tests/Unit/MSFT_AdcsOnlineResponder.Tests.ps1 b/Tests/Unit/MSFT_AdcsOnlineResponder.Tests.ps1
index ccce81c..af9c327 100644
--- a/Tests/Unit/MSFT_AdcsOnlineResponder.Tests.ps1
+++ b/Tests/Unit/MSFT_AdcsOnlineResponder.Tests.ps1
@@ -1,4 +1,4 @@
-$script:DSCModuleName   = 'AdcsDeploymentDsc'
+$script:DSCModuleName   = 'ActiveDirectoryCSDsc'
 $script:DSCResourceName = 'MSFT_AdcsOnlineResponder'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
diff --git a/Tests/Unit/MSFT_AdcsWebEnrollment.Tests.ps1 b/Tests/Unit/MSFT_AdcsWebEnrollment.Tests.ps1
index f6466ff..35b3196 100644
--- a/Tests/Unit/MSFT_AdcsWebEnrollment.Tests.ps1
+++ b/Tests/Unit/MSFT_AdcsWebEnrollment.Tests.ps1
@@ -1,4 +1,4 @@
-$script:DSCModuleName = 'AdcsDeploymentDsc'
+$script:DSCModuleName = 'ActiveDirectoryCSDsc'
 $script:DSCResourceName = 'MSFT_AdcsWebEnrollment'
 
 Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global

From ccd0917f5f5f87d41f52bbd5b5a39b3b8e114b3a Mon Sep 17 00:00:00 2001
From: Daniel Scott-Raynsford <plagueho@gmail.com>
Date: Fri, 2 Feb 2018 21:24:20 +1300
Subject: [PATCH 8/8] Minor change to trigger tests

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eb6d7bd..0325d02 100644
--- a/README.md
+++ b/README.md
@@ -174,7 +174,8 @@ For more information on Web Enrollment services, see [this article on TechNet](h
 
 ### Unreleased
 
-- BREAKING CHANGE: Renamed module to ActiveDirectoryCSDsc.
+- BREAKING CHANGE: Renamed module to ActiveDirectoryCSDsc - see
+  [issue #38](https://github.com/PowerShell/xAdcsDeployment/issues/38)
 
 ### 1.4.0.0