diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index 669a09ac..0bca7181 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
@@ -1073,7 +1073,7 @@ ConnectorID: {2}"
                         CodecStatus.Status.RoomPreset = existingRoomPresets;
 
                         // Generecise the list
-                        NearEndPresets = RoomPresets.GetGenericPresets(existingRoomPresets).Select(a =>(CodecRoomPreset)a).ToList();
+                        NearEndPresets = existingRoomPresets.GetGenericPresets<CodecRoomPreset>();
 
                         var handler = CodecRoomPresetsListHasChanged;
                         if (handler != null)
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/RoomPresets.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/RoomPresets.cs
index 1cf9acdf..4fec0d89 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/RoomPresets.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/RoomPresets.cs	
@@ -32,14 +32,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         /// </summary>
         /// <param name="presets"></param>
         /// <returns></returns>
-        public static List<PresetBase> GetGenericPresets(List<IConvertiblePreset> presets)
+        public static List<T> GetGenericPresets<T>(this List<IConvertiblePreset> presets)
         {
-            Debug.Console(2, "Presets List:");
-
-
             return
-                presets.Select(preset => preset.ReturnConvertedCodecPreset())
+                presets.Select(preset => preset.ConvertCodecPreset())
                     .Where(newPreset => newPreset != null)
+                    .Cast<T>()
                     .ToList();
         }
     }
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs
index 2c84cba8..23e8c6ab 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs	
@@ -2200,7 +2200,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 Type = new Type5();
             }
 
-            public PresetBase ReturnConvertedCodecPreset()
+            public PresetBase ConvertCodecPreset()
             {
                     try
                     {
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/IConvertiblePreset.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/IConvertiblePreset.cs
index 7c3695aa..f6f3f74f 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/IConvertiblePreset.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/IConvertiblePreset.cs	
@@ -4,6 +4,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 {
     public interface IConvertiblePreset
     {
-        PresetBase ReturnConvertedCodecPreset();
+        PresetBase ConvertCodecPreset();
     }
 }
\ No newline at end of file
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 202a6a5b..c7579f0b 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -2000,8 +2000,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
     /// </summary>
     public class CodecCommandWithLabel
     {
-        public string Command { get; set; }
-        public string Label { get; set; }
+        public string Command { get; private set; }
+        public string Label { get; private set; }
 
         public CodecCommandWithLabel(string command, string label)
         {