diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp
index e723bf5eb5..26abc9dd0b 100644
--- a/src/openrct2-ui/WindowManager.cpp
+++ b/src/openrct2-ui/WindowManager.cpp
@@ -530,7 +530,7 @@ public:
 
             case INTENT_ACTION_UPDATE_BANNER:
             {
-                rct_windownumber bannerIndex = static_cast<rct_windownumber>(intent.GetUIntExtra(INTENT_EXTRA_BANNER_INDEX));
+                WindowNumber bannerIndex = static_cast<WindowNumber>(intent.GetUIntExtra(INTENT_EXTRA_BANNER_INDEX));
 
                 WindowBase* w = FindByNumber(WindowClass::Banner, bannerIndex);
                 if (w != nullptr)
@@ -1027,7 +1027,7 @@ public:
      * Closes all windows with specified window class and number.
      *  rct2: 0x006ECCF4
      */
-    void CloseByNumber(WindowClass cls, rct_windownumber number) override
+    void CloseByNumber(WindowClass cls, WindowNumber number) override
     {
         CloseByCondition([cls, number](WindowBase* w) -> bool { return w->classification == cls && w->number == number; });
     }
@@ -1035,7 +1035,7 @@ public:
     // TODO: Refactor this to use variant once the new window class is done.
     void CloseByNumber(WindowClass cls, EntityId number) override
     {
-        CloseByNumber(cls, static_cast<rct_windownumber>(number.ToUnderlying()));
+        CloseByNumber(cls, static_cast<WindowNumber>(number.ToUnderlying()));
     }
 
     /**
@@ -1087,7 +1087,7 @@ public:
     /**
      * Closes all windows except the specified window number and class.
      */
-    void CloseAllExceptNumberAndClass(rct_windownumber number, WindowClass cls) override
+    void CloseAllExceptNumberAndClass(WindowNumber number, WindowClass cls) override
     {
         CloseByClass(WindowClass::Dropdown);
         CloseByCondition([cls, number](WindowBase* w) -> bool {
@@ -1131,7 +1131,7 @@ public:
      *  rct2: 0x006EA8A0
      * @returns the window or nullptr if no window was found.
      */
-    WindowBase* FindByNumber(WindowClass cls, rct_windownumber number) override
+    WindowBase* FindByNumber(WindowClass cls, WindowNumber number) override
     {
         for (auto& w : g_window_list)
         {
@@ -1148,7 +1148,7 @@ public:
     // TODO: Use variant for this once the window framework is done.
     WindowBase* FindByNumber(WindowClass cls, EntityId id) override
     {
-        return FindByNumber(cls, static_cast<rct_windownumber>(id.ToUnderlying()));
+        return FindByNumber(cls, static_cast<WindowNumber>(id.ToUnderlying()));
     }
 
     /**
@@ -1246,7 +1246,7 @@ public:
      * Invalidates all windows with the specified window class and number.
      *  rct2: 0x006EC3AC
      */
-    void InvalidateByNumber(WindowClass cls, rct_windownumber number) override
+    void InvalidateByNumber(WindowClass cls, WindowNumber number) override
     {
         InvalidateByCondition([cls, number](WindowBase* w) -> bool { return w->classification == cls && w->number == number; });
     }
@@ -1254,7 +1254,7 @@ public:
     // TODO: Use variant for this once the window framework is done.
     void InvalidateByNumber(WindowClass cls, EntityId id) override
     {
-        InvalidateByNumber(cls, static_cast<rct_windownumber>(id.ToUnderlying()));
+        InvalidateByNumber(cls, static_cast<WindowNumber>(id.ToUnderlying()));
     }
 
     /**
@@ -1308,7 +1308,7 @@ public:
      * Invalidates the specified widget of all windows that match the specified window class and number.
      *  rct2: 0x006EC3AC
      */
-    void InvalidateWidgetByNumber(WindowClass cls, rct_windownumber number, WidgetIndex widgetIndex) override
+    void InvalidateWidgetByNumber(WindowClass cls, WindowNumber number, WidgetIndex widgetIndex) override
     {
         WindowVisitEach([this, cls, number, widgetIndex](WindowBase* w) {
             if (w->classification == cls && w->number == number)
@@ -1387,7 +1387,7 @@ public:
      *
      *  rct2: 0x006ED78A
      */
-    WindowBase* BringToFrontByNumber(WindowClass cls, rct_windownumber number) override
+    WindowBase* BringToFrontByNumber(WindowClass cls, WindowNumber number) override
     {
         WindowBase* w = FindByNumber(cls, number);
         if (w != nullptr)
diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp
index fe2b544f45..334b907421 100644
--- a/src/openrct2-ui/input/MouseInput.cpp
+++ b/src/openrct2-ui/input/MouseInput.cpp
@@ -74,7 +74,7 @@ namespace OpenRCT2
 
     static MouseState GameGetNextInput(ScreenCoordsXY& screenCoords);
     static void InputWidgetOver(const ScreenCoordsXY& screenCoords, WindowBase* w, WidgetIndex widgetIndex);
-    static void InputWidgetOverChangeCheck(WindowClass windowClass, rct_windownumber windowNumber, WidgetIndex widgetIndex);
+    static void InputWidgetOverChangeCheck(WindowClass windowClass, WindowNumber windowNumber, WidgetIndex widgetIndex);
     static void InputWidgetOverFlatbuttonInvalidate();
     void ProcessMouseOver(const ScreenCoordsXY& screenCoords);
     void ProcessMouseTool(const ScreenCoordsXY& screenCoords);
@@ -962,7 +962,7 @@ namespace OpenRCT2
     static void InputWidgetOver(const ScreenCoordsXY& screenCoords, WindowBase* w, WidgetIndex widgetIndex)
     {
         WindowClass windowClass = WindowClass::Null;
-        rct_windownumber windowNumber = 0;
+        WindowNumber windowNumber = 0;
         Widget* widget = nullptr;
 
         if (w != nullptr)
@@ -993,7 +993,7 @@ namespace OpenRCT2
      *
      *  rct2: 0x006E9269
      */
-    static void InputWidgetOverChangeCheck(WindowClass windowClass, rct_windownumber windowNumber, WidgetIndex widgetIndex)
+    static void InputWidgetOverChangeCheck(WindowClass windowClass, WindowNumber windowNumber, WidgetIndex widgetIndex)
     {
         // Prevents invalid widgets being clicked source of bug is elsewhere
         if (widgetIndex == kWidgetIndexNull)
@@ -1043,7 +1043,7 @@ namespace OpenRCT2
     static void InputWidgetLeft(const ScreenCoordsXY& screenCoords, WindowBase* w, WidgetIndex widgetIndex)
     {
         WindowClass windowClass = WindowClass::Null;
-        rct_windownumber windowNumber = 0;
+        WindowNumber windowNumber = 0;
 
         if (w != nullptr)
         {
@@ -1246,7 +1246,7 @@ namespace OpenRCT2
         const ScreenCoordsXY& screenCoords, MouseState state, WidgetIndex widgetIndex, WindowBase* w, Widget* widget)
     {
         WindowClass cursor_w_class;
-        rct_windownumber cursor_w_number;
+        WindowNumber cursor_w_number;
         cursor_w_class = gPressedWidget.windowClassification;
         cursor_w_number = gPressedWidget.windowNumber;
         WidgetIndex cursor_widgetIndex = gPressedWidget.widgetIndex;
diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp
index 26ae0ecc33..b0af13130a 100644
--- a/src/openrct2-ui/scripting/CustomWindow.cpp
+++ b/src/openrct2-ui/scripting/CustomWindow.cpp
@@ -395,7 +395,7 @@ namespace OpenRCT2::Ui::Windows
     class CustomWindow final : public Window
     {
     private:
-        static rct_windownumber _nextWindowNumber;
+        static WindowNumber _nextWindowNumber;
         CustomWindowInfo _info;
 
     public:
@@ -1114,7 +1114,7 @@ namespace OpenRCT2::Ui::Windows
             }
         }
 
-        static rct_windownumber GetNewWindowNumber()
+        static WindowNumber GetNewWindowNumber()
         {
             auto result = _nextWindowNumber++;
             auto* windowMgr = GetWindowManager();
@@ -1126,7 +1126,7 @@ namespace OpenRCT2::Ui::Windows
         }
     };
 
-    rct_windownumber CustomWindow::_nextWindowNumber;
+    WindowNumber CustomWindow::_nextWindowNumber;
 
     WindowBase* WindowCustomOpen(std::shared_ptr<Plugin> owner, DukValue dukDesc)
     {
diff --git a/src/openrct2-ui/scripting/ScViewport.hpp b/src/openrct2-ui/scripting/ScViewport.hpp
index f9b387fb8b..a90058050d 100644
--- a/src/openrct2-ui/scripting/ScViewport.hpp
+++ b/src/openrct2-ui/scripting/ScViewport.hpp
@@ -27,10 +27,10 @@ namespace OpenRCT2::Scripting
     {
     private:
         WindowClass _class{};
-        rct_windownumber _number{};
+        WindowNumber _number{};
 
     public:
-        ScViewport(WindowClass c, rct_windownumber n = 0)
+        ScViewport(WindowClass c, WindowNumber n = 0)
             : _class(c)
             , _number(n)
         {
diff --git a/src/openrct2-ui/scripting/ScWidget.hpp b/src/openrct2-ui/scripting/ScWidget.hpp
index 6a6f69f147..ac2b94e395 100644
--- a/src/openrct2-ui/scripting/ScWidget.hpp
+++ b/src/openrct2-ui/scripting/ScWidget.hpp
@@ -30,11 +30,11 @@ namespace OpenRCT2::Scripting
     {
     protected:
         WindowClass _class{};
-        rct_windownumber _number{};
+        WindowNumber _number{};
         WidgetIndex _widgetIndex{};
 
     public:
-        ScWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
+        ScWidget(WindowClass c, WindowNumber n, WidgetIndex widgetIndex)
             : _class(c)
             , _number(n)
             , _widgetIndex(widgetIndex)
@@ -448,7 +448,7 @@ namespace OpenRCT2::Scripting
     class ScButtonWidget : public ScWidget
     {
     public:
-        ScButtonWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
+        ScButtonWidget(WindowClass c, WindowNumber n, WidgetIndex widgetIndex)
             : ScWidget(c, n, widgetIndex)
         {
         }
@@ -534,7 +534,7 @@ namespace OpenRCT2::Scripting
     class ScCheckBoxWidget : public ScWidget
     {
     public:
-        ScCheckBoxWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
+        ScCheckBoxWidget(WindowClass c, WindowNumber n, WidgetIndex widgetIndex)
             : ScWidget(c, n, widgetIndex)
         {
         }
@@ -572,7 +572,7 @@ namespace OpenRCT2::Scripting
     class ScColourPickerWidget : public ScWidget
     {
     public:
-        ScColourPickerWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
+        ScColourPickerWidget(WindowClass c, WindowNumber n, WidgetIndex widgetIndex)
             : ScWidget(c, n, widgetIndex)
         {
         }
@@ -607,7 +607,7 @@ namespace OpenRCT2::Scripting
     class ScDropdownWidget : public ScWidget
     {
     public:
-        ScDropdownWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
+        ScDropdownWidget(WindowClass c, WindowNumber n, WidgetIndex widgetIndex)
             : ScWidget(c, n, widgetIndex)
         {
         }
@@ -665,7 +665,7 @@ namespace OpenRCT2::Scripting
     class ScGroupBoxWidget : public ScWidget
     {
     public:
-        ScGroupBoxWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
+        ScGroupBoxWidget(WindowClass c, WindowNumber n, WidgetIndex widgetIndex)
             : ScWidget(c, n, widgetIndex)
         {
         }
@@ -682,7 +682,7 @@ namespace OpenRCT2::Scripting
     class ScLabelWidget : public ScWidget
     {
     public:
-        ScLabelWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
+        ScLabelWidget(WindowClass c, WindowNumber n, WidgetIndex widgetIndex)
             : ScWidget(c, n, widgetIndex)
         {
         }
@@ -726,7 +726,7 @@ namespace OpenRCT2::Scripting
     class ScListViewWidget : public ScWidget
     {
     public:
-        ScListViewWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
+        ScListViewWidget(WindowClass c, WindowNumber n, WidgetIndex widgetIndex)
             : ScWidget(c, n, widgetIndex)
         {
         }
@@ -917,7 +917,7 @@ namespace OpenRCT2::Scripting
     class ScSpinnerWidget : public ScWidget
     {
     public:
-        ScSpinnerWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
+        ScSpinnerWidget(WindowClass c, WindowNumber n, WidgetIndex widgetIndex)
             : ScWidget(c, n, widgetIndex)
         {
         }
@@ -934,7 +934,7 @@ namespace OpenRCT2::Scripting
     class ScTextBoxWidget : public ScWidget
     {
     public:
-        ScTextBoxWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
+        ScTextBoxWidget(WindowClass c, WindowNumber n, WidgetIndex widgetIndex)
             : ScWidget(c, n, widgetIndex)
         {
         }
@@ -982,7 +982,7 @@ namespace OpenRCT2::Scripting
     class ScViewportWidget : public ScWidget
     {
     public:
-        ScViewportWidget(WindowClass c, rct_windownumber n, WidgetIndex widgetIndex)
+        ScViewportWidget(WindowClass c, WindowNumber n, WidgetIndex widgetIndex)
             : ScWidget(c, n, widgetIndex)
         {
         }
diff --git a/src/openrct2-ui/scripting/ScWindow.hpp b/src/openrct2-ui/scripting/ScWindow.hpp
index f1d28d04b1..0f577d1951 100644
--- a/src/openrct2-ui/scripting/ScWindow.hpp
+++ b/src/openrct2-ui/scripting/ScWindow.hpp
@@ -25,7 +25,7 @@ namespace OpenRCT2::Scripting
     {
     private:
         WindowClass _class;
-        rct_windownumber _number;
+        WindowNumber _number;
 
     public:
         ScWindow(WindowBase* w)
@@ -33,7 +33,7 @@ namespace OpenRCT2::Scripting
         {
         }
 
-        ScWindow(WindowClass c, rct_windownumber n)
+        ScWindow(WindowClass c, WindowNumber n)
             : _class(c)
             , _number(n)
         {
diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp
index 60f42f5742..80b6d570bd 100644
--- a/src/openrct2-ui/windows/Banner.cpp
+++ b/src/openrct2-ui/windows/Banner.cpp
@@ -137,7 +137,7 @@ namespace OpenRCT2::Ui::Windows
             WindowInitScrollWidgets(*this);
         }
 
-        void Initialise(rct_windownumber _number)
+        void Initialise(WindowNumber _number)
         {
             number = _number;
             auto* banner = GetBanner(BannerIndex::FromUnderlying(number));
@@ -314,7 +314,7 @@ namespace OpenRCT2::Ui::Windows
      *
      *  rct2: 0x006BA305
      */
-    WindowBase* BannerOpen(rct_windownumber number)
+    WindowBase* BannerOpen(WindowNumber number)
     {
         auto* windowMgr = GetWindowManager();
         auto w = static_cast<BannerWindow*>(windowMgr->BringToFrontByNumber(WindowClass::Banner, number));
diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp
index d0475309ae..03c3f37711 100644
--- a/src/openrct2-ui/windows/Sign.cpp
+++ b/src/openrct2-ui/windows/Sign.cpp
@@ -94,7 +94,7 @@ namespace OpenRCT2::Ui::Windows
          * Initializes the window and sets it's number and if it's small
          * @return true if successfull
          */
-        bool Initialize(rct_windownumber windowNumber, const bool isSmall)
+        bool Initialize(WindowNumber windowNumber, const bool isSmall)
         {
             number = windowNumber;
             _isSmall = isSmall;
@@ -333,7 +333,7 @@ namespace OpenRCT2::Ui::Windows
      *
      *  rct2: 0x006BA305
      */
-    WindowBase* SignOpen(rct_windownumber number)
+    WindowBase* SignOpen(WindowNumber number)
     {
         auto* windowMgr = GetWindowManager();
         auto* w = static_cast<SignWindow*>(windowMgr->BringToFrontByNumber(WindowClass::Banner, number));
@@ -357,7 +357,7 @@ namespace OpenRCT2::Ui::Windows
      *
      *  rct2: 0x6E5F52
      */
-    WindowBase* SignSmallOpen(rct_windownumber number)
+    WindowBase* SignSmallOpen(WindowNumber number)
     {
         auto* windowMgr = GetWindowManager();
         auto* w = static_cast<SignWindow*>(windowMgr->BringToFrontByNumber(WindowClass::Banner, number));
diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp
index 1e16afd1eb..9f1a8a690a 100644
--- a/src/openrct2-ui/windows/StaffFirePrompt.cpp
+++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp
@@ -45,7 +45,7 @@ namespace OpenRCT2::Ui::Windows
     class StaffFirePromptWindow final : public Window
     {
     public:
-        void SetWindowNumber(rct_windownumber windownumber)
+        void SetWindowNumber(WindowNumber windownumber)
         {
             number = windownumber;
         }
diff --git a/src/openrct2-ui/windows/Windows.h b/src/openrct2-ui/windows/Windows.h
index 079aab473b..6024cfee40 100644
--- a/src/openrct2-ui/windows/Windows.h
+++ b/src/openrct2-ui/windows/Windows.h
@@ -53,7 +53,7 @@ namespace OpenRCT2::Ui::Windows
     WindowBase* AssetPacksOpen();
 
     // Banner
-    WindowBase* BannerOpen(rct_windownumber number);
+    WindowBase* BannerOpen(WindowNumber number);
 
     // Changelog
     WindowBase* ChangelogOpen(int personality);
@@ -295,8 +295,8 @@ namespace OpenRCT2::Ui::Windows
     WindowBase* ShortcutKeysOpen();
 
     // Sign
-    WindowBase* SignOpen(rct_windownumber number);
-    WindowBase* SignSmallOpen(rct_windownumber number);
+    WindowBase* SignOpen(WindowNumber number);
+    WindowBase* SignSmallOpen(WindowNumber number);
 
     // Staff
     WindowBase* StaffOpen(Peep* peep);
diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp
index 83bbdb5013..1d2394734f 100644
--- a/src/openrct2/interface/Window.cpp
+++ b/src/openrct2/interface/Window.cpp
@@ -632,7 +632,7 @@ static constexpr float kWindowScrollLocations[][2] = {
         return gInputFlags.has(InputFlag::toolActive) && gCurrentToolWidget.windowClassification == cls;
     }
 
-    bool isToolActive(WindowClass cls, rct_windownumber number)
+    bool isToolActive(WindowClass cls, WindowNumber number)
     {
         return isToolActive(cls) && gCurrentToolWidget.windowNumber == number;
     }
@@ -642,7 +642,7 @@ static constexpr float kWindowScrollLocations[][2] = {
         return isToolActive(cls) && gCurrentToolWidget.widgetIndex == widgetIndex;
     }
 
-    bool isToolActive(WindowClass cls, WidgetIndex widgetIndex, rct_windownumber number)
+    bool isToolActive(WindowClass cls, WidgetIndex widgetIndex, WindowNumber number)
     {
         return isToolActive(cls, widgetIndex) && gCurrentToolWidget.windowNumber == number;
     }
diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h
index f300a33ce5..37f571f82e 100644
--- a/src/openrct2/interface/Window.h
+++ b/src/openrct2/interface/Window.h
@@ -31,7 +31,7 @@ enum class CloseWindowModifier : uint8_t;
 
 namespace OpenRCT2
 {
-    using rct_windownumber = int16_t;
+    using WindowNumber = int16_t;
 
     struct WindowBase;
     struct WindowCloseModifier;
@@ -41,7 +41,7 @@ namespace OpenRCT2
     struct WindowIdentifier
     {
         WindowClass classification;
-        rct_windownumber number;
+        WindowNumber number;
     };
 
     struct WidgetIdentifier
@@ -267,7 +267,7 @@ namespace OpenRCT2
     struct WidgetRef
     {
         WindowClass windowClassification;
-        rct_windownumber windowNumber;
+        WindowNumber windowNumber;
         WidgetIndex widgetIndex;
     };
 
@@ -313,9 +313,9 @@ namespace OpenRCT2
     void WindowDraw(RenderTarget& rt, WindowBase& w, int32_t left, int32_t top, int32_t right, int32_t bottom);
 
     bool isToolActive(WindowClass cls);
-    bool isToolActive(WindowClass cls, rct_windownumber number);
+    bool isToolActive(WindowClass cls, WindowNumber number);
     bool isToolActive(WindowClass cls, WidgetIndex widgetIndex);
-    bool isToolActive(WindowClass cls, WidgetIndex widgetIndex, rct_windownumber number);
+    bool isToolActive(WindowClass cls, WidgetIndex widgetIndex, WindowNumber number);
     bool isToolActive(const WindowBase& w, WidgetIndex widgetIndex);
     bool ToolSet(const WindowBase& w, WidgetIndex widgetIndex, Tool tool);
     void ToolCancel();
diff --git a/src/openrct2/interface/WindowBase.h b/src/openrct2/interface/WindowBase.h
index e2fb41dbc0..e3e19751a2 100644
--- a/src/openrct2/interface/WindowBase.h
+++ b/src/openrct2/interface/WindowBase.h
@@ -85,7 +85,7 @@ namespace OpenRCT2
         int16_t max_height{};
         union
         {
-            rct_windownumber number{};
+            WindowNumber number{};
             RideId rideId;
         };
         WindowFlags flags{};
diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index 74727be896..4d7c5422b3 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -4128,7 +4128,7 @@ ResultWithMessage Ride::open(bool isApplying)
     // to set the track to its final state and clean up ghosts.
     // We can't just call close as it would cause a stack overflow during shop creation
     // with auto open on.
-    if (isToolActive(WindowClass::RideConstruction, static_cast<rct_windownumber>(id.ToUnderlying())))
+    if (isToolActive(WindowClass::RideConstruction, static_cast<WindowNumber>(id.ToUnderlying())))
     {
         auto* windowMgr = Ui::GetWindowManager();
         windowMgr->CloseByNumber(WindowClass::RideConstruction, id.ToUnderlying());
diff --git a/src/openrct2/ui/DummyWindowManager.cpp b/src/openrct2/ui/DummyWindowManager.cpp
index d81abc7ed3..7bf109967c 100644
--- a/src/openrct2/ui/DummyWindowManager.cpp
+++ b/src/openrct2/ui/DummyWindowManager.cpp
@@ -78,20 +78,20 @@ namespace OpenRCT2::Ui
         void Close(WindowBase& window) override {};
         void CloseSurplus(int32_t cap, WindowClass avoid_classification) override {};
         void CloseByClass(WindowClass cls) override {};
-        void CloseByNumber(WindowClass cls, rct_windownumber number) override {};
+        void CloseByNumber(WindowClass cls, WindowNumber number) override {};
         void CloseByNumber(WindowClass cls, EntityId number) override {};
         void CloseTop() override {};
         void CloseAll() override {};
         void CloseAllExceptClass(WindowClass cls) override {};
         void CloseAllExceptFlags(WindowFlags flags) override {};
-        void CloseAllExceptNumberAndClass(rct_windownumber number, WindowClass cls) override {};
+        void CloseAllExceptNumberAndClass(WindowNumber number, WindowClass cls) override {};
         void CloseConstructionWindows() override {};
 
         WindowBase* FindByClass(WindowClass cls) override
         {
             return nullptr;
         }
-        WindowBase* FindByNumber(WindowClass cls, rct_windownumber number) override
+        WindowBase* FindByNumber(WindowClass cls, WindowNumber number) override
         {
             return nullptr;
         }
@@ -109,12 +109,12 @@ namespace OpenRCT2::Ui
         }
 
         void InvalidateByClass(WindowClass cls) override {};
-        void InvalidateByNumber(WindowClass cls, rct_windownumber number) override {};
+        void InvalidateByNumber(WindowClass cls, WindowNumber number) override {};
         void InvalidateByNumber(WindowClass cls, EntityId id) override {};
         void InvalidateAll() override {};
         void InvalidateWidget(WindowBase& w, WidgetIndex widgetIndex) override {};
         void InvalidateWidgetByClass(WindowClass cls, WidgetIndex widgetIndex) override {};
-        void InvalidateWidgetByNumber(WindowClass cls, rct_windownumber number, WidgetIndex widgetIndex) override {};
+        void InvalidateWidgetByNumber(WindowClass cls, WindowNumber number, WidgetIndex widgetIndex) override {};
 
         WindowBase* BringToFront(WindowBase& w) override
         {
@@ -128,7 +128,7 @@ namespace OpenRCT2::Ui
         {
             return nullptr;
         }
-        WindowBase* BringToFrontByNumber(WindowClass cls, rct_windownumber number) override
+        WindowBase* BringToFrontByNumber(WindowClass cls, WindowNumber number) override
         {
             return nullptr;
         }
diff --git a/src/openrct2/ui/WindowManager.h b/src/openrct2/ui/WindowManager.h
index e1c6f05744..91d1cb8cc5 100644
--- a/src/openrct2/ui/WindowManager.h
+++ b/src/openrct2/ui/WindowManager.h
@@ -88,33 +88,33 @@ namespace OpenRCT2::Ui
         virtual void Close(WindowBase& window) = 0;
         virtual void CloseSurplus(int32_t cap, WindowClass avoid_classification) = 0;
         virtual void CloseByClass(WindowClass cls) = 0;
-        virtual void CloseByNumber(WindowClass cls, rct_windownumber number) = 0;
+        virtual void CloseByNumber(WindowClass cls, WindowNumber number) = 0;
         virtual void CloseByNumber(WindowClass cls, EntityId number) = 0;
         virtual void CloseTop() = 0;
         virtual void CloseAll() = 0;
         virtual void CloseAllExceptClass(WindowClass cls) = 0;
         virtual void CloseAllExceptFlags(WindowFlags flags) = 0;
-        virtual void CloseAllExceptNumberAndClass(rct_windownumber number, WindowClass cls) = 0;
+        virtual void CloseAllExceptNumberAndClass(WindowNumber number, WindowClass cls) = 0;
         virtual void CloseConstructionWindows() = 0;
 
         virtual WindowBase* FindByClass(WindowClass cls) = 0;
-        virtual WindowBase* FindByNumber(WindowClass cls, rct_windownumber number) = 0;
+        virtual WindowBase* FindByNumber(WindowClass cls, WindowNumber number) = 0;
         virtual WindowBase* FindByNumber(WindowClass cls, EntityId id) = 0;
         virtual WindowBase* FindFromPoint(const ScreenCoordsXY& screenCoords) = 0;
         virtual WidgetIndex FindWidgetFromPoint(WindowBase& w, const ScreenCoordsXY& screenCoords) = 0;
 
         virtual void InvalidateByClass(WindowClass cls) = 0;
-        virtual void InvalidateByNumber(WindowClass cls, rct_windownumber number) = 0;
+        virtual void InvalidateByNumber(WindowClass cls, WindowNumber number) = 0;
         virtual void InvalidateByNumber(WindowClass cls, EntityId id) = 0;
         virtual void InvalidateAll() = 0;
         virtual void InvalidateWidget(WindowBase& w, WidgetIndex widgetIndex) = 0;
         virtual void InvalidateWidgetByClass(WindowClass cls, WidgetIndex widgetIndex) = 0;
-        virtual void InvalidateWidgetByNumber(WindowClass cls, rct_windownumber number, WidgetIndex widgetIndex) = 0;
+        virtual void InvalidateWidgetByNumber(WindowClass cls, WindowNumber number, WidgetIndex widgetIndex) = 0;
 
         virtual WindowBase* BringToFront(WindowBase& w) = 0;
         virtual WindowBase* BringToFrontByClass(WindowClass cls) = 0;
         virtual WindowBase* BringToFrontByClassWithFlags(WindowClass cls, WindowFlags flags) = 0;
-        virtual WindowBase* BringToFrontByNumber(WindowClass cls, rct_windownumber number) = 0;
+        virtual WindowBase* BringToFrontByNumber(WindowClass cls, WindowNumber number) = 0;
     };
 
     std::unique_ptr<IWindowManager> CreateDummyWindowManager();