diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp
index 71cd15a8df..d3a6f7d5f3 100644
--- a/src/openrct2-ui/input/MouseInput.cpp
+++ b/src/openrct2-ui/input/MouseInput.cpp
@@ -1326,13 +1326,13 @@ namespace OpenRCT2
                 {
                     gLastCloseModifier.window.number = w->number;
                     gLastCloseModifier.window.classification = w->classification;
-                    gLastCloseModifier.modifier = CloseWindowModifier::Shift;
+                    gLastCloseModifier.modifier = CloseWindowModifier::shift;
                 }
                 else if (im.IsModifierKeyPressed(ModifierKey::ctrl))
                 {
                     gLastCloseModifier.window.number = w->number;
                     gLastCloseModifier.window.classification = w->classification;
-                    gLastCloseModifier.modifier = CloseWindowModifier::Control;
+                    gLastCloseModifier.modifier = CloseWindowModifier::control;
                 }
             }
         }
diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp
index bc7d34a6f5..45f44fbff4 100644
--- a/src/openrct2-ui/interface/Window.cpp
+++ b/src/openrct2-ui/interface/Window.cpp
@@ -421,11 +421,11 @@ namespace OpenRCT2
     {
         CloseWindowModifier modifier = GetCloseModifier();
 
-        if (modifier == CloseWindowModifier::Shift)
+        if (modifier == CloseWindowModifier::shift)
         {
             CloseOthers();
         }
-        else if (modifier == CloseWindowModifier::Control)
+        else if (modifier == CloseWindowModifier::control)
         {
             CloseOthersOfThisClass();
         }
@@ -450,14 +450,14 @@ namespace OpenRCT2
 
     CloseWindowModifier Window::GetCloseModifier()
     {
-        CloseWindowModifier lastModifier = CloseWindowModifier::None;
+        CloseWindowModifier lastModifier = CloseWindowModifier::none;
 
         if (gLastCloseModifier.window.number == number && gLastCloseModifier.window.classification == classification)
         {
             lastModifier = gLastCloseModifier.modifier;
         }
 
-        gLastCloseModifier.modifier = CloseWindowModifier::None;
+        gLastCloseModifier.modifier = CloseWindowModifier::none;
 
         return lastModifier;
     }
diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp
index c9982df56a..6e0dcb9dd8 100644
--- a/src/openrct2/interface/Window.cpp
+++ b/src/openrct2/interface/Window.cpp
@@ -39,7 +39,7 @@ namespace OpenRCT2
     std::list<std::shared_ptr<WindowBase>> g_window_list;
     WindowBase* gWindowAudioExclusive;
 
-    WindowCloseModifier gLastCloseModifier = { { WindowClass::Null, 0 }, CloseWindowModifier::None };
+    WindowCloseModifier gLastCloseModifier = { { WindowClass::Null, 0 }, CloseWindowModifier::none };
 
     uint32_t gWindowUpdateTicks;
     colour_t gCurrentWindowColours[3];
diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h
index 7cbf4e21cc..54349f3b5a 100644
--- a/src/openrct2/interface/Window.h
+++ b/src/openrct2/interface/Window.h
@@ -241,9 +241,9 @@ enum class VisibilityCache : uint8_t
 
 enum class CloseWindowModifier : uint8_t
 {
-    None,
-    Shift,
-    Control
+    none,
+    shift,
+    control
 };
 
 enum class GuestListFilterType : int32_t