diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj
index 510d978..ec6346d 100644
--- a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj	
+++ b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj	
@@ -93,7 +93,7 @@
     <Compile Include="Comm\TcpServerConfigObject.cs" />
     <Compile Include="Config\PortalConfigReader.cs" />
     <Compile Include="CoreInterfaces.cs" />
-    <Compile Include="Web\RequestHandlers\DefaultRequestRequestHandler.cs" />
+    <Compile Include="Web\RequestHandlers\DefaultRequestHandler.cs" />
     <Compile Include="Web\RequestHandlers\WebApiBaseRequestHandler.cs" />
     <Compile Include="Web\WebApiServer.cs" />
     <Compile Include="EventArgs.cs" />
diff --git a/Pepperdash Core/Pepperdash Core/Web/RequestHandlers/DefaultRequestRequestHandler.cs b/Pepperdash Core/Pepperdash Core/Web/RequestHandlers/DefaultRequestHandler.cs
similarity index 65%
rename from Pepperdash Core/Pepperdash Core/Web/RequestHandlers/DefaultRequestRequestHandler.cs
rename to Pepperdash Core/Pepperdash Core/Web/RequestHandlers/DefaultRequestHandler.cs
index a2ea2c0..93cfae0 100644
--- a/Pepperdash Core/Pepperdash Core/Web/RequestHandlers/DefaultRequestRequestHandler.cs	
+++ b/Pepperdash Core/Pepperdash Core/Web/RequestHandlers/DefaultRequestHandler.cs	
@@ -5,12 +5,12 @@ namespace PepperDash.Core.Web.RequestHandlers
 	/// <summary>
 	/// Web API default request handler
 	/// </summary>
-	public class DefaultRequestRequestHandler : WebApiBaseRequestHandler
+	public class DefaultRequestHandler : WebApiBaseRequestHandler
 	{
 		/// <summary>
 		/// Constructor
 		/// </summary>
-		public DefaultRequestRequestHandler()
+		public DefaultRequestHandler()
 			: base(true)
 		{ }
 	}
diff --git a/Pepperdash Core/Pepperdash Core/Web/RequestHandlers/WebApiBaseRequestHandler.cs b/Pepperdash Core/Pepperdash Core/Web/RequestHandlers/WebApiBaseRequestHandler.cs
index 22d9d23..a73abd1 100644
--- a/Pepperdash Core/Pepperdash Core/Web/RequestHandlers/WebApiBaseRequestHandler.cs	
+++ b/Pepperdash Core/Pepperdash Core/Web/RequestHandlers/WebApiBaseRequestHandler.cs	
@@ -10,6 +10,7 @@ namespace PepperDash.Core.Web.RequestHandlers
 	public abstract class WebApiBaseRequestHandler : IHttpCwsHandler
 	{
 		private readonly Dictionary<string, Action<HttpCwsContext>> _handlers;
+		protected readonly bool EnableCors;
 
 		/// <summary>
 		/// Constructor
@@ -38,9 +39,7 @@ namespace PepperDash.Core.Web.RequestHandlers
 		protected WebApiBaseRequestHandler()
 			: this(false)
 		{
-		}
-
-		protected readonly bool EnableCors;
+		}		
 
 		/// <summary>
 		/// Handles CONNECT method requests
diff --git a/Pepperdash Core/Pepperdash Core/Web/WebApiServer.cs b/Pepperdash Core/Pepperdash Core/Web/WebApiServer.cs
index 43efb5b..f2f8464 100644
--- a/Pepperdash Core/Pepperdash Core/Web/WebApiServer.cs	
+++ b/Pepperdash Core/Pepperdash Core/Web/WebApiServer.cs	
@@ -100,7 +100,7 @@ namespace PepperDash.Core.Web
 			if (_server == null) _server = new HttpCwsServer(BasePath);
 
 			_server.setProcessName(Key);
-			_server.HttpRequestHandler = new DefaultRequestRequestHandler();
+			_server.HttpRequestHandler = new DefaultRequestHandler();
 
 			CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironment_ProgramStatusEventHandler;
 			CrestronEnvironment.EthernetEventHandler += CrestronEnvironment_EthernetEventHandler;