diff --git a/Source/Editor/CustomEditors/Editors/ActorStaticFlagsEditor.cs b/Source/Editor/CustomEditors/Editors/ActorStaticFlagsEditor.cs
index 86dd45812..cf649552a 100644
--- a/Source/Editor/CustomEditors/Editors/ActorStaticFlagsEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/ActorStaticFlagsEditor.cs
@@ -23,7 +23,7 @@ namespace FlaxEditor.CustomEditors.Editors
         /// <inheritdoc />
         protected override void OnValueChanged()
         {
-            var value = (StaticFlags)element.EnumComboBox.EnumTypeValue;
+            var value = (StaticFlags)element.ComboBox.EnumTypeValue;
 
             // If selected is single actor that has children, ask if apply flags to the sub objects as well
             if (Values.IsSingleObject && (StaticFlags)Values[0] != value && ParentEditor.Values[0] is Actor actor && actor.HasChildren)
diff --git a/Source/Editor/CustomEditors/Editors/EnumEditor.cs b/Source/Editor/CustomEditors/Editors/EnumEditor.cs
index e277324e5..7954e18bf 100644
--- a/Source/Editor/CustomEditors/Editors/EnumEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/EnumEditor.cs
@@ -40,7 +40,7 @@ namespace FlaxEditor.CustomEditors.Editors
             {
                 var enumType = Values.Type.Type != typeof(object) || Values[0] == null ? TypeUtils.GetType(Values.Type) : Values[0].GetType();
                 element = layout.Enum(enumType, null, mode);
-                element.EnumComboBox.ValueChanged += OnValueChanged;
+                element.ComboBox.ValueChanged += OnValueChanged;
             }
         }
 
@@ -49,7 +49,7 @@ namespace FlaxEditor.CustomEditors.Editors
         /// </summary>
         protected virtual void OnValueChanged()
         {
-            SetValue(element.EnumComboBox.EnumTypeValue);
+            SetValue(element.ComboBox.EnumTypeValue);
         }
 
         /// <inheritdoc />
@@ -63,7 +63,7 @@ namespace FlaxEditor.CustomEditors.Editors
             }
             else
             {
-                element.EnumComboBox.EnumTypeValue = Values[0];
+                element.ComboBox.EnumTypeValue = Values[0];
             }
         }
     }
diff --git a/Source/Editor/CustomEditors/Elements/EnumElement.cs b/Source/Editor/CustomEditors/Elements/EnumElement.cs
index 27b4dfdb9..be4085f40 100644
--- a/Source/Editor/CustomEditors/Elements/EnumElement.cs
+++ b/Source/Editor/CustomEditors/Elements/EnumElement.cs
@@ -16,7 +16,7 @@ namespace FlaxEditor.CustomEditors.Elements
         /// <summary>
         /// The combo box used to show enum values.
         /// </summary>
-        public EnumComboBox EnumComboBox;
+        public EnumComboBox ComboBox;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumElement"/> class.
@@ -26,10 +26,10 @@ namespace FlaxEditor.CustomEditors.Elements
         /// <param name="formatMode">The formatting mode.</param>
         public EnumElement(Type type, EnumComboBox.BuildEntriesDelegate customBuildEntriesDelegate = null, EnumDisplayAttribute.FormatMode formatMode = EnumDisplayAttribute.FormatMode.Default)
         {
-            EnumComboBox = new EnumComboBox(type, customBuildEntriesDelegate, formatMode);
+            ComboBox = new EnumComboBox(type, customBuildEntriesDelegate, formatMode);
         }
 
         /// <inheritdoc />
-        public override Control Control => EnumComboBox;
+        public override Control Control => ComboBox;
     }
 }