diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp
index d8803a3ed0..ad958ecbf0 100644
--- a/src/openrct2-ui/scripting/CustomWindow.cpp
+++ b/src/openrct2-ui/scripting/CustomWindow.cpp
@@ -36,7 +36,7 @@ using namespace OpenRCT2::Scripting;
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum CUSTOM_WINDOW_WIDX
+    enum CustomWindowWidx
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/About.cpp b/src/openrct2-ui/windows/About.cpp
index 736d7218c7..55032dbca3 100644
--- a/src/openrct2-ui/windows/About.cpp
+++ b/src/openrct2-ui/windows/About.cpp
@@ -31,7 +31,7 @@ enum
     WINDOW_ABOUT_PAGE_RCT2,
 };
 
-enum WINDOW_ABOUT_WIDGET_IDX {
+enum WindowAboutWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp
index 9c6975b0e7..bcb64c179e 100644
--- a/src/openrct2-ui/windows/Banner.cpp
+++ b/src/openrct2-ui/windows/Banner.cpp
@@ -27,7 +27,7 @@ static constexpr const int32_t WH = 96;
 static constexpr const rct_string_id WINDOW_TITLE = STR_BANNER_WINDOW_TITLE;
 
 // clang-format off
-enum WINDOW_BANNER_WIDGET_IDX {
+enum WindowBannerWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp
index 495468a9c4..cf636c4da5 100644
--- a/src/openrct2-ui/windows/Cheats.cpp
+++ b/src/openrct2-ui/windows/Cheats.cpp
@@ -60,7 +60,7 @@ static constexpr const rct_string_id WeatherTypes[] =
     STR_BLIZZARD,
 };
 
-enum WINDOW_CHEATS_WIDGET_IDX
+enum WindowCheatsWidgetIdx
 {
     WIDX_BACKGROUND,
     WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp
index 2caa147abd..668a650391 100644
--- a/src/openrct2-ui/windows/ClearScenery.cpp
+++ b/src/openrct2-ui/windows/ClearScenery.cpp
@@ -16,7 +16,7 @@
 #include <openrct2/world/Park.h>
 #include <openrct2/world/Scenery.h>
 
-enum WINDOW_CLEAR_SCENERY_WIDGET_IDX
+enum WindowClearSceneryWidgetIdx
 {
     WIDX_BACKGROUND,
     WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp
index 4767d75472..4716de5bd4 100644
--- a/src/openrct2-ui/windows/CustomCurrency.cpp
+++ b/src/openrct2-ui/windows/CustomCurrency.cpp
@@ -21,7 +21,7 @@ static constexpr const int32_t WH = 100;
 static constexpr const int32_t WW = 400;
 
 // clang-format off
-enum WINDOW_CUSTOM_CURRENCY_WIDGET_IDX {
+enum WindowCustomCurrencyWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp
index 2af0666bb4..259ec8e570 100644
--- a/src/openrct2-ui/windows/DebugPaint.cpp
+++ b/src/openrct2-ui/windows/DebugPaint.cpp
@@ -22,7 +22,7 @@
 static int32_t ResizeLanguage = LANGUAGE_UNDEFINED;
 
 // clang-format off
-enum WINDOW_DEBUG_PAINT_WIDGET_IDX
+enum WindowDebugPaintWidgetIdx
 {
     WIDX_BACKGROUND,
     WIDX_TOGGLE_SHOW_WIDE_PATHS,
diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp
index d9d5c01c60..a48a278e4c 100644
--- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp
+++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp
@@ -22,7 +22,7 @@ static constexpr const int32_t WH = 100;
 static money32 _demolishRideCost;
 
 // clang-format off
-enum WINDOW_RIDE_DEMOLISH_WIDGET_IDX {
+enum WindowRideDemolishWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp
index ea7a265885..802b9e9448 100644
--- a/src/openrct2-ui/windows/EditorObjectSelection.cpp
+++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp
@@ -120,7 +120,7 @@ static constexpr const ObjectPageDesc ObjectSelectionPages[] = {
 
 #pragma region Widgets
 
-enum WINDOW_EDITOR_OBJECT_SELECTION_WIDGET_IDX {
+enum WindowEditorObjectSelectionWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp
index afc03b8d82..57e997455f 100644
--- a/src/openrct2-ui/windows/Footpath.cpp
+++ b/src/openrct2-ui/windows/Footpath.cpp
@@ -51,7 +51,7 @@ enum
     PATH_CONSTRUCTION_MODE_BRIDGE_OR_TUNNEL
 };
 
-enum WINDOW_FOOTPATH_WIDGET_IDX
+enum WindowFootpathWidgetIdx
 {
     WIDX_BACKGROUND,
     WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp
index 40bcc9c80a..203239e0ae 100644
--- a/src/openrct2-ui/windows/GameBottomToolbar.cpp
+++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp
@@ -29,7 +29,7 @@
 #include <openrct2/world/Park.h>
 
 // clang-format off
-enum WINDOW_GAME_BOTTOM_TOOLBAR_WIDGET_IDX
+enum WindowGameBottomToolbarWidgetIdx
 {
     WIDX_LEFT_OUTSET,
     WIDX_LEFT_INSET,
diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp
index cdaf5dcba4..fb80e7f6b1 100644
--- a/src/openrct2-ui/windows/Guest.cpp
+++ b/src/openrct2-ui/windows/Guest.cpp
@@ -36,7 +36,7 @@ static constexpr const rct_string_id WINDOW_TITLE = STR_STRINGID;
 static constexpr const int32_t WH = 157;
 static constexpr const int32_t WW = 192;
 
-enum WINDOW_GUEST_PAGE
+enum WindowGuestPage
 {
     WINDOW_GUEST_OVERVIEW,
     WINDOW_GUEST_STATS,
@@ -47,7 +47,7 @@ enum WINDOW_GUEST_PAGE
     WINDOW_GUEST_DEBUG
 };
 
-enum WINDOW_GUEST_WIDGET_IDX
+enum WindowGuestWidgetIdx
 {
     WIDX_BACKGROUND,
     WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp
index ac5f5eb169..89f5ada129 100644
--- a/src/openrct2-ui/windows/GuestList.cpp
+++ b/src/openrct2-ui/windows/GuestList.cpp
@@ -30,7 +30,7 @@ static constexpr const rct_string_id WINDOW_TITLE = STR_GUESTS;
 static constexpr const int32_t WH = 330;
 static constexpr const int32_t WW = 350;
 
-enum WINDOW_GUEST_LIST_WIDGET_IDX
+enum WindowGuestListWidgetIdx
 {
     WIDX_BACKGROUND,
     WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp
index 84f6b1fe42..5c82041509 100644
--- a/src/openrct2-ui/windows/Land.cpp
+++ b/src/openrct2-ui/windows/Land.cpp
@@ -25,7 +25,7 @@ static constexpr const int32_t WH = 160;
 static constexpr const int32_t WW = 98;
 
 // clang-format off
-enum WINDOW_LAND_WIDGET_IDX {
+enum WindowLandWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp
index 50f1fb3317..dbd7493618 100644
--- a/src/openrct2-ui/windows/LandRights.cpp
+++ b/src/openrct2-ui/windows/LandRights.cpp
@@ -25,7 +25,7 @@ static constexpr const int32_t WH = 94;
 static constexpr const int32_t WW = 98;
 
 // clang-format off
-enum WINDOW_LAND_RIGHTS_WIDGET_IDX {
+enum WindowLandRightsWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp
index 63d5abd6a7..740b3f6981 100644
--- a/src/openrct2-ui/windows/Map.cpp
+++ b/src/openrct2-ui/windows/Map.cpp
@@ -73,7 +73,7 @@ enum
     PAGE_RIDES
 };
 
-enum WINDOW_MAP_WIDGET_IDX
+enum WindowMapWidgetIdx
 {
     WIDX_BACKGROUND,
     WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp
index 155646457f..dc0fc15cb6 100644
--- a/src/openrct2-ui/windows/Multiplayer.cpp
+++ b/src/openrct2-ui/windows/Multiplayer.cpp
@@ -27,7 +27,7 @@ enum {
     WINDOW_MULTIPLAYER_PAGE_OPTIONS
 };
 
-enum WINDOW_MULTIPLAYER_WIDGET_IDX {
+enum WindowMultiplayerWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp
index 0b1c4c46cd..a3899c937b 100644
--- a/src/openrct2-ui/windows/NetworkStatus.cpp
+++ b/src/openrct2-ui/windows/NetworkStatus.cpp
@@ -17,7 +17,7 @@
 // clang-format off
 static char _password[33];
 
-enum WINDOW_NETWORK_STATUS_WIDGET_IDX {
+enum WindowNetworkStatusWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp
index af1a75e729..455e1101d1 100644
--- a/src/openrct2-ui/windows/NewCampaign.cpp
+++ b/src/openrct2-ui/windows/NewCampaign.cpp
@@ -27,7 +27,7 @@ constexpr auto SELECTED_RIDE_UNDEFINED = RIDE_ID_NULL;
 constexpr uint16_t SELECTED_ITEM_UNDEFINED = 0xFFFF;
 
 // clang-format off
-enum WINDOW_NEW_CAMPAIGN_WIDGET_IDX {
+enum WindowNewCampaignWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp
index 6707b88dc2..1d5c693134 100644
--- a/src/openrct2-ui/windows/News.cpp
+++ b/src/openrct2-ui/windows/News.cpp
@@ -25,7 +25,7 @@ static constexpr const int32_t WH = 300;
 static constexpr const int32_t WW = 400;
 
 // clang-format off
-enum WINDOW_NEWS_WIDGET_IDX {
+enum WindowNewsWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/NewsOptions.cpp b/src/openrct2-ui/windows/NewsOptions.cpp
index 2fb82f20f2..40b83bb73f 100644
--- a/src/openrct2-ui/windows/NewsOptions.cpp
+++ b/src/openrct2-ui/windows/NewsOptions.cpp
@@ -54,7 +54,7 @@ static constexpr const NotificationDef NewsItemOptionDefinitions[] = {
     { NOTIFICATION_CATEGORY_GUEST,  STR_NOTIFICATION_GUEST_DIED,                        offsetof(NotificationConfiguration, guest_died)                         },
 };
 
-enum WINDOW_NEWS_OPTIONS_WIDGET_IDX {
+enum WindowNewsOptionsWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp
index 4dd6a5b7ed..f37664aaa7 100644
--- a/src/openrct2-ui/windows/ObjectLoadError.cpp
+++ b/src/openrct2-ui/windows/ObjectLoadError.cpp
@@ -250,7 +250,7 @@ private:
 #endif
 
 // clang-format off
-enum WINDOW_OBJECT_LOAD_ERROR_WIDGET_IDX {
+enum WindowObjectLoadErrorWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp
index 1d87a09362..361d5f602d 100644
--- a/src/openrct2-ui/windows/Options.cpp
+++ b/src/openrct2-ui/windows/Options.cpp
@@ -43,7 +43,7 @@
 #include <openrct2/util/Util.h>
 
 // clang-format off
-enum WINDOW_OPTIONS_PAGE {
+enum WindowOptionsPage {
     WINDOW_OPTIONS_PAGE_DISPLAY,
     WINDOW_OPTIONS_PAGE_RENDERING,
     WINDOW_OPTIONS_PAGE_CULTURE,
@@ -56,7 +56,7 @@ enum WINDOW_OPTIONS_PAGE {
 
 #pragma region Widgets
 
-enum WINDOW_OPTIONS_WIDGET_IDX {
+enum WindowOptionsWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp
index 7c61b3281d..ebe10f6f05 100644
--- a/src/openrct2-ui/windows/Park.cpp
+++ b/src/openrct2-ui/windows/Park.cpp
@@ -36,7 +36,7 @@ static constexpr const rct_string_id WINDOW_TITLE = STR_STRINGID;
 static constexpr const int32_t WH = 224;
 
 // clang-format off
-enum WINDOW_PARK_PAGE {
+enum WindowParkPage {
     WINDOW_PARK_PAGE_ENTRANCE,
     WINDOW_PARK_PAGE_RATING,
     WINDOW_PARK_PAGE_GUESTS,
@@ -46,7 +46,7 @@ enum WINDOW_PARK_PAGE {
     WINDOW_PARK_PAGE_AWARDS
 };
 
-enum WINDOW_PARK_WIDGET_IDX {
+enum WindowParkWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp
index e05e865d36..f2ea964c95 100644
--- a/src/openrct2-ui/windows/Player.cpp
+++ b/src/openrct2-ui/windows/Player.cpp
@@ -26,14 +26,14 @@
 #include <utility>
 
 // clang-format off
-enum WINDOW_PLAYER_PAGE {
+enum WindowPlayerPage {
     WINDOW_PLAYER_PAGE_OVERVIEW,
     WINDOW_PLAYER_PAGE_STATISTICS,
 };
 
 #pragma region Widgets
 
-enum WINDOW_PLAYER_WIDGET_IDX {
+enum WindowPlayerWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp
index 0e6a465901..59136b8ed2 100644
--- a/src/openrct2-ui/windows/RideList.cpp
+++ b/src/openrct2-ui/windows/RideList.cpp
@@ -37,7 +37,7 @@ enum
     PAGE_COUNT
 };
 
-enum WINDOW_RIDE_LIST_WIDGET_IDX
+enum WindowRideListWidgetIdx
 {
     WIDX_BACKGROUND,
     WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp
index 84fcd019d9..82ed945d52 100644
--- a/src/openrct2-ui/windows/SavePrompt.cpp
+++ b/src/openrct2-ui/windows/SavePrompt.cpp
@@ -26,7 +26,7 @@ static constexpr const int32_t WH_QUIT = 38;
 static constexpr const int32_t WW_QUIT = 177;
 
 // clang-format off
-enum WINDOW_SAVE_PROMPT_WIDGET_IDX {
+enum WindowSavePromptWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
@@ -45,7 +45,7 @@ static rct_widget window_save_prompt_widgets[] = {
     WIDGETS_END,
 };
 
-enum WINDOW_QUIT_PROMPT_WIDGET_IDX {
+enum WindowQuitPromptWidgetIdx {
     WQIDX_BACKGROUND,
     WQIDX_TITLE,
     WQIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp
index d427906820..58fa90e781 100644
--- a/src/openrct2-ui/windows/ScenarioSelect.cpp
+++ b/src/openrct2-ui/windows/ScenarioSelect.cpp
@@ -33,15 +33,15 @@ static constexpr const int32_t SidebarWidth = 180;
 constexpr const uint8_t NumTabs = 8;
 
 // clang-format off
-enum class LIST_ITEM_TYPE : uint8_t
+enum class ListItemType : uint8_t
 {
-    HEADING,
-    SCENARIO,
+    Heading,
+    Scenario,
 };
 
 struct ScenarioListItem
 {
-    LIST_ITEM_TYPE type;
+    ListItemType type;
     union
     {
         struct
@@ -313,10 +313,10 @@ static void WindowScenarioselectScrollgetsize(rct_window* w, int32_t scrollIndex
     {
         switch (listItem.type)
         {
-            case LIST_ITEM_TYPE::HEADING:
+            case ListItemType::Heading:
                 y += 18;
                 break;
-            case LIST_ITEM_TYPE::SCENARIO:
+            case ListItemType::Scenario:
                 y += scenarioItemHeight;
                 break;
         }
@@ -337,10 +337,10 @@ static void WindowScenarioselectScrollmousedown(rct_window* w, int32_t scrollInd
     {
         switch (listItem.type)
         {
-            case LIST_ITEM_TYPE::HEADING:
+            case ListItemType::Heading:
                 mutableScreenCoords.y -= 18;
                 break;
-            case LIST_ITEM_TYPE::SCENARIO:
+            case ListItemType::Scenario:
                 mutableScreenCoords.y -= scenarioItemHeight;
                 if (mutableScreenCoords.y < 0 && !listItem.scenario.is_locked)
                 {
@@ -377,10 +377,10 @@ static void WindowScenarioselectScrollmouseover(rct_window* w, int32_t scrollInd
     {
         switch (listItem.type)
         {
-            case LIST_ITEM_TYPE::HEADING:
+            case ListItemType::Heading:
                 mutableScreenCoords.y -= 18;
                 break;
-            case LIST_ITEM_TYPE::SCENARIO:
+            case ListItemType::Scenario:
                 mutableScreenCoords.y -= scenarioItemHeight;
                 if (mutableScreenCoords.y < 0)
                 {
@@ -581,7 +581,7 @@ static void WindowScenarioselectScrollpaint(rct_window* w, rct_drawpixelinfo* dp
 
         switch (listItem.type)
         {
-            case LIST_ITEM_TYPE::HEADING:
+            case ListItemType::Heading:
             {
                 const int32_t horizontalRuleMargin = 4;
                 DrawCategoryHeading(
@@ -589,7 +589,7 @@ static void WindowScenarioselectScrollpaint(rct_window* w, rct_drawpixelinfo* dp
                 y += 18;
                 break;
             }
-            case LIST_ITEM_TYPE::SCENARIO:
+            case ListItemType::Scenario:
             {
                 // Draw hover highlight
                 const scenario_index_entry* scenario = listItem.scenario.scenario;
@@ -745,14 +745,14 @@ static void InitialiseListItems(rct_window* w)
         if (headingStringId != STR_NONE)
         {
             ScenarioListItem headerItem;
-            headerItem.type = LIST_ITEM_TYPE::HEADING;
+            headerItem.type = ListItemType::Heading;
             headerItem.heading.string_id = headingStringId;
             _listItems.push_back(std::move(headerItem));
         }
 
         // Scenario
         ScenarioListItem scenarioItem;
-        scenarioItem.type = LIST_ITEM_TYPE::SCENARIO;
+        scenarioItem.type = ListItemType::Scenario;
         scenarioItem.scenario.scenario = scenario;
         if (IsLockingEnabled(w))
         {
@@ -797,9 +797,9 @@ static void InitialiseListItems(rct_window* w)
             for (auto it = _listItems.begin(); it != _listItems.end(); it++)
             {
                 const auto& listItem = *it;
-                if (listItem.type == LIST_ITEM_TYPE::HEADING)
+                if (listItem.type == ListItemType::Heading)
                 {
-                    if ((it + 1) == _listItems.end() || (it + 1)->type == LIST_ITEM_TYPE::HEADING)
+                    if ((it + 1) == _listItems.end() || (it + 1)->type == ListItemType::Heading)
                     {
                         it = _listItems.erase(it);
                         it--;
diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp
index 89b79e26e3..50eb62b619 100644
--- a/src/openrct2-ui/windows/Scenery.cpp
+++ b/src/openrct2-ui/windows/Scenery.cpp
@@ -67,7 +67,7 @@ static rct_window_event_list window_scenery_events([](auto& events)
 });
 
 
-enum WINDOW_SCENERY_LIST_WIDGET_IDX {
+enum WindowSceneryListWidgetIdx {
     WIDX_SCENERY_BACKGROUND,
     WIDX_SCENERY_TITLE,
     WIDX_SCENERY_CLOSE,
diff --git a/src/openrct2-ui/windows/SceneryScatter.cpp b/src/openrct2-ui/windows/SceneryScatter.cpp
index a3fdb13051..406e6e6f44 100644
--- a/src/openrct2-ui/windows/SceneryScatter.cpp
+++ b/src/openrct2-ui/windows/SceneryScatter.cpp
@@ -15,7 +15,7 @@
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/world/Scenery.h>
 
-enum WINDOW_SCENERY_SCATTER_WIDGET_IDX
+enum WindowSceneryScatterWidgetIdx
 {
     WIDX_BACKGROUND,
     WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp
index 3073a6875e..dfc7cb236c 100644
--- a/src/openrct2-ui/windows/ShortcutKeys.cpp
+++ b/src/openrct2-ui/windows/ShortcutKeys.cpp
@@ -25,7 +25,7 @@ static constexpr const int32_t WH = 280;
 static constexpr const int32_t WW_SC_MAX = 1200;
 static constexpr const int32_t WH_SC_MAX = 800;
 
-enum WINDOW_SHORTCUT_WIDGET_IDX
+enum WindowShortcutWidgetIdx
 {
     WIDX_BACKGROUND,
     WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp
index 8a62b2f2c2..d7e8a463c2 100644
--- a/src/openrct2-ui/windows/Sign.cpp
+++ b/src/openrct2-ui/windows/Sign.cpp
@@ -30,7 +30,7 @@ static constexpr const int32_t WW = 113;
 static constexpr const int32_t WH = 96;
 
 // clang-format off
-enum WINDOW_SIGN_WIDGET_IDX {
+enum WindowSignWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp
index 6a2fbed237..1d444cf94f 100644
--- a/src/openrct2-ui/windows/Staff.cpp
+++ b/src/openrct2-ui/windows/Staff.cpp
@@ -35,14 +35,14 @@ static constexpr const rct_string_id WINDOW_TITLE = STR_STRINGID;
 static constexpr const int32_t WW = 190;
 static constexpr const int32_t WH = 180;
 
-enum WINDOW_STAFF_PAGE
+enum WindowStaffPage
 {
     WINDOW_STAFF_OVERVIEW,
     WINDOW_STAFF_OPTIONS,
     WINDOW_STAFF_STATISTICS,
 };
 
-enum WINDOW_STAFF_WIDGET_IDX
+enum WindowStaffWidgetIdx
 {
     WIDX_BACKGROUND,
     WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp
index 65677809a9..adc82384d5 100644
--- a/src/openrct2-ui/windows/StaffFirePrompt.cpp
+++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp
@@ -22,7 +22,7 @@ static constexpr const int32_t WW = 200;
 static constexpr const int32_t WH = 100;
 
 // clang-format off
-enum WINDOW_STAFF_FIRE_WIDGET_IDX {
+enum WindowStaffFireWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp
index 6ba38db488..c5653398fd 100644
--- a/src/openrct2-ui/windows/StaffList.cpp
+++ b/src/openrct2-ui/windows/StaffList.cpp
@@ -39,7 +39,7 @@ enum
     WINDOW_STAFF_LIST_TAB_ENTERTAINERS
 };
 
-enum WINDOW_STAFF_LIST_WIDGET_IDX
+enum WindowStaffListWidgetIdx
 {
     WIDX_STAFF_LIST_BACKGROUND,
     WIDX_STAFF_LIST_TITLE,
diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp
index f84d889eba..d340e32dbf 100644
--- a/src/openrct2-ui/windows/TextInput.cpp
+++ b/src/openrct2-ui/windows/TextInput.cpp
@@ -21,7 +21,7 @@
 static constexpr const int32_t WW = 250;
 static constexpr const int32_t WH = 90;
 
-enum WINDOW_TEXT_INPUT_WIDGET_IDX
+enum WindowTextInputWidgetIdx
 {
     WIDX_BACKGROUND,
     WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp
index c152475681..30d3477a97 100644
--- a/src/openrct2-ui/windows/Themes.cpp
+++ b/src/openrct2-ui/windows/Themes.cpp
@@ -64,7 +64,7 @@ static rct_window_event_list window_themes_events([](auto& events) {
     events.scroll_paint = &WindowThemesScrollpaint;
 });
 
-enum WINDOW_THEMES_WIDGET_IDX
+enum WindowThemesWidgetIdx
 {
     WIDX_THEMES_BACKGROUND,
     WIDX_THEMES_TITLE,
diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp
index 28e005252a..bfc83a3963 100644
--- a/src/openrct2-ui/windows/TileInspector.cpp
+++ b/src/openrct2-ui/windows/TileInspector.cpp
@@ -56,7 +56,7 @@ static constexpr const rct_string_id WallSlopeStringIds[] = {
     STR_TILE_INSPECTOR_WALL_ANIMATION_FRAME,
 };
 
-enum WINDOW_TILE_INSPECTOR_WIDGET_IDX
+enum WindowTileInspectorWidgetIdx
 {
     WIDX_BACKGROUND,
     WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp
index 4c6c24eb46..2e55b5e6c2 100644
--- a/src/openrct2-ui/windows/TitleCommandEditor.cpp
+++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp
@@ -53,7 +53,7 @@ static TitleCommandOrder _window_title_command_editor_orders[] = {
 
 #define NUM_COMMANDS std::size(_window_title_command_editor_orders)
 
-enum WINDOW_TITLE_COMMAND_EDITOR_WIDGET_IDX {
+enum WindowTitleCommandEditorWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp
index d60f9e961e..0a4574e568 100644
--- a/src/openrct2-ui/windows/TitleEditor.cpp
+++ b/src/openrct2-ui/windows/TitleEditor.cpp
@@ -35,7 +35,7 @@
 
 using namespace OpenRCT2;
 
-enum WINDOW_TITLE_EDITOR_TAB
+enum WindowTitleEditorTab
 {
     WINDOW_TITLE_EDITOR_TAB_PRESETS,
     WINDOW_TITLE_EDITOR_TAB_SAVES,
@@ -81,7 +81,7 @@ static rct_window_event_list window_title_editor_events([](auto& events) {
     events.scroll_paint = &WindowTitleEditorScrollpaint;
 });
 
-enum WINDOW_TITLE_EDITOR_WIDGET_IDX
+enum WindowTitleEditorWidgetIdx
 {
     WIDX_TITLE_EDITOR_BACKGROUND,
     WIDX_TITLE_EDITOR_TITLE,
diff --git a/src/openrct2-ui/windows/TitleExit.cpp b/src/openrct2-ui/windows/TitleExit.cpp
index 9b8473fcc5..74b4da4811 100644
--- a/src/openrct2-ui/windows/TitleExit.cpp
+++ b/src/openrct2-ui/windows/TitleExit.cpp
@@ -16,7 +16,7 @@
 #include <openrct2/sprites.h>
 
 // clang-format off
-enum WINDOW_TITLE_EXIT_WIDGET_IDX {
+enum WindowTitleExitWidgetIdx {
     WIDX_EXIT,
 };
 
diff --git a/src/openrct2-ui/windows/TitleOptions.cpp b/src/openrct2-ui/windows/TitleOptions.cpp
index 613ed9b881..19ecc66ff4 100644
--- a/src/openrct2-ui/windows/TitleOptions.cpp
+++ b/src/openrct2-ui/windows/TitleOptions.cpp
@@ -15,7 +15,7 @@
 #include <openrct2/localisation/Localisation.h>
 
 // clang-format off
-enum WINDOW_TITLE_OPTIONS_WIDGET_IDX {
+enum WindowTitleOptionsWidgetIdx {
     WIDX_OPTIONS,
 };
 
diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp
index 62f1bcd4e1..2a1aec1f0f 100644
--- a/src/openrct2-ui/windows/TopToolbar.cpp
+++ b/src/openrct2-ui/windows/TopToolbar.cpp
@@ -110,7 +110,7 @@ validate_global_widx(WC_TOP_TOOLBAR, WIDX_WATER);
 validate_global_widx(WC_TOP_TOOLBAR, WIDX_SCENERY);
 validate_global_widx(WC_TOP_TOOLBAR, WIDX_PATH);
 
-enum FILE_MENU_DDIDX
+enum FileMenuDdidx
 {
     DDIDX_NEW_GAME = 0,
     DDIDX_LOAD_GAME = 1,
@@ -129,7 +129,7 @@ enum FILE_MENU_DDIDX
     DDIDX_EXIT_OPENRCT2 = 14,
 };
 
-enum TOP_TOOLBAR_VIEW_MENU_DDIDX
+enum TopToolbarViewMenuDdidx
 {
     DDIDX_UNDERGROUND_INSIDE = 0,
     DDIDX_TRANSPARENT_WATER = 1,
@@ -152,7 +152,7 @@ enum TOP_TOOLBAR_VIEW_MENU_DDIDX
     TOP_TOOLBAR_VIEW_MENU_COUNT,
 };
 
-enum TOP_TOOLBAR_DEBUG_DDIDX
+enum TopToolbarDebugDdidx
 {
     DDIDX_CONSOLE = 0,
     DDIDX_DEBUG_PAINT = 1,
@@ -160,7 +160,7 @@ enum TOP_TOOLBAR_DEBUG_DDIDX
     TOP_TOOLBAR_DEBUG_COUNT,
 };
 
-enum TOP_TOOLBAR_NETWORK_DDIDX
+enum TopToolbarNetworkDdidx
 {
     DDIDX_MULTIPLAYER = 0,
     DDIDX_MULTIPLAYER_RECONNECT = 1,
diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp
index 4f2d919471..ae412da221 100644
--- a/src/openrct2-ui/windows/ViewClipping.cpp
+++ b/src/openrct2-ui/windows/ViewClipping.cpp
@@ -21,7 +21,7 @@
 #include <openrct2/world/Location.hpp>
 
 // clang-format off
-enum WINDOW_VIEW_CLIPPING_WIDGET_IDX {
+enum WindowViewClippingWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,
@@ -36,9 +36,9 @@ enum WINDOW_VIEW_CLIPPING_WIDGET_IDX {
     WIDX_CLIP_CLEAR,
 };
 
-enum class DISPLAY_TYPE {
-    DISPLAY_RAW,
-    DISPLAY_UNITS
+enum class DisplayType {
+    DisplayRaw,
+    DisplayUnits
 };
 
 #pragma region Widgets
@@ -71,7 +71,7 @@ private:
     CoordsXY _previousClipSelectionB;
     bool _toolActive{ false };
     bool _dragging{ false };
-    static inline DISPLAY_TYPE _clipHeightDisplayType;
+    static inline DisplayType _clipHeightDisplayType;
 
 public:
     void OnCloseButton()
@@ -101,13 +101,13 @@ public:
             }
             case WIDX_CLIP_HEIGHT_VALUE:
                 // Toggle display of the cut height value in RAW vs UNITS
-                if (_clipHeightDisplayType == DISPLAY_TYPE::DISPLAY_RAW)
+                if (_clipHeightDisplayType == DisplayType::DisplayRaw)
                 {
-                    _clipHeightDisplayType = DISPLAY_TYPE::DISPLAY_UNITS;
+                    _clipHeightDisplayType = DisplayType::DisplayUnits;
                 }
                 else
                 {
-                    _clipHeightDisplayType = DISPLAY_TYPE::DISPLAY_RAW;
+                    _clipHeightDisplayType = DisplayType::DisplayRaw;
                 }
                 this->Invalidate();
                 break;
@@ -284,7 +284,7 @@ public:
 
         switch (_clipHeightDisplayType)
         {
-            case DISPLAY_TYPE::DISPLAY_RAW:
+            case DisplayType::DisplayRaw:
             default:
             {
                 auto ft = Formatter();
@@ -294,7 +294,7 @@ public:
                 DrawTextBasic(&dpi, screenCoords, STR_FORMAT_INTEGER, ft, { this->colours[0] });
                 break;
             }
-            case DISPLAY_TYPE::DISPLAY_UNITS:
+            case DisplayType::DisplayUnits:
             {
                 // Print the value in the configured height label type:
                 if (gConfigGeneral.show_height_as_units)
@@ -349,7 +349,7 @@ public:
         this->hold_down_widgets = (1ULL << WIDX_CLIP_HEIGHT_INCREASE) | (1UL << WIDX_CLIP_HEIGHT_DECREASE);
         WindowInitScrollWidgets(this);
 
-        _clipHeightDisplayType = DISPLAY_TYPE::DISPLAY_UNITS;
+        _clipHeightDisplayType = DisplayType::DisplayUnits;
 
         // Initialise the clip height slider from the current clip height value.
         this->SetClipHeight(gClipHeight);
diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp
index cf53873ca7..31febf8878 100644
--- a/src/openrct2-ui/windows/Viewport.cpp
+++ b/src/openrct2-ui/windows/Viewport.cpp
@@ -17,7 +17,7 @@
 #include <openrct2/sprites.h>
 
 // clang-format off
-enum WINDOW_VIEWPORT_WIDGET_IDX
+enum WindowViewportWidgetIdx
 {
     WIDX_BACKGROUND,
     WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp
index 3d5fb7ecae..642d08cfc8 100644
--- a/src/openrct2-ui/windows/Water.cpp
+++ b/src/openrct2-ui/windows/Water.cpp
@@ -21,7 +21,7 @@ static constexpr const int32_t WH = 77;
 static constexpr const int32_t WW = 76;
 
 // clang-format off
-enum WINDOW_WATER_WIDGET_IDX {
+enum WindowWaterWidgetIdx {
     WIDX_BACKGROUND,
     WIDX_TITLE,
     WIDX_CLOSE,