diff --git a/digicert-certcentral-anycagateway.sln b/digicert-certcentral-anycagateway.sln
index 7031118..9b27dac 100644
--- a/digicert-certcentral-anycagateway.sln
+++ b/digicert-certcentral-anycagateway.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.6.33815.320
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "digicert-certcentral-anycagateway", "digicert-certcentral-anycagateway\digicert-certcentral-anycagateway.csproj", "{434D1E74-8EE7-4CC6-BAEC-62D224022F5F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "digicert-certcentral-caplugin", "digicert-certcentral-anycagateway\digicert-certcentral-caplugin.csproj", "{434D1E74-8EE7-4CC6-BAEC-62D224022F5F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/digicert-certcentral-anycagateway/API/CertCentralAPIBase.cs b/digicert-certcentral-anycagateway/API/CertCentralAPIBase.cs
index 4fc46b0..f920e5e 100644
--- a/digicert-certcentral-anycagateway/API/CertCentralAPIBase.cs
+++ b/digicert-certcentral-anycagateway/API/CertCentralAPIBase.cs
@@ -1,4 +1,4 @@
-using Keyfactor.Extensions.CAGateway.DigiCert.Models;
+using Keyfactor.Extensions.CAPlugin.DigiCert.Models;
 using Newtonsoft.Json;
 
 using System;
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
     public abstract class CertCentralBaseResponse
 	{
diff --git a/digicert-certcentral-anycagateway/API/CertificateChain.cs b/digicert-certcentral-anycagateway/API/CertificateChain.cs
index 2e0fd50..f4f2c8a 100644
--- a/digicert-certcentral-anycagateway/API/CertificateChain.cs
+++ b/digicert-certcentral-anycagateway/API/CertificateChain.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	public class CertificateChainRequest : CertCentralBaseRequest
 	{
diff --git a/digicert-certcentral-anycagateway/API/CertificateTypeDetails.cs b/digicert-certcentral-anycagateway/API/CertificateTypeDetails.cs
index 60a439b..0a18667 100644
--- a/digicert-certcentral-anycagateway/API/CertificateTypeDetails.cs
+++ b/digicert-certcentral-anycagateway/API/CertificateTypeDetails.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using System.Web;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	/// <summary>
 	/// Request to get the details for a specific certificate type.
diff --git a/digicert-certcentral-anycagateway/API/CertificateTypes.cs b/digicert-certcentral-anycagateway/API/CertificateTypes.cs
index 6dc3b81..6b14338 100644
--- a/digicert-certcentral-anycagateway/API/CertificateTypes.cs
+++ b/digicert-certcentral-anycagateway/API/CertificateTypes.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	/// <summary>
 	/// Request to get a certificate type.
diff --git a/digicert-certcentral-anycagateway/API/CheckDCV.cs b/digicert-certcentral-anycagateway/API/CheckDCV.cs
index f9ce0d8..63f6d37 100644
--- a/digicert-certcentral-anycagateway/API/CheckDCV.cs
+++ b/digicert-certcentral-anycagateway/API/CheckDCV.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	public class DVCheckDCVRequest : CertCentralBaseRequest
 	{
diff --git a/digicert-certcentral-anycagateway/API/DownloadCertificateByFormat.cs b/digicert-certcentral-anycagateway/API/DownloadCertificateByFormat.cs
index d9b4c72..fbe0fe2 100644
--- a/digicert-certcentral-anycagateway/API/DownloadCertificateByFormat.cs
+++ b/digicert-certcentral-anycagateway/API/DownloadCertificateByFormat.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	public class DownloadCertificateByFormatRequest : CertCentralBaseRequest
 	{
diff --git a/digicert-certcentral-anycagateway/API/ListCertificateOrders.cs b/digicert-certcentral-anycagateway/API/ListCertificateOrders.cs
index 3a5dafe..b9d670e 100644
--- a/digicert-certcentral-anycagateway/API/ListCertificateOrders.cs
+++ b/digicert-certcentral-anycagateway/API/ListCertificateOrders.cs
@@ -1,4 +1,4 @@
-using Keyfactor.Extensions.CAGateway.DigiCert.Models;
+using Keyfactor.Extensions.CAPlugin.DigiCert.Models;
 using Newtonsoft.Json;
 
 using System;
@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using System.Web;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	public class ListCertificateOrdersRequest : CertCentralBaseRequest
 	{
diff --git a/digicert-certcentral-anycagateway/API/ListContainers.cs b/digicert-certcentral-anycagateway/API/ListContainers.cs
index eaaf2d1..dc1e72f 100644
--- a/digicert-certcentral-anycagateway/API/ListContainers.cs
+++ b/digicert-certcentral-anycagateway/API/ListContainers.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	/// <summary>
 	/// Request to get the containers available.
diff --git a/digicert-certcentral-anycagateway/API/ListDomains.cs b/digicert-certcentral-anycagateway/API/ListDomains.cs
index 58f848a..5023746 100644
--- a/digicert-certcentral-anycagateway/API/ListDomains.cs
+++ b/digicert-certcentral-anycagateway/API/ListDomains.cs
@@ -1,4 +1,4 @@
-using Keyfactor.Extensions.CAGateway.DigiCert.Models;
+using Keyfactor.Extensions.CAPlugin.DigiCert.Models;
 using Microsoft.VisualBasic;
 using Newtonsoft.Json;
 
@@ -9,7 +9,7 @@
 using System.Threading.Tasks;
 using System.Web;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
     public class ListDomainsRequest : CertCentralBaseRequest
 	{
diff --git a/digicert-certcentral-anycagateway/API/ListDuplicates.cs b/digicert-certcentral-anycagateway/API/ListDuplicates.cs
index 2c0e8c6..d91c324 100644
--- a/digicert-certcentral-anycagateway/API/ListDuplicates.cs
+++ b/digicert-certcentral-anycagateway/API/ListDuplicates.cs
@@ -1,4 +1,4 @@
-using Keyfactor.Extensions.CAGateway.DigiCert.Models;
+using Keyfactor.Extensions.CAPlugin.DigiCert.Models;
 
 using Newtonsoft.Json;
 
@@ -8,7 +8,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	public class ListDuplicatesRequest : CertCentralBaseRequest
 	{
diff --git a/digicert-certcentral-anycagateway/API/ListMetadata.cs b/digicert-certcentral-anycagateway/API/ListMetadata.cs
index 6c4616b..d9713fc 100644
--- a/digicert-certcentral-anycagateway/API/ListMetadata.cs
+++ b/digicert-certcentral-anycagateway/API/ListMetadata.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	/// <summary>
 	/// Request to get the metadata fields available.
diff --git a/digicert-certcentral-anycagateway/API/ListOrganizations.cs b/digicert-certcentral-anycagateway/API/ListOrganizations.cs
index 7fe32af..4e225ff 100644
--- a/digicert-certcentral-anycagateway/API/ListOrganizations.cs
+++ b/digicert-certcentral-anycagateway/API/ListOrganizations.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using System.Web;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	public class ListOrganizationsRequest : CertCentralBaseRequest
 	{
diff --git a/digicert-certcentral-anycagateway/API/ListReissues.cs b/digicert-certcentral-anycagateway/API/ListReissues.cs
index e3fdf6c..e81b0ee 100644
--- a/digicert-certcentral-anycagateway/API/ListReissues.cs
+++ b/digicert-certcentral-anycagateway/API/ListReissues.cs
@@ -1,4 +1,4 @@
-using Keyfactor.Extensions.CAGateway.DigiCert.Models;
+using Keyfactor.Extensions.CAPlugin.DigiCert.Models;
 using Newtonsoft.Json;
 
 using System;
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	public class ListReissueRequest : CertCentralBaseRequest
 	{
diff --git a/digicert-certcentral-anycagateway/API/ListRequests.cs b/digicert-certcentral-anycagateway/API/ListRequests.cs
index a9d76e6..b692bc7 100644
--- a/digicert-certcentral-anycagateway/API/ListRequests.cs
+++ b/digicert-certcentral-anycagateway/API/ListRequests.cs
@@ -1,4 +1,4 @@
-using Keyfactor.Extensions.CAGateway.DigiCert.Models;
+using Keyfactor.Extensions.CAPlugin.DigiCert.Models;
 using Newtonsoft.Json;
 
 using System;
@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using System.Web;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	public class ListRequestsRequest : CertCentralBaseRequest
 	{
diff --git a/digicert-certcentral-anycagateway/API/OrderCertificate.cs b/digicert-certcentral-anycagateway/API/OrderCertificate.cs
index 0bed442..9f82ea8 100644
--- a/digicert-certcentral-anycagateway/API/OrderCertificate.cs
+++ b/digicert-certcentral-anycagateway/API/OrderCertificate.cs
@@ -1,4 +1,4 @@
-using Keyfactor.Extensions.CAGateway.DigiCert.Models;
+using Keyfactor.Extensions.CAPlugin.DigiCert.Models;
 using Microsoft.VisualBasic;
 using Newtonsoft.Json;
 
@@ -10,7 +10,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	public class OrderRequest : CertCentralBaseRequest
 	{
diff --git a/digicert-certcentral-anycagateway/API/Reissue.cs b/digicert-certcentral-anycagateway/API/Reissue.cs
index 696390c..432ea3b 100644
--- a/digicert-certcentral-anycagateway/API/Reissue.cs
+++ b/digicert-certcentral-anycagateway/API/Reissue.cs
@@ -1,4 +1,4 @@
-using Keyfactor.Extensions.CAGateway.DigiCert.Models;
+using Keyfactor.Extensions.CAPlugin.DigiCert.Models;
 using Newtonsoft.Json;
 
 using System;
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	[Serializable]
 	public class ReissueRequest : CertCentralBaseRequest
diff --git a/digicert-certcentral-anycagateway/API/RevokeCertificate.cs b/digicert-certcentral-anycagateway/API/RevokeCertificate.cs
index 6d180cf..11cbe09 100644
--- a/digicert-certcentral-anycagateway/API/RevokeCertificate.cs
+++ b/digicert-certcentral-anycagateway/API/RevokeCertificate.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using System.Web;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	public class RevokeCertificateRequest : CertCentralBaseRequest
 	{
diff --git a/digicert-certcentral-anycagateway/API/StatusChanges.cs b/digicert-certcentral-anycagateway/API/StatusChanges.cs
index eaced16..c277224 100644
--- a/digicert-certcentral-anycagateway/API/StatusChanges.cs
+++ b/digicert-certcentral-anycagateway/API/StatusChanges.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	public class StatusChangesRequest : CertCentralBaseRequest
 	{
diff --git a/digicert-certcentral-anycagateway/API/UpdateRequestStatus.cs b/digicert-certcentral-anycagateway/API/UpdateRequestStatus.cs
index 66113d2..93ab5c3 100644
--- a/digicert-certcentral-anycagateway/API/UpdateRequestStatus.cs
+++ b/digicert-certcentral-anycagateway/API/UpdateRequestStatus.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	public class UpdateRequestStatusRequest : CertCentralBaseRequest
 	{
diff --git a/digicert-certcentral-anycagateway/API/ViewCertificateOrder.cs b/digicert-certcentral-anycagateway/API/ViewCertificateOrder.cs
index 3a423f0..a61f326 100644
--- a/digicert-certcentral-anycagateway/API/ViewCertificateOrder.cs
+++ b/digicert-certcentral-anycagateway/API/ViewCertificateOrder.cs
@@ -1,4 +1,4 @@
-using Keyfactor.Extensions.CAGateway.DigiCert.Models;
+using Keyfactor.Extensions.CAPlugin.DigiCert.Models;
 using Newtonsoft.Json;
 
 using System;
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.API
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.API
 {
 	public class ViewCertificateOrderRequest : CertCentralBaseRequest
 	{
diff --git a/digicert-certcentral-anycagateway/CertCentralCAConnector.cs b/digicert-certcentral-anycagateway/CertCentralCAPlugin.cs
similarity index 99%
rename from digicert-certcentral-anycagateway/CertCentralCAConnector.cs
rename to digicert-certcentral-anycagateway/CertCentralCAPlugin.cs
index 6a0c211..646d81a 100644
--- a/digicert-certcentral-anycagateway/CertCentralCAConnector.cs
+++ b/digicert-certcentral-anycagateway/CertCentralCAPlugin.cs
@@ -1,9 +1,9 @@
 using Keyfactor.AnyGateway.Extensions;
 using Keyfactor.Common;
 using Keyfactor.Common.Exceptions;
-using Keyfactor.Extensions.CAGateway.DigiCert.API;
-using Keyfactor.Extensions.CAGateway.DigiCert.Client;
-using Keyfactor.Extensions.CAGateway.DigiCert.Models;
+using Keyfactor.Extensions.CAPlugin.DigiCert.API;
+using Keyfactor.Extensions.CAPlugin.DigiCert.Client;
+using Keyfactor.Extensions.CAPlugin.DigiCert.Models;
 using Keyfactor.Logging;
 using Keyfactor.PKI.Enums;
 
@@ -20,11 +20,11 @@
 
 using static Keyfactor.PKI.PKIConstants.Microsoft;
 
-using CertCentralConstants = Keyfactor.Extensions.CAGateway.DigiCert.Constants;
+using CertCentralConstants = Keyfactor.Extensions.CAPlugin.DigiCert.Constants;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert
+namespace Keyfactor.Extensions.CAPlugin.DigiCert
 {
-	public class CertCentralCAConnector : IAnyCAPlugin
+	public class CertCentralCAPlugin : IAnyCAPlugin
 	{
 		private CertCentralConfig _config;
 		private readonly ILogger _logger;
@@ -32,9 +32,9 @@ public class CertCentralCAConnector : IAnyCAPlugin
 
 		private Dictionary<int, string> DCVTokens { get; } = new Dictionary<int, string>();
 
-		public CertCentralCAConnector()
+		public CertCentralCAPlugin()
 		{
-			_logger = LogHandler.GetClassLogger<CertCentralCAConnector>();
+			_logger = LogHandler.GetClassLogger<CertCentralCAPlugin>();
 		}
 		public void Initialize(IAnyCAPluginConfigProvider configProvider, ICertificateDataReader certificateDataReader)
 		{
diff --git a/digicert-certcentral-anycagateway/CertCentralConfig.cs b/digicert-certcentral-anycagateway/CertCentralConfig.cs
index 61c03fd..ed0320f 100644
--- a/digicert-certcentral-anycagateway/CertCentralConfig.cs
+++ b/digicert-certcentral-anycagateway/CertCentralConfig.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert
+namespace Keyfactor.Extensions.CAPlugin.DigiCert
 {
 	public class CertCentralConfig
 	{
diff --git a/digicert-certcentral-anycagateway/Client/CertCentralClient.cs b/digicert-certcentral-anycagateway/Client/CertCentralClient.cs
index ae1e5b4..c700a3c 100644
--- a/digicert-certcentral-anycagateway/Client/CertCentralClient.cs
+++ b/digicert-certcentral-anycagateway/Client/CertCentralClient.cs
@@ -1,5 +1,5 @@
-using Keyfactor.Extensions.CAGateway.DigiCert.API;
-using Keyfactor.Extensions.CAGateway.DigiCert.Models;
+using Keyfactor.Extensions.CAPlugin.DigiCert.API;
+using Keyfactor.Extensions.CAPlugin.DigiCert.Models;
 using Keyfactor.Logging;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
@@ -14,7 +14,7 @@
 
 using static Keyfactor.PKI.X509.X509Utilities;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.Client
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.Client
 {
     public class CertCentralCredentials
 	{
diff --git a/digicert-certcentral-anycagateway/Client/CertCentralClientUtilities.cs b/digicert-certcentral-anycagateway/Client/CertCentralClientUtilities.cs
index ab62f24..597bd0b 100644
--- a/digicert-certcentral-anycagateway/Client/CertCentralClientUtilities.cs
+++ b/digicert-certcentral-anycagateway/Client/CertCentralClientUtilities.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.Client
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.Client
 {
 	/// <summary>
 	/// Static class containing some utility methods for the cert central client.
@@ -17,7 +17,7 @@ public static class CertCentralClientUtilities
 		/// <summary>
 		/// Private instance of the logger.
 		/// </summary>
-		private static ILogger Logger => LogHandler.GetClassLogger<CertCentralCAConnector>();
+		private static ILogger Logger => LogHandler.GetClassLogger<CertCentralCAPlugin>();
 
 		/// <summary>
 		/// Uses the <see cref="CertCentralConfig"/> to build a DigiCert client.
diff --git a/digicert-certcentral-anycagateway/Client/Conversions.cs b/digicert-certcentral-anycagateway/Client/Conversions.cs
index 2d9cbe8..a53c0e9 100644
--- a/digicert-certcentral-anycagateway/Client/Conversions.cs
+++ b/digicert-certcentral-anycagateway/Client/Conversions.cs
@@ -10,7 +10,7 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.Client
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.Client
 {
 	public class Conversions
 	{
diff --git a/digicert-certcentral-anycagateway/Constants.cs b/digicert-certcentral-anycagateway/Constants.cs
index 25964b4..44aa10b 100644
--- a/digicert-certcentral-anycagateway/Constants.cs
+++ b/digicert-certcentral-anycagateway/Constants.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert
+namespace Keyfactor.Extensions.CAPlugin.DigiCert
 {
 	public class Constants
 	{
diff --git a/digicert-certcentral-anycagateway/Models/CertCentralCertType.cs b/digicert-certcentral-anycagateway/Models/CertCentralCertType.cs
index f804aa5..ce3882d 100644
--- a/digicert-certcentral-anycagateway/Models/CertCentralCertType.cs
+++ b/digicert-certcentral-anycagateway/Models/CertCentralCertType.cs
@@ -1,5 +1,5 @@
-using Keyfactor.Extensions.CAGateway.DigiCert.API;
-using Keyfactor.Extensions.CAGateway.DigiCert.Client;
+using Keyfactor.Extensions.CAPlugin.DigiCert.API;
+using Keyfactor.Extensions.CAPlugin.DigiCert.Client;
 using Keyfactor.Logging;
 using Microsoft.Extensions.Logging;
 
@@ -9,7 +9,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.Models
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.Models
 {
     public class CertCentralCertType
     {
diff --git a/digicert-certcentral-anycagateway/Models/CertificateOrder.cs b/digicert-certcentral-anycagateway/Models/CertificateOrder.cs
index 6cd0569..a06f04c 100644
--- a/digicert-certcentral-anycagateway/Models/CertificateOrder.cs
+++ b/digicert-certcentral-anycagateway/Models/CertificateOrder.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.Models
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.Models
 {
 	public class CertificateOrder
 	{
diff --git a/digicert-certcentral-anycagateway/Models/Contact.cs b/digicert-certcentral-anycagateway/Models/Contact.cs
index 3106b92..82601b0 100644
--- a/digicert-certcentral-anycagateway/Models/Contact.cs
+++ b/digicert-certcentral-anycagateway/Models/Contact.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.Models
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.Models
 {
 	public class User : Contact
 	{
diff --git a/digicert-certcentral-anycagateway/Models/Error.cs b/digicert-certcentral-anycagateway/Models/Error.cs
index 1ebf365..e963096 100644
--- a/digicert-certcentral-anycagateway/Models/Error.cs
+++ b/digicert-certcentral-anycagateway/Models/Error.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.Models
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.Models
 {
     public class Error
     {
diff --git a/digicert-certcentral-anycagateway/Models/IdInformation.cs b/digicert-certcentral-anycagateway/Models/IdInformation.cs
index 90d91fc..506aff3 100644
--- a/digicert-certcentral-anycagateway/Models/IdInformation.cs
+++ b/digicert-certcentral-anycagateway/Models/IdInformation.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.Models
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.Models
 {
     public class IdInformation
     {
diff --git a/digicert-certcentral-anycagateway/Models/Product.cs b/digicert-certcentral-anycagateway/Models/Product.cs
index 901049c..d866b33 100644
--- a/digicert-certcentral-anycagateway/Models/Product.cs
+++ b/digicert-certcentral-anycagateway/Models/Product.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.Models
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.Models
 {
 	public class Product
 	{
diff --git a/digicert-certcentral-anycagateway/Models/RequestSummary.cs b/digicert-certcentral-anycagateway/Models/RequestSummary.cs
index aafc83e..1c015ba 100644
--- a/digicert-certcentral-anycagateway/Models/RequestSummary.cs
+++ b/digicert-certcentral-anycagateway/Models/RequestSummary.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert.Models
+namespace Keyfactor.Extensions.CAPlugin.DigiCert.Models
 {
 	public class RequestSummary
 	{
diff --git a/digicert-certcentral-anycagateway/Utilities.cs b/digicert-certcentral-anycagateway/Utilities.cs
index a7e6f0f..ef6a598 100644
--- a/digicert-certcentral-anycagateway/Utilities.cs
+++ b/digicert-certcentral-anycagateway/Utilities.cs
@@ -5,7 +5,7 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
-namespace Keyfactor.Extensions.CAGateway.DigiCert
+namespace Keyfactor.Extensions.CAPlugin.DigiCert
 {
 	public static class Utilities
 	{
diff --git a/digicert-certcentral-anycagateway/digicert-certcentral-anycagateway.csproj b/digicert-certcentral-anycagateway/digicert-certcentral-caplugin.csproj
similarity index 83%
rename from digicert-certcentral-anycagateway/digicert-certcentral-anycagateway.csproj
rename to digicert-certcentral-anycagateway/digicert-certcentral-caplugin.csproj
index c96dcd7..95884fa 100644
--- a/digicert-certcentral-anycagateway/digicert-certcentral-anycagateway.csproj
+++ b/digicert-certcentral-anycagateway/digicert-certcentral-caplugin.csproj
@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>Keyfactor.Extensions.CAGateway.DigiCert</RootNamespace>
+    <RootNamespace>Keyfactor.Extensions.CAPlugin.DigiCert</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
-    <AssemblyName>DigicertCAGateway</AssemblyName>
+    <AssemblyName>DigicertCAPlugin</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>