diff --git a/essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs b/essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs
index da5f615e..b3486ce3 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs	
@@ -261,7 +261,7 @@ namespace PepperDash.Essentials.DM.AirMedia
 
     }
 
-    public class AirMediaControllerFactory : EssentialsDeviceFactory<GenericComm>
+    public class AirMediaControllerFactory : EssentialsDeviceFactory<AirMediaController>
     {
         public AirMediaControllerFactory()
         {
diff --git a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs
index f25071c7..e0a6a7a9 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs	
@@ -1277,7 +1277,7 @@ namespace PepperDash.Essentials.DM
         }
     }
 
-    public class DmChassisControllerFactory : EssentialsDeviceFactory<GenericComm>
+    public class DmChassisControllerFactory : EssentialsDeviceFactory<DmChassisController>
     {
         public DmChassisControllerFactory()
         {
diff --git a/essentials-framework/Essentials DM/Essentials_DM/DmLite/HdMdxxxCEController.cs b/essentials-framework/Essentials DM/Essentials_DM/DmLite/HdMdxxxCEController.cs
index bb5c8a48..61b4f973 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/DmLite/HdMdxxxCEController.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/DmLite/HdMdxxxCEController.cs	
@@ -271,7 +271,7 @@ namespace PepperDash.Essentials.DM
         public ControlPropertiesConfig Control { get; set; }
     }
 
-    public class HdMdxxxCEControllerFactory : EssentialsDeviceFactory<GenericComm>
+    public class HdMdxxxCEControllerFactory : EssentialsDeviceFactory<HdMdxxxCEController>
     {
         public HdMdxxxCEControllerFactory()
         {
diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs
index 5aebad76..c8a849c9 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs	
@@ -283,7 +283,7 @@ namespace PepperDash.Essentials.DM
 		}
 	}
 
-    public class DmRmcControllerFactory : EssentialsDeviceFactory<GenericComm>
+    public class DmRmcControllerFactory : EssentialsDeviceFactory<DmRmcControllerBase>
     {
         public DmRmcControllerFactory()
         {
diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs
index 87c31fb9..cd6c72e6 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs	
@@ -323,7 +323,7 @@ namespace PepperDash.Essentials.DM
         }
 	}
 
-    public class DmTxControllerFactory : EssentialsDeviceFactory<GenericComm>
+    public class DmTxControllerFactory : EssentialsDeviceFactory<DmTxControllerBase>
     {
         public DmTxControllerFactory()
         {