Merge pull request #19018 from Sadret/rename_actions

rename actions to fit naming pattern
2026-01-17 20:13:07 +01:00 · 2023-01-06 23:18:00 +01:00
parent 51582e3ab0 bfcf66a8f7
commit d1ab1dad97
26 changed files with 164 additions and 163 deletions
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -4,11 +4,12 @@
 - Feature: [#18732] [Plugin] API to get the guests thoughts.
 - Feature: [#18744] Cheat to allow using a regular path as a queue path.
 - Feature: [#19023] Add Canadian French translation.
- Improved: [#18749] Ability to have 4 active awards for more than one month in a row. 
+- Improved: [#18749] Ability to have 4 active awards for more than one month in a row.
 - Improved: [#18826] [Plugin] Added all actions and their documentation to plugin API.
 - Improved: [#18945] Languages can now fall back to other languages than English.
 - Improved: [#18970] Trying to load a non-park save will now display a context error.
 - Improved: [#19044] Added special thanks to RMC and Wiegand to the About page.
+- Change: [#19018] Renamed actions to fit the naming scheme.
 - Fix: [#18467] “Selected only” Object Selection filter is active in Track Designs Manager, and cannot be toggled.
 - Fix: [#18905] Ride Construction window theme is not applied correctly.
 - Fix: [#18911] Mini Golf station does not draw correctly from all angles.
--- a/distribution/openrct2.d.ts
+++ b/distribution/openrct2.d.ts
@@ -285,7 +285,7 @@ declare global {
        queryAction(action: "bannersetcolour", args: BannerSetColourArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "bannersetname", args: BannerSetNameArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "bannersetstyle", args: BannerSetStyleArgs, callback?: (result: GameActionResult) => void): void;
-        queryAction(action: "changemapsize", args: ChangeMapSizeArgs, callback?: (result: GameActionResult) => void): void;
+        queryAction(action: "cheatset", args: CheatSetArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "clearscenery", args: ClearSceneryArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "climateset", args: ClimateSetArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "footpathadditionplace", args: FootpathAdditionPlaceArgs, callback?: (result: GameActionResult) => void): void;
@@ -305,6 +305,7 @@ declare global {
        queryAction(action: "largesceneryremove", args: LargeSceneryRemoveArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "largescenerysetcolour", args: LargeScenerySetColourArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "loadorquit", args: LoadOrQuitArgs, callback?: (result: GameActionResult) => void): void;
+        queryAction(action: "mapchangesize", args: MapChangeSizeArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "mazeplacetrack", args: MazePlaceTrackArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "mazesettrack", args: MazeSetTrackArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "networkmodifygroup", args: NetworkModifyGroupArgs, callback?: (result: GameActionResult) => void): void;
@@ -312,6 +313,7 @@ declare global {
        queryAction(action: "parkentranceremove", args: ParkEntranceRemoveArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "parkmarketing", args: ParkMarketingArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "parksetdate", args: ParkSetDateArgs, callback?: (result: GameActionResult) => void): void;
+        queryAction(action: "parksetentrancefee", args: ParkSetEntranceFeeArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "parksetloan", args: ParkSetLoanArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "parksetname", args: ParkSetNameArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "parksetparameter", args: ParkSetParameterArgs, callback?: (result: GameActionResult) => void): void;
@@ -334,8 +336,6 @@ declare global {
        queryAction(action: "ridesetstatus", args: RideSetStatusArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "ridesetvehicle", args: RideSetVehicleArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "scenariosetsetting", args: ScenarioSetSettingArgs, callback?: (result: GameActionResult) => void): void;
-        queryAction(action: "setcheat", args: SetCheatArgs, callback?: (result: GameActionResult) => void): void;
-        queryAction(action: "setparkentrancefee", args: SetParkEntranceFeeArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "signsetname", args: SignSetNameArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "signsetstyle", args: SignSetStyleArgs, callback?: (result: GameActionResult) => void): void;
        queryAction(action: "smallsceneryplace", args: SmallSceneryPlaceArgs, callback?: (result: GameActionResult) => void): void;
@@ -376,7 +376,7 @@ declare global {
        executeAction(action: "bannersetcolour", args: BannerSetColourArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "bannersetname", args: BannerSetNameArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "bannersetstyle", args: BannerSetStyleArgs, callback?: (result: GameActionResult) => void): void;
-        executeAction(action: "changemapsize", args: ChangeMapSizeArgs, callback?: (result: GameActionResult) => void): void;
+        executeAction(action: "cheatset", args: CheatSetArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "clearscenery", args: ClearSceneryArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "climateset", args: ClimateSetArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "footpathadditionplace", args: FootpathAdditionPlaceArgs, callback?: (result: GameActionResult) => void): void;
@@ -396,6 +396,7 @@ declare global {
        executeAction(action: "largesceneryremove", args: LargeSceneryRemoveArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "largescenerysetcolour", args: LargeScenerySetColourArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "loadorquit", args: LoadOrQuitArgs, callback?: (result: GameActionResult) => void): void;
+        executeAction(action: "mapchangesize", args: MapChangeSizeArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "mazeplacetrack", args: MazePlaceTrackArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "mazesettrack", args: MazeSetTrackArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "networkmodifygroup", args: NetworkModifyGroupArgs, callback?: (result: GameActionResult) => void): void;
@@ -403,6 +404,7 @@ declare global {
        executeAction(action: "parkentranceremove", args: ParkEntranceRemoveArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "parkmarketing", args: ParkMarketingArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "parksetdate", args: ParkSetDateArgs, callback?: (result: GameActionResult) => void): void;
+        executeAction(action: "parksetentrancefee", args: ParkSetEntranceFeeArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "parksetloan", args: ParkSetLoanArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "parksetname", args: ParkSetNameArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "parksetparameter", args: ParkSetParameterArgs, callback?: (result: GameActionResult) => void): void;
@@ -425,8 +427,6 @@ declare global {
        executeAction(action: "ridesetstatus", args: RideSetStatusArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "ridesetvehicle", args: RideSetVehicleArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "scenariosetsetting", args: ScenarioSetSettingArgs, callback?: (result: GameActionResult) => void): void;
-        executeAction(action: "setcheat", args: SetCheatArgs, callback?: (result: GameActionResult) => void): void;
-        executeAction(action: "setparkentrancefee", args: SetParkEntranceFeeArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "signsetname", args: SignSetNameArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "signsetstyle", args: SignSetStyleArgs, callback?: (result: GameActionResult) => void): void;
        executeAction(action: "smallsceneryplace", args: SmallSceneryPlaceArgs, callback?: (result: GameActionResult) => void): void;
@@ -609,7 +609,7 @@ declare global {
        "bannersetcolour" |
        "bannersetname" |
        "bannersetstyle" |
-        "changemapsize" |
+        "cheatset" |
        "clearscenery" |
        "climateset" |
        "footpathadditionplace" |
@@ -629,6 +629,7 @@ declare global {
        "largesceneryremove" |
        "largescenerysetcolour" |
        "loadorquit" |
+        "mapchangesize" |
        "mazeplacetrack" |
        "mazesettrack" |
        "networkmodifygroup" |
@@ -636,6 +637,7 @@ declare global {
        "parkentranceremove" |
        "parkmarketing" |
        "parksetdate" |
+        "parksetentrancefee" |
        "parksetloan" |
        "parksetname" |
        "parksetparameter" |
@@ -658,8 +660,6 @@ declare global {
        "ridesetstatus" |
        "ridesetvehicle" |
        "scenariosetsetting" |
-        "setcheat" |
-        "setparkentrancefee" |
        "signsetname" |
        "signsetstyle" |
        "smallsceneryplace" |
@@ -729,9 +729,10 @@ declare global {
        parameter: number; // primary colour | secondary colour | 0: disable, 1: enable
    }

-    interface ChangeMapSizeArgs extends GameActionArgs {
-        targetSizeX: number;
-        targetSizeY: number;
+    interface CheatSetArgs extends GameActionArgs {
+        type: number; // see CheatType in openrct2/Cheats.h
+        param1: number; // see openrct2/actions/CheatSetAction.cpp
+        param2: number; // see openrct2/actions/CheatSetAction.cpp
    }

    interface ClearSceneryArgs extends GameActionArgs {
@@ -891,6 +892,11 @@ declare global {
        savePromptMode: number; // 0: save before load, 1: save before quit. Only used if mode = 0 (open save prompt).
    }

+    interface MapChangeSizeArgs extends GameActionArgs {
+        targetSizeX: number;
+        targetSizeY: number;
+    }
+
    interface MazePlaceTrackArgs extends GameActionArgs {
        x: number;
        y: number;
@@ -943,6 +949,10 @@ declare global {
        day: number;
    }

+    interface ParkSetEntranceFeeArgs extends GameActionArgs {
+        value: number;
+    }
+
    interface ParkSetLoanArgs extends GameActionArgs {
        value: number;
    }
@@ -1080,16 +1090,6 @@ declare global {
        value: number;
    }

-    interface SetCheatArgs extends GameActionArgs {
-        type: number; // see CheatType in openrct2/Cheats.h
-        param1: number; // see openrct2/actions/SetCheatAction.cpp
-        param2: number; // see openrct2/actions/SetCheatAction.cpp
-    }
-
-    interface SetParkEntranceFeeArgs extends GameActionArgs {
-        value: number;
-    }
-
    interface SignSetNameArgs extends GameActionArgs {
        id: number;
        name: string;
--- a/src/openrct2-ui/input/Shortcuts.cpp
+++ b/src/openrct2-ui/input/Shortcuts.cpp
@@ -21,8 +21,8 @@
 #include <openrct2/Game.h>
 #include <openrct2/Input.h>
 #include <openrct2/OpenRCT2.h>
+#include <openrct2/actions/CheatSetAction.h>
 #include <openrct2/actions/LoadOrQuitAction.h>
-#include <openrct2/actions/SetCheatAction.h>
 #include <openrct2/audio/audio.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/interface/Chat.h>
@@ -612,8 +612,8 @@ static void ShortcutDecreaseElementHeight()

 static void ShortcutToggleClearanceChecks()
 {
-    auto setCheatAction = SetCheatAction(CheatType::DisableClearanceChecks, gCheatsDisableClearanceChecks ? 0 : 1);
-    GameActions::Execute(&setCheatAction);
+    auto cheatSetAction = CheatSetAction(CheatType::DisableClearanceChecks, gCheatsDisableClearanceChecks ? 0 : 1);
+    GameActions::Execute(&cheatSetAction);
 }

 static void ShortcutToggleConsole()
--- a/src/openrct2-ui/windows/Cheats.cpp
+++ b/src/openrct2-ui/windows/Cheats.cpp
@@ -15,8 +15,8 @@
 #include <openrct2/Context.h>
 #include <openrct2/Game.h>
 #include <openrct2/OpenRCT2.h>
+#include <openrct2/actions/CheatSetAction.h>
 #include <openrct2/actions/ParkSetDateAction.h>
-#include <openrct2/actions/SetCheatAction.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/localisation/Date.h>
 #include <openrct2/localisation/Formatter.h>
@@ -798,8 +798,8 @@ private:
                InvalidateWidget(WIDX_PARK_RATING_SPINNER);
                if (ParkGetForcedRating() >= 0)
                {
-                    auto setCheatAction = SetCheatAction(CheatType::SetForcedParkRating, _parkRatingSpinnerValue);
-                    GameActions::Execute(&setCheatAction);
+                    auto cheatSetAction = CheatSetAction(CheatType::SetForcedParkRating, _parkRatingSpinnerValue);
+                    GameActions::Execute(&cheatSetAction);
                }
                break;
            case WIDX_DECREASE_PARK_RATING:
--- a/src/openrct2-ui/windows/Map.cpp
+++ b/src/openrct2-ui/windows/Map.cpp
@@ -17,10 +17,10 @@
 #include <openrct2/Game.h>
 #include <openrct2/Input.h>
 #include <openrct2/OpenRCT2.h>
-#include <openrct2/actions/ChangeMapSizeAction.h>
 #include <openrct2/actions/LandSetRightsAction.h>
-#include <openrct2/actions/PlaceParkEntranceAction.h>
-#include <openrct2/actions/PlacePeepSpawnAction.h>
+#include <openrct2/actions/MapChangeSizeAction.h>
+#include <openrct2/actions/ParkEntrancePlaceAction.h>
+#include <openrct2/actions/PeepSpawnPlaceAction.h>
 #include <openrct2/actions/SurfaceSetStyleAction.h>
 #include <openrct2/audio/audio.h>
 #include <openrct2/entity/EntityList.h>
@@ -516,7 +516,7 @@ public:

        ParkEntranceRemoveGhost();

-        auto gameAction = PlaceParkEntranceAction(parkEntrancePosition, gFootpathSelectedId);
+        auto gameAction = ParkEntrancePlaceAction(parkEntrancePosition, gFootpathSelectedId);
        gameAction.SetFlags(GAME_COMMAND_FLAG_GHOST);

        auto result = GameActions::Execute(&gameAction);
@@ -534,7 +534,7 @@ public:
        CoordsXYZD parkEntrancePosition = PlaceParkEntranceGetMapPosition(screenCoords);
        if (!parkEntrancePosition.IsNull())
        {
-            auto gameAction = PlaceParkEntranceAction(parkEntrancePosition, gFootpathSelectedId);
+            auto gameAction = ParkEntrancePlaceAction(parkEntrancePosition, gFootpathSelectedId);
            auto result = GameActions::Execute(&gameAction);
            if (result.Error == GameActions::Status::Ok)
            {
@@ -584,7 +584,7 @@ public:

        int32_t mapZ = tileElement->GetBaseZ();

-        auto gameAction = PlacePeepSpawnAction({ mapCoords, mapZ, static_cast<Direction>(direction) });
+        auto gameAction = PeepSpawnPlaceAction({ mapCoords, mapZ, static_cast<Direction>(direction) });
        auto result = GameActions::Execute(&gameAction);
        if (result.Error == GameActions::Status::Ok)
        {
@@ -630,8 +630,8 @@ public:
                    if (_resizeDirection != ResizeDirection::Y)
                        newMapSize.x = size;

-                    auto changeMapSizeAction = ChangeMapSizeAction(newMapSize);
-                    GameActions::Execute(&changeMapSizeAction);
+                    auto mapChangeSizeAction = MapChangeSizeAction(newMapSize);
+                    GameActions::Execute(&mapChangeSizeAction);
                    Invalidate();
                }
                break;
@@ -978,7 +978,7 @@ private:
        if (IsWidgetPressed(WIDX_MAP_SIZE_LINK) || _resizeDirection == ResizeDirection::X)
            newMapSize.x++;

-        auto increaseMapSizeAction = ChangeMapSizeAction(newMapSize);
+        auto increaseMapSizeAction = MapChangeSizeAction(newMapSize);
        GameActions::Execute(&increaseMapSizeAction);
    }

@@ -990,7 +990,7 @@ private:
        if (IsWidgetPressed(WIDX_MAP_SIZE_LINK) || _resizeDirection == ResizeDirection::X)
            newMapSize.x--;

-        auto decreaseMapSizeAction = ChangeMapSizeAction(newMapSize);
+        auto decreaseMapSizeAction = MapChangeSizeAction(newMapSize);
        GameActions::Execute(&decreaseMapSizeAction);
    }

--- a/src/openrct2-ui/windows/Park.cpp
+++ b/src/openrct2-ui/windows/Park.cpp
@@ -22,8 +22,8 @@
 #include <openrct2/Game.h>
 #include <openrct2/GameState.h>
 #include <openrct2/Input.h>
+#include <openrct2/actions/ParkSetEntranceFeeAction.h>
 #include <openrct2/actions/ParkSetNameAction.h>
-#include <openrct2/actions/SetParkEntranceFeeAction.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/localisation/Date.h>
 #include <openrct2/localisation/Formatter.h>
@@ -828,14 +828,14 @@ private:
            case WIDX_INCREASE_PRICE:
            {
                const auto newFee = std::min(MAX_ENTRANCE_FEE, gParkEntranceFee + 1.00_GBP);
-                auto gameAction = SetParkEntranceFeeAction(static_cast<money16>(newFee));
+                auto gameAction = ParkSetEntranceFeeAction(static_cast<money16>(newFee));
                GameActions::Execute(&gameAction);
                break;
            }
            case WIDX_DECREASE_PRICE:
            {
                const auto newFee = std::max(0.00_GBP, gParkEntranceFee - 1.00_GBP);
-                auto gameAction = SetParkEntranceFeeAction(static_cast<money16>(newFee));
+                auto gameAction = ParkSetEntranceFeeAction(static_cast<money16>(newFee));
                GameActions::Execute(&gameAction);
                break;
            }
--- a/src/openrct2-ui/windows/Transparency.cpp
+++ b/src/openrct2-ui/windows/Transparency.cpp
@@ -16,8 +16,8 @@
 #include <openrct2/Context.h>
 #include <openrct2/Game.h>
 #include <openrct2/OpenRCT2.h>
+#include <openrct2/actions/CheatSetAction.h>
 #include <openrct2/actions/ParkSetDateAction.h>
-#include <openrct2/actions/SetCheatAction.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/entity/Staff.h>
 #include <openrct2/localisation/Date.h>
--- a/src/openrct2/Cheats.cpp
+++ b/src/openrct2/Cheats.cpp
@@ -10,8 +10,8 @@
 #include "Cheats.h"

 #include "GameState.h"
+#include "actions/CheatSetAction.h"
 #include "actions/ParkSetLoanAction.h"
-#include "actions/SetCheatAction.h"
 #include "config/Config.h"
 #include "core/DataSerialiser.h"
 #include "localisation/Localisation.h"
@@ -83,8 +83,8 @@ void CheatsReset()

 void CheatsSet(CheatType cheatType, int32_t param1 /* = 0*/, int32_t param2 /* = 0*/)
 {
-    auto setCheatAction = SetCheatAction(cheatType, param1, param2);
-    GameActions::Execute(&setCheatAction);
+    auto cheatSetAction = CheatSetAction(cheatType, param1, param2);
+    GameActions::Execute(&cheatSetAction);
 }

 template<typename T> static void CheatEntrySerialise(DataSerialiser& ds, CheatType type, const T& value, uint16_t& count)
--- a/src/openrct2/ReplayManager.cpp
+++ b/src/openrct2/ReplayManager.cpp
@@ -15,11 +15,11 @@
 #include "OpenRCT2.h"
 #include "ParkImporter.h"
 #include "PlatformEnvironment.h"
+#include "actions/CheatSetAction.h"
 #include "actions/FootpathPlaceAction.h"
 #include "actions/GameAction.h"
 #include "actions/RideEntranceExitPlaceAction.h"
 #include "actions/RideSetSettingAction.h"
-#include "actions/SetCheatAction.h"
 #include "actions/TileModifyAction.h"
 #include "actions/TrackPlaceAction.h"
 #include "config/Config.h"
--- a/src/openrct2/actions/CheatSetAction.cpp
+++ b/src/openrct2/actions/CheatSetAction.cpp
@@ -7,7 +7,7 @@
 * OpenRCT2 is licensed under the GNU General Public License version 3.
 *****************************************************************************/

-#include "SetCheatAction.h"
+#include "CheatSetAction.h"

 #include "../Cheats.h"
 #include "../Context.h"
@@ -40,32 +40,32 @@

 using ParametersRange = std::pair<std::pair<int32_t, int32_t>, std::pair<int32_t, int32_t>>;

-SetCheatAction::SetCheatAction(CheatType cheatType, int32_t param1, int32_t param2)
+CheatSetAction::CheatSetAction(CheatType cheatType, int32_t param1, int32_t param2)
    : _cheatType(static_cast<int32_t>(cheatType))
    , _param1(param1)
    , _param2(param2)
 {
 }

-void SetCheatAction::AcceptParameters(GameActionParameterVisitor& visitor)
+void CheatSetAction::AcceptParameters(GameActionParameterVisitor& visitor)
 {
    visitor.Visit("type", _cheatType);
    visitor.Visit("param1", _param1);
    visitor.Visit("param2", _param2);
 }

-uint16_t SetCheatAction::GetActionFlags() const
+uint16_t CheatSetAction::GetActionFlags() const
 {
    return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused;
 }

-void SetCheatAction::Serialise(DataSerialiser& stream)
+void CheatSetAction::Serialise(DataSerialiser& stream)
 {
    GameAction::Serialise(stream);
    stream << DS_TAG(_cheatType) << DS_TAG(_param1) << DS_TAG(_param2);
 }

-GameActions::Result SetCheatAction::Query() const
+GameActions::Result CheatSetAction::Query() const
 {
    if (static_cast<uint32_t>(_cheatType) >= static_cast<uint32_t>(CheatType::Count))
    {
@@ -86,7 +86,7 @@ GameActions::Result SetCheatAction::Query() const
    return GameActions::Result();
 }

-GameActions::Result SetCheatAction::Execute() const
+GameActions::Result CheatSetAction::Execute() const
 {
    switch (static_cast<CheatType>(_cheatType.id))
    {
@@ -260,7 +260,7 @@ GameActions::Result SetCheatAction::Execute() const
    return GameActions::Result();
 }

-ParametersRange SetCheatAction::GetParameterRange(CheatType cheatType) const
+ParametersRange CheatSetAction::GetParameterRange(CheatType cheatType) const
 {
    switch (static_cast<CheatType>(_cheatType.id))
    {
@@ -360,7 +360,7 @@ ParametersRange SetCheatAction::GetParameterRange(CheatType cheatType) const
    }
 }

-void SetCheatAction::SetGrassLength(int32_t length) const
+void CheatSetAction::SetGrassLength(int32_t length) const
 {
    for (int32_t y = 0; y < gMapSize.y; y++)
    {
@@ -381,7 +381,7 @@ void SetCheatAction::SetGrassLength(int32_t length) const
    gfx_invalidate_screen();
 }

-void SetCheatAction::WaterPlants() const
+void CheatSetAction::WaterPlants() const
 {
    tile_element_iterator it;

@@ -397,7 +397,7 @@ void SetCheatAction::WaterPlants() const
    gfx_invalidate_screen();
 }

-void SetCheatAction::FixVandalism() const
+void CheatSetAction::FixVandalism() const
 {
    tile_element_iterator it;

@@ -416,7 +416,7 @@ void SetCheatAction::FixVandalism() const
    gfx_invalidate_screen();
 }

-void SetCheatAction::RemoveLitter() const
+void CheatSetAction::RemoveLitter() const
 {
    for (auto litter : EntityList<Litter>())
    {
@@ -443,7 +443,7 @@ void SetCheatAction::RemoveLitter() const
    gfx_invalidate_screen();
 }

-void SetCheatAction::FixBrokenRides() const
+void CheatSetAction::FixBrokenRides() const
 {
    for (auto& ride : GetRideManager())
    {
@@ -462,7 +462,7 @@ void SetCheatAction::FixBrokenRides() const
    }
 }

-void SetCheatAction::RenewRides() const
+void CheatSetAction::RenewRides() const
 {
    for (auto& ride : GetRideManager())
    {
@@ -471,7 +471,7 @@ void SetCheatAction::RenewRides() const
    window_invalidate_by_class(WindowClass::Ride);
 }

-void SetCheatAction::MakeDestructible() const
+void CheatSetAction::MakeDestructible() const
 {
    for (auto& ride : GetRideManager())
    {
@@ -481,7 +481,7 @@ void SetCheatAction::MakeDestructible() const
    window_invalidate_by_class(WindowClass::Ride);
 }

-void SetCheatAction::ResetRideCrashStatus() const
+void CheatSetAction::ResetRideCrashStatus() const
 {
    for (auto& ride : GetRideManager())
    {
@@ -492,7 +492,7 @@ void SetCheatAction::ResetRideCrashStatus() const
    window_invalidate_by_class(WindowClass::Ride);
 }

-void SetCheatAction::Set10MinuteInspection() const
+void CheatSetAction::Set10MinuteInspection() const
 {
    for (auto& ride : GetRideManager())
    {
@@ -502,7 +502,7 @@ void SetCheatAction::Set10MinuteInspection() const
    window_invalidate_by_class(WindowClass::Ride);
 }

-void SetCheatAction::SetScenarioNoMoney(bool enabled) const
+void CheatSetAction::SetScenarioNoMoney(bool enabled) const
 {
    if (enabled)
    {
@@ -522,7 +522,7 @@ void SetCheatAction::SetScenarioNoMoney(bool enabled) const
    window_invalidate_by_class(WindowClass::Cheats);
 }

-void SetCheatAction::SetMoney(money64 amount) const
+void CheatSetAction::SetMoney(money64 amount) const
 {
    gCash = amount;

@@ -530,7 +530,7 @@ void SetCheatAction::SetMoney(money64 amount) const
    window_invalidate_by_class(WindowClass::BottomToolbar);
 }

-void SetCheatAction::AddMoney(money64 amount) const
+void CheatSetAction::AddMoney(money64 amount) const
 {
    gCash = add_clamp_money64(gCash, amount);

@@ -538,7 +538,7 @@ void SetCheatAction::AddMoney(money64 amount) const
    window_invalidate_by_class(WindowClass::BottomToolbar);
 }

-void SetCheatAction::ClearLoan() const
+void CheatSetAction::ClearLoan() const
 {
    // First give money
    AddMoney(gBankLoan);
@@ -548,7 +548,7 @@ void SetCheatAction::ClearLoan() const
    GameActions::ExecuteNested(&gameAction);
 }

-void SetCheatAction::GenerateGuests(int32_t count) const
+void CheatSetAction::GenerateGuests(int32_t count) const
 {
    auto& park = OpenRCT2::GetContext()->GetGameState()->GetPark();
    for (int32_t i = 0; i < count; i++)
@@ -558,7 +558,7 @@ void SetCheatAction::GenerateGuests(int32_t count) const
    window_invalidate_by_class(WindowClass::BottomToolbar);
 }

-void SetCheatAction::SetGuestParameter(int32_t parameter, int32_t value) const
+void CheatSetAction::SetGuestParameter(int32_t parameter, int32_t value) const
 {
    for (auto peep : EntityList<Guest>())
    {
@@ -602,7 +602,7 @@ void SetCheatAction::SetGuestParameter(int32_t parameter, int32_t value) const
    }
 }

-void SetCheatAction::GiveObjectToGuests(int32_t object) const
+void CheatSetAction::GiveObjectToGuests(int32_t object) const
 {
    for (auto peep : EntityList<Guest>())
    {
@@ -629,7 +629,7 @@ void SetCheatAction::GiveObjectToGuests(int32_t object) const
    window_invalidate_by_class(WindowClass::Peep);
 }

-void SetCheatAction::RemoveAllGuests() const
+void CheatSetAction::RemoveAllGuests() const
 {
    for (auto& ride : GetRideManager())
    {
@@ -677,7 +677,7 @@ void SetCheatAction::RemoveAllGuests() const
    gfx_invalidate_screen();
 }

-void SetCheatAction::SetStaffSpeed(uint8_t value) const
+void CheatSetAction::SetStaffSpeed(uint8_t value) const
 {
    for (auto peep : EntityList<Staff>())
    {
@@ -686,7 +686,7 @@ void SetCheatAction::SetStaffSpeed(uint8_t value) const
    }
 }

-void SetCheatAction::OwnAllLand() const
+void CheatSetAction::OwnAllLand() const
 {
    const auto min = CoordsXY{ COORDS_XY_STEP, COORDS_XY_STEP };
    const auto max = GetMapSizeUnits() - CoordsXY{ COORDS_XY_STEP, COORDS_XY_STEP };
@@ -732,13 +732,13 @@ void SetCheatAction::OwnAllLand() const
    MapCountRemainingLandRights();
 }

-void SetCheatAction::ParkSetOpen(bool isOpen) const
+void CheatSetAction::ParkSetOpen(bool isOpen) const
 {
    auto parkSetParameter = ParkSetParameterAction(isOpen ? ParkParameter::Open : ParkParameter::Close);
    GameActions::ExecuteNested(&parkSetParameter);
 }

-void SetCheatAction::CreateDucks(int count) const
+void CheatSetAction::CreateDucks(int count) const
 {
    for (int i = 0; i < count; i++)
    {
--- a/src/openrct2/actions/CheatSetAction.h
+++ b/src/openrct2/actions/CheatSetAction.h
@@ -11,7 +11,7 @@

 #include "GameAction.h"

-class SetCheatAction final : public GameActionBase<GameCommand::Cheat>
+class CheatSetAction final : public GameActionBase<GameCommand::Cheat>
 {
    using ParametersRange = std::pair<std::pair<int32_t, int32_t>, std::pair<int32_t, int32_t>>;

@@ -21,8 +21,8 @@ private:
    int32_t _param2{};

 public:
-    SetCheatAction() = default;
-    SetCheatAction(CheatType cheatType, int32_t param1 = 0, int32_t param2 = 0);
+    CheatSetAction() = default;
+    CheatSetAction(CheatType cheatType, int32_t param1 = 0, int32_t param2 = 0);

    void AcceptParameters(GameActionParameterVisitor& visitor) override;

--- a/src/openrct2/actions/GameActionRegistry.cpp
+++ b/src/openrct2/actions/GameActionRegistry.cpp
@@ -13,7 +13,7 @@
 #include "BannerSetColourAction.h"
 #include "BannerSetNameAction.h"
 #include "BannerSetStyleAction.h"
-#include "ChangeMapSizeAction.h"
+#include "CheatSetAction.h"
 #include "ClearAction.h"
 #include "ClimateSetAction.h"
 #include "CustomAction.h"
@@ -35,20 +35,22 @@
 #include "LargeSceneryRemoveAction.h"
 #include "LargeScenerySetColourAction.h"
 #include "LoadOrQuitAction.h"
+#include "MapChangeSizeAction.h"
 #include "MazePlaceTrackAction.h"
 #include "MazeSetTrackAction.h"
 #include "NetworkModifyGroupAction.h"
+#include "ParkEntrancePlaceAction.h"
 #include "ParkEntranceRemoveAction.h"
 #include "ParkMarketingAction.h"
 #include "ParkSetDateAction.h"
+#include "ParkSetEntranceFeeAction.h"
 #include "ParkSetLoanAction.h"
 #include "ParkSetNameAction.h"
 #include "ParkSetParameterAction.h"
 #include "ParkSetResearchFundingAction.h"
 #include "PauseToggleAction.h"
 #include "PeepPickupAction.h"
-#include "PlaceParkEntranceAction.h"
-#include "PlacePeepSpawnAction.h"
+#include "PeepSpawnPlaceAction.h"
 #include "PlayerKickAction.h"
 #include "PlayerSetGroupAction.h"
 #include "RideCreateAction.h"
@@ -64,8 +66,6 @@
 #include "RideSetStatusAction.h"
 #include "RideSetVehicleAction.h"
 #include "ScenarioSetSettingAction.h"
-#include "SetCheatAction.h"
-#include "SetParkEntranceFeeAction.h"
 #include "SignSetNameAction.h"
 #include "SignSetStyleAction.h"
 #include "SmallSceneryPlaceAction.h"
@@ -148,8 +148,8 @@ namespace GameActions
        REGISTER_ACTION(ParkSetParameterAction);
        REGISTER_ACTION(ParkSetResearchFundingAction);
        REGISTER_ACTION(PeepPickupAction);
-        REGISTER_ACTION(PlaceParkEntranceAction);
-        REGISTER_ACTION(PlacePeepSpawnAction);
+        REGISTER_ACTION(ParkEntrancePlaceAction);
+        REGISTER_ACTION(PeepSpawnPlaceAction);
        REGISTER_ACTION(PlayerKickAction);
        REGISTER_ACTION(PlayerSetGroupAction);
        REGISTER_ACTION(RideCreateAction);
@@ -165,7 +165,7 @@ namespace GameActions
        REGISTER_ACTION(RideSetVehicleAction);
        REGISTER_ACTION(RideSetSettingAction);
        REGISTER_ACTION(ScenarioSetSettingAction);
-        REGISTER_ACTION(SetParkEntranceFeeAction);
+        REGISTER_ACTION(ParkSetEntranceFeeAction);
        REGISTER_ACTION(SignSetNameAction);
        REGISTER_ACTION(SignSetStyleAction);
        REGISTER_ACTION(StaffFireAction);
@@ -204,8 +204,8 @@ namespace GameActions
        REGISTER_ACTION(WaterRaiseAction);
        REGISTER_ACTION(GuestSetFlagsAction);
        REGISTER_ACTION(ParkSetDateAction);
-        REGISTER_ACTION(SetCheatAction);
-        REGISTER_ACTION(ChangeMapSizeAction);
+        REGISTER_ACTION(CheatSetAction);
+        REGISTER_ACTION(MapChangeSizeAction);
 #ifdef ENABLE_SCRIPTING
        REGISTER_ACTION(CustomAction);
 #endif
--- a/src/openrct2/actions/MapChangeSizeAction.cpp
+++ b/src/openrct2/actions/MapChangeSizeAction.cpp
@@ -7,7 +7,7 @@
 * OpenRCT2 is licensed under the GNU General Public License version 3.
 *****************************************************************************/

-#include "ChangeMapSizeAction.h"
+#include "MapChangeSizeAction.h"

 #include "../Context.h"
 #include "../drawing/IDrawingEngine.h"
@@ -16,23 +16,23 @@
 #include "../windows/Intent.h"
 #include "../world/Park.h"

-ChangeMapSizeAction::ChangeMapSizeAction(const TileCoordsXY& targetSize)
+MapChangeSizeAction::MapChangeSizeAction(const TileCoordsXY& targetSize)
    : _targetSize(targetSize)
 {
 }

-uint16_t ChangeMapSizeAction::GetActionFlags() const
+uint16_t MapChangeSizeAction::GetActionFlags() const
 {
    return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused;
 }

-void ChangeMapSizeAction::Serialise(DataSerialiser& stream)
+void MapChangeSizeAction::Serialise(DataSerialiser& stream)
 {
    GameAction::Serialise(stream);
    stream << DS_TAG(_targetSize);
 }

-GameActions::Result ChangeMapSizeAction::Query() const
+GameActions::Result MapChangeSizeAction::Query() const
 {
    if (_targetSize.x > MAXIMUM_MAP_SIZE_TECHNICAL || _targetSize.y > MAXIMUM_MAP_SIZE_TECHNICAL)
    {
@@ -45,7 +45,7 @@ GameActions::Result ChangeMapSizeAction::Query() const
    return GameActions::Result();
 }

-GameActions::Result ChangeMapSizeAction::Execute() const
+GameActions::Result MapChangeSizeAction::Execute() const
 {
    // Expand map
    while (_targetSize.x > gMapSize.x)
@@ -76,7 +76,7 @@ GameActions::Result ChangeMapSizeAction::Execute() const
    return GameActions::Result();
 }

-void ChangeMapSizeAction::AcceptParameters(GameActionParameterVisitor& visitor)
+void MapChangeSizeAction::AcceptParameters(GameActionParameterVisitor& visitor)
 {
    visitor.Visit("targetSizeX", _targetSize.x);
    visitor.Visit("targetSizeY", _targetSize.y);
--- a/src/openrct2/actions/MapChangeSizeAction.h
+++ b/src/openrct2/actions/MapChangeSizeAction.h
@@ -12,11 +12,11 @@
 #include "../world/Map.h"
 #include "GameAction.h"

-class ChangeMapSizeAction final : public GameActionBase<GameCommand::ChangeMapSize>
+class MapChangeSizeAction final : public GameActionBase<GameCommand::ChangeMapSize>
 {
 public:
-    ChangeMapSizeAction() = default;
-    ChangeMapSizeAction(const TileCoordsXY& targetSize);
+    MapChangeSizeAction() = default;
+    MapChangeSizeAction(const TileCoordsXY& targetSize);

    void AcceptParameters(GameActionParameterVisitor& visitor) override;
    uint16_t GetActionFlags() const override;
--- a/src/openrct2/actions/ParkEntrancePlaceAction.cpp
+++ b/src/openrct2/actions/ParkEntrancePlaceAction.cpp
@@ -7,7 +7,7 @@
 * OpenRCT2 is licensed under the GNU General Public License version 3.
 *****************************************************************************/

-#include "PlaceParkEntranceAction.h"
+#include "ParkEntrancePlaceAction.h"

 #include "../Cheats.h"
 #include "../OpenRCT2.h"
@@ -21,24 +21,24 @@
 #include "../world/Park.h"
 #include "../world/Surface.h"

-PlaceParkEntranceAction::PlaceParkEntranceAction(const CoordsXYZD& location, ObjectEntryIndex pathType)
+ParkEntrancePlaceAction::ParkEntrancePlaceAction(const CoordsXYZD& location, ObjectEntryIndex pathType)
    : _loc(location)
    , _pathType(pathType)
 {
 }

-void PlaceParkEntranceAction::AcceptParameters(GameActionParameterVisitor& visitor)
+void ParkEntrancePlaceAction::AcceptParameters(GameActionParameterVisitor& visitor)
 {
    visitor.Visit(_loc);
    visitor.Visit("footpathSurfaceObject", _pathType);
 }

-uint16_t PlaceParkEntranceAction::GetActionFlags() const
+uint16_t ParkEntrancePlaceAction::GetActionFlags() const
 {
    return GameActionBase::GetActionFlags() | GameActions::Flags::EditorOnly;
 }

-void PlaceParkEntranceAction::Serialise(DataSerialiser& stream)
+void ParkEntrancePlaceAction::Serialise(DataSerialiser& stream)
 {
    GameAction::Serialise(stream);

@@ -46,7 +46,7 @@ void PlaceParkEntranceAction::Serialise(DataSerialiser& stream)
    stream << DS_TAG(_pathType);
 }

-GameActions::Result PlaceParkEntranceAction::Query() const
+GameActions::Result ParkEntrancePlaceAction::Query() const
 {
    if (!(gScreenFlags & SCREEN_FLAGS_EDITOR) && !gCheatsSandboxMode)
    {
@@ -109,7 +109,7 @@ GameActions::Result PlaceParkEntranceAction::Query() const
    return res;
 }

-GameActions::Result PlaceParkEntranceAction::Execute() const
+GameActions::Result ParkEntrancePlaceAction::Execute() const
 {
    auto res = GameActions::Result();
    res.Expenditure = ExpenditureType::LandPurchase;
@@ -183,7 +183,7 @@ GameActions::Result PlaceParkEntranceAction::Execute() const
    return res;
 }

-bool PlaceParkEntranceAction::CheckMapCapacity(int16_t numTiles) const
+bool ParkEntrancePlaceAction::CheckMapCapacity(int16_t numTiles) const
 {
    CoordsXYZ entranceLoc = _loc;
    for (uint8_t index = 0; index < 3; index++)
--- a/src/openrct2/actions/ParkEntrancePlaceAction.h
+++ b/src/openrct2/actions/ParkEntrancePlaceAction.h
@@ -11,15 +11,15 @@

 #include "GameAction.h"

-class PlaceParkEntranceAction final : public GameActionBase<GameCommand::PlaceParkEntrance>
+class ParkEntrancePlaceAction final : public GameActionBase<GameCommand::PlaceParkEntrance>
 {
 private:
    CoordsXYZD _loc;
    ObjectEntryIndex _pathType;

 public:
-    PlaceParkEntranceAction() = default;
-    PlaceParkEntranceAction(const CoordsXYZD& location, ObjectEntryIndex pathType);
+    ParkEntrancePlaceAction() = default;
+    ParkEntrancePlaceAction(const CoordsXYZD& location, ObjectEntryIndex pathType);

    void AcceptParameters(GameActionParameterVisitor& visitor) override;

--- a/src/openrct2/actions/ParkSetEntranceFeeAction.cpp
+++ b/src/openrct2/actions/ParkSetEntranceFeeAction.cpp
@@ -7,7 +7,7 @@
 * OpenRCT2 is licensed under the GNU General Public License version 3.
 *****************************************************************************/

-#include "SetParkEntranceFeeAction.h"
+#include "ParkSetEntranceFeeAction.h"

 #include "../Cheats.h"
 #include "../core/MemoryStream.h"
@@ -15,29 +15,29 @@
 #include "../localisation/StringIds.h"
 #include "../world/Park.h"

-SetParkEntranceFeeAction::SetParkEntranceFeeAction(money16 fee)
+ParkSetEntranceFeeAction::ParkSetEntranceFeeAction(money16 fee)
    : _fee(fee)
 {
 }

-void SetParkEntranceFeeAction::AcceptParameters(GameActionParameterVisitor& visitor)
+void ParkSetEntranceFeeAction::AcceptParameters(GameActionParameterVisitor& visitor)
 {
    visitor.Visit("value", _fee);
 }

-uint16_t SetParkEntranceFeeAction::GetActionFlags() const
+uint16_t ParkSetEntranceFeeAction::GetActionFlags() const
 {
    return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused;
 }

-void SetParkEntranceFeeAction::Serialise(DataSerialiser& stream)
+void ParkSetEntranceFeeAction::Serialise(DataSerialiser& stream)
 {
    GameAction::Serialise(stream);

    stream << DS_TAG(_fee);
 }

-GameActions::Result SetParkEntranceFeeAction::Query() const
+GameActions::Result ParkSetEntranceFeeAction::Query() const
 {
    bool noMoney = (gParkFlags & PARK_FLAGS_NO_MONEY) != 0;
    bool forceFreeEntry = !ParkEntranceFeeUnlocked();
@@ -52,7 +52,7 @@ GameActions::Result SetParkEntranceFeeAction::Query() const
    return GameActions::Result();
 }

-GameActions::Result SetParkEntranceFeeAction::Execute() const
+GameActions::Result ParkSetEntranceFeeAction::Execute() const
 {
    gParkEntranceFee = _fee;
    window_invalidate_by_class(WindowClass::ParkInformation);
--- a/src/openrct2/actions/ParkSetEntranceFeeAction.h
+++ b/src/openrct2/actions/ParkSetEntranceFeeAction.h
@@ -11,14 +11,14 @@

 #include "GameAction.h"

-class SetParkEntranceFeeAction final : public GameActionBase<GameCommand::SetParkEntranceFee>
+class ParkSetEntranceFeeAction final : public GameActionBase<GameCommand::SetParkEntranceFee>
 {
 private:
    money16 _fee{ MONEY16_UNDEFINED };

 public:
-    SetParkEntranceFeeAction() = default;
-    SetParkEntranceFeeAction(money16 fee);
+    ParkSetEntranceFeeAction() = default;
+    ParkSetEntranceFeeAction(money16 fee);

    void AcceptParameters(GameActionParameterVisitor& visitor) override;

--- a/src/openrct2/actions/PeepSpawnPlaceAction.cpp
+++ b/src/openrct2/actions/PeepSpawnPlaceAction.cpp
@@ -7,7 +7,7 @@
 * OpenRCT2 is licensed under the GNU General Public License version 3.
 *****************************************************************************/

-#include "PlacePeepSpawnAction.h"
+#include "PeepSpawnPlaceAction.h"

 #include "../Cheats.h"
 #include "../OpenRCT2.h"
@@ -18,29 +18,29 @@
 #include "../world/Park.h"
 #include "../world/Surface.h"

-PlacePeepSpawnAction::PlacePeepSpawnAction(const CoordsXYZD& location)
+PeepSpawnPlaceAction::PeepSpawnPlaceAction(const CoordsXYZD& location)
    : _location(location)
 {
 }

-void PlacePeepSpawnAction::AcceptParameters(GameActionParameterVisitor& visitor)
+void PeepSpawnPlaceAction::AcceptParameters(GameActionParameterVisitor& visitor)
 {
    visitor.Visit(_location);
 }

-uint16_t PlacePeepSpawnAction::GetActionFlags() const
+uint16_t PeepSpawnPlaceAction::GetActionFlags() const
 {
    return GameActionBase::GetActionFlags() | GameActions::Flags::EditorOnly | GameActions::Flags::AllowWhilePaused;
 }

-void PlacePeepSpawnAction::Serialise(DataSerialiser& stream)
+void PeepSpawnPlaceAction::Serialise(DataSerialiser& stream)
 {
    GameAction::Serialise(stream);

    stream << DS_TAG(_location.x) << DS_TAG(_location.y) << DS_TAG(_location.z) << DS_TAG(_location.direction);
 }

-GameActions::Result PlacePeepSpawnAction::Query() const
+GameActions::Result PeepSpawnPlaceAction::Query() const
 {
    if (!(gScreenFlags & SCREEN_FLAGS_EDITOR) && !gCheatsSandboxMode)
    {
@@ -83,7 +83,7 @@ GameActions::Result PlacePeepSpawnAction::Query() const
    return res;
 }

-GameActions::Result PlacePeepSpawnAction::Execute() const
+GameActions::Result PeepSpawnPlaceAction::Execute() const
 {
    auto res = GameActions::Result();
    res.Expenditure = ExpenditureType::LandPurchase;
--- a/src/openrct2/actions/PeepSpawnPlaceAction.h
+++ b/src/openrct2/actions/PeepSpawnPlaceAction.h
@@ -11,14 +11,14 @@

 #include "GameAction.h"

-class PlacePeepSpawnAction final : public GameActionBase<GameCommand::PlacePeepSpawn>
+class PeepSpawnPlaceAction final : public GameActionBase<GameCommand::PlacePeepSpawn>
 {
 private:
    CoordsXYZD _location;

 public:
-    PlacePeepSpawnAction() = default;
-    PlacePeepSpawnAction(const CoordsXYZD& location);
+    PeepSpawnPlaceAction() = default;
+    PeepSpawnPlaceAction(const CoordsXYZD& location);

    void AcceptParameters(GameActionParameterVisitor& visitor) override;

--- a/src/openrct2/interface/InteractiveConsole.cpp
+++ b/src/openrct2/interface/InteractiveConsole.cpp
@@ -16,13 +16,13 @@
 #include "../PlatformEnvironment.h"
 #include "../ReplayManager.h"
 #include "../Version.h"
+#include "../actions/CheatSetAction.h"
 #include "../actions/ClimateSetAction.h"
 #include "../actions/ParkSetParameterAction.h"
 #include "../actions/RideFreezeRatingAction.h"
 #include "../actions/RideSetPriceAction.h"
 #include "../actions/RideSetSettingAction.h"
 #include "../actions/ScenarioSetSettingAction.h"
-#include "../actions/SetCheatAction.h"
 #include "../actions/StaffSetCostumeAction.h"
 #include "../config/Config.h"
 #include "../core/Console.hpp"
@@ -764,14 +764,14 @@ static int32_t cc_set(InteractiveConsole& console, const arguments_t& argv)
            money32 money = ToMoney64FromGBP(double_val[0]);
            if (gCash != money)
            {
-                auto setCheatAction = SetCheatAction(CheatType::SetMoney, money);
-                setCheatAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) {
+                auto cheatSetAction = CheatSetAction(CheatType::SetMoney, money);
+                cheatSetAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) {
                    if (res->Error != GameActions::Status::Ok)
                        console.WriteLineError("set money command failed, likely due to permissions.");
                    else
                        console.Execute("get money");
                });
-                GameActions::Execute(&setCheatAction);
+                GameActions::Execute(&cheatSetAction);
            }
            else
            {
@@ -938,14 +938,14 @@ static int32_t cc_set(InteractiveConsole& console, const arguments_t& argv)
        }
        else if (argv[0] == "no_money" && invalidArguments(&invalidArgs, int_valid[0]))
        {
-            auto setCheatAction = SetCheatAction(CheatType::NoMoney, int_val[0] != 0);
-            setCheatAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) {
+            auto cheatSetAction = CheatSetAction(CheatType::NoMoney, int_val[0] != 0);
+            cheatSetAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) {
                if (res->Error != GameActions::Status::Ok)
                    console.WriteLineError("set no_money command failed, likely due to permissions.");
                else
                    console.Execute("get no_money");
            });
-            GameActions::Execute(&setCheatAction);
+            GameActions::Execute(&cheatSetAction);
        }
        else if (argv[0] == "difficult_park_rating" && invalidArguments(&invalidArgs, int_valid[0]))
        {
@@ -1094,14 +1094,14 @@ static int32_t cc_set(InteractiveConsole& console, const arguments_t& argv)
        {
            if (gCheatsSandboxMode != (int_val[0] != 0))
            {
-                auto setCheatAction = SetCheatAction(CheatType::SandboxMode, int_val[0] != 0);
-                setCheatAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) {
+                auto cheatSetAction = CheatSetAction(CheatType::SandboxMode, int_val[0] != 0);
+                cheatSetAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) {
                    if (res->Error != GameActions::Status::Ok)
                        console.WriteLineError("Network error: Permission denied!");
                    else
                        console.Execute("get cheat_sandbox_mode");
                });
-                GameActions::Execute(&setCheatAction);
+                GameActions::Execute(&cheatSetAction);
            }
            else
            {
@@ -1112,14 +1112,14 @@ static int32_t cc_set(InteractiveConsole& console, const arguments_t& argv)
        {
            if (gCheatsDisableClearanceChecks != (int_val[0] != 0))
            {
-                auto setCheatAction = SetCheatAction(CheatType::DisableClearanceChecks, int_val[0] != 0);
-                setCheatAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) {
+                auto cheatSetAction = CheatSetAction(CheatType::DisableClearanceChecks, int_val[0] != 0);
+                cheatSetAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) {
                    if (res->Error != GameActions::Status::Ok)
                        console.WriteLineError("Network error: Permission denied!");
                    else
                        console.Execute("get cheat_disable_clearance_checks");
                });
-                GameActions::Execute(&setCheatAction);
+                GameActions::Execute(&cheatSetAction);
            }
            else
            {
@@ -1130,14 +1130,14 @@ static int32_t cc_set(InteractiveConsole& console, const arguments_t& argv)
        {
            if (gCheatsDisableSupportLimits != (int_val[0] != 0))
            {
-                auto setCheatAction = SetCheatAction(CheatType::DisableSupportLimits, int_val[0] != 0);
-                setCheatAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) {
+                auto cheatSetAction = CheatSetAction(CheatType::DisableSupportLimits, int_val[0] != 0);
+                cheatSetAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) {
                    if (res->Error != GameActions::Status::Ok)
                        console.WriteLineError("Network error: Permission denied!");
                    else
                        console.Execute("get cheat_disable_support_limits");
                });
-                GameActions::Execute(&setCheatAction);
+                GameActions::Execute(&cheatSetAction);
            }
            else
            {
--- a/src/openrct2/interface/Screenshot.cpp
+++ b/src/openrct2/interface/Screenshot.cpp
@@ -15,7 +15,7 @@
 #include "../Intro.h"
 #include "../OpenRCT2.h"
 #include "../PlatformEnvironment.h"
-#include "../actions/SetCheatAction.h"
+#include "../actions/CheatSetAction.h"
 #include "../audio/audio.h"
 #include "../core/Console.hpp"
 #include "../core/File.h"
--- a/src/openrct2/libopenrct2.vcxproj
+++ b/src/openrct2/libopenrct2.vcxproj
@@ -67,7 +67,7 @@
    <ClInclude Include="actions\BannerSetColourAction.h" />
    <ClInclude Include="actions\BannerSetNameAction.h" />
    <ClInclude Include="actions\BannerSetStyleAction.h" />
-    <ClInclude Include="actions\ChangeMapSizeAction.h" />
+    <ClInclude Include="actions\CheatSetAction.h" />
    <ClInclude Include="actions\ClearAction.h" />
    <ClInclude Include="actions\ClimateSetAction.h" />
    <ClInclude Include="actions\CustomAction.h" />
@@ -90,20 +90,22 @@
    <ClInclude Include="actions\LargeSceneryRemoveAction.h" />
    <ClInclude Include="actions\LargeScenerySetColourAction.h" />
    <ClInclude Include="actions\LoadOrQuitAction.h" />
+    <ClInclude Include="actions\MapChangeSizeAction.h" />
    <ClInclude Include="actions\MazePlaceTrackAction.h" />
    <ClInclude Include="actions\MazeSetTrackAction.h" />
    <ClInclude Include="actions\NetworkModifyGroupAction.h" />
+    <ClInclude Include="actions\ParkEntrancePlaceAction.h" />
    <ClInclude Include="actions\ParkEntranceRemoveAction.h" />
    <ClInclude Include="actions\ParkMarketingAction.h" />
    <ClInclude Include="actions\ParkSetDateAction.h" />
+    <ClInclude Include="actions\ParkSetEntranceFeeAction.h" />
    <ClInclude Include="actions\ParkSetLoanAction.h" />
    <ClInclude Include="actions\ParkSetNameAction.h" />
    <ClInclude Include="actions\ParkSetParameterAction.h" />
    <ClInclude Include="actions\ParkSetResearchFundingAction.h" />
    <ClInclude Include="actions\PauseToggleAction.h" />
    <ClInclude Include="actions\PeepPickupAction.h" />
-    <ClInclude Include="actions\PlaceParkEntranceAction.h" />
-    <ClInclude Include="actions\PlacePeepSpawnAction.h" />
+    <ClInclude Include="actions\PeepSpawnPlaceAction.h" />
    <ClInclude Include="actions\PlayerKickAction.h" />
    <ClInclude Include="actions\PlayerSetGroupAction.h" />
    <ClInclude Include="actions\ResultWithMessage.h" />
@@ -120,8 +122,6 @@
    <ClInclude Include="actions\RideSetStatusAction.h" />
    <ClInclude Include="actions\RideSetVehicleAction.h" />
    <ClInclude Include="actions\ScenarioSetSettingAction.h" />
-    <ClInclude Include="actions\SetCheatAction.h" />
-    <ClInclude Include="actions\SetParkEntranceFeeAction.h" />
    <ClInclude Include="actions\SignSetNameAction.h" />
    <ClInclude Include="actions\SignSetStyleAction.h" />
    <ClInclude Include="actions\SmallSceneryPlaceAction.h" />
@@ -567,7 +567,7 @@
    <ClCompile Include="actions\BannerSetColourAction.cpp" />
    <ClCompile Include="actions\BannerSetNameAction.cpp" />
    <ClCompile Include="actions\BannerSetStyleAction.cpp" />
-    <ClCompile Include="actions\ChangeMapSizeAction.cpp" />
+    <ClCompile Include="actions\CheatSetAction.cpp" />
    <ClCompile Include="actions\ClearAction.cpp" />
    <ClCompile Include="actions\ClimateSetAction.cpp" />
    <ClCompile Include="actions\CustomAction.cpp" />
@@ -591,20 +591,22 @@
    <ClCompile Include="actions\LargeSceneryRemoveAction.cpp" />
    <ClCompile Include="actions\LargeScenerySetColourAction.cpp" />
    <ClCompile Include="actions\LoadOrQuitAction.cpp" />
+    <ClCompile Include="actions\MapChangeSizeAction.cpp" />
    <ClCompile Include="actions\MazePlaceTrackAction.cpp" />
    <ClCompile Include="actions\MazeSetTrackAction.cpp" />
    <ClCompile Include="actions\NetworkModifyGroupAction.cpp" />
    <ClCompile Include="actions\ParkEntranceRemoveAction.cpp" />
    <ClCompile Include="actions\ParkMarketingAction.cpp" />
    <ClCompile Include="actions\ParkSetDateAction.cpp" />
+    <ClCompile Include="actions\ParkSetEntranceFeeAction.cpp" />
    <ClCompile Include="actions\ParkSetLoanAction.cpp" />
    <ClCompile Include="actions\ParkSetNameAction.cpp" />
    <ClCompile Include="actions\ParkSetParameterAction.cpp" />
    <ClCompile Include="actions\ParkSetResearchFundingAction.cpp" />
    <ClCompile Include="actions\PauseToggleAction.cpp" />
    <ClCompile Include="actions\PeepPickupAction.cpp" />
-    <ClCompile Include="actions\PlaceParkEntranceAction.cpp" />
-    <ClCompile Include="actions\PlacePeepSpawnAction.cpp" />
+    <ClCompile Include="actions\ParkEntrancePlaceAction.cpp" />
+    <ClCompile Include="actions\PeepSpawnPlaceAction.cpp" />
    <ClCompile Include="actions\PlayerKickAction.cpp" />
    <ClCompile Include="actions\PlayerSetGroupAction.cpp" />
    <ClCompile Include="actions\RideCreateAction.cpp" />
@@ -620,8 +622,6 @@
    <ClCompile Include="actions\RideSetStatusAction.cpp" />
    <ClCompile Include="actions\RideSetVehicleAction.cpp" />
    <ClCompile Include="actions\ScenarioSetSettingAction.cpp" />
-    <ClCompile Include="actions\SetCheatAction.cpp" />
-    <ClCompile Include="actions\SetParkEntranceFeeAction.cpp" />
    <ClCompile Include="actions\SignSetNameAction.cpp" />
    <ClCompile Include="actions\SignSetStyleAction.cpp" />
    <ClCompile Include="actions\SmallSceneryPlaceAction.cpp" />
--- a/src/openrct2/scripting/ScriptEngine.cpp
+++ b/src/openrct2/scripting/ScriptEngine.cpp
@@ -1271,7 +1271,6 @@ const static EnumMap<GameCommand> ActionNameToType = {
    { "bannersetcolour", GameCommand::SetBannerColour },
    { "bannersetname", GameCommand::SetBannerName },
    { "bannersetstyle", GameCommand::SetBannerStyle },
-    { "changemapsize", GameCommand::ChangeMapSize },
    { "clearscenery", GameCommand::ClearScenery },
    { "climateset", GameCommand::SetClimate },
    { "footpathplace", GameCommand::PlacePath },
@@ -1291,6 +1290,7 @@ const static EnumMap<GameCommand> ActionNameToType = {
    { "largesceneryremove", GameCommand::RemoveLargeScenery },
    { "largescenerysetcolour", GameCommand::SetLargeSceneryColour },
    { "loadorquit", GameCommand::LoadOrQuit },
+    { "mapChangeSize", GameCommand::ChangeMapSize },
    { "mazeplacetrack", GameCommand::PlaceMazeDesign },
    { "mazesettrack", GameCommand::SetMazeTrack },
    { "networkmodifygroup", GameCommand::ModifyGroups },
@@ -1298,6 +1298,7 @@ const static EnumMap<GameCommand> ActionNameToType = {
    { "parkentranceremove", GameCommand::RemoveParkEntrance },
    { "parkmarketing", GameCommand::StartMarketingCampaign },
    { "parksetdate", GameCommand::SetDate },
+    { "parksetentrancefee", GameCommand::SetParkEntranceFee },
    { "parksetloan", GameCommand::SetCurrentLoan },
    { "parksetname", GameCommand::SetParkName },
    { "parksetparameter", GameCommand::SetParkOpen },
@@ -1321,7 +1322,6 @@ const static EnumMap<GameCommand> ActionNameToType = {
    { "ridesetvehicle", GameCommand::SetRideVehicles },
    { "scenariosetsetting", GameCommand::EditScenarioOptions },
    { "setcheat", GameCommand::Cheat },
-    { "setparkentrancefee", GameCommand::SetParkEntranceFee },
    { "signsetname", GameCommand::SetSignName },
    { "signsetstyle", GameCommand::SetSignStyle },
    { "smallsceneryplace", GameCommand::PlaceScenery },
--- a/src/openrct2/scripting/ScriptEngine.h
+++ b/src/openrct2/scripting/ScriptEngine.h
@@ -46,7 +46,7 @@ namespace OpenRCT2

 namespace OpenRCT2::Scripting
 {
-    static constexpr int32_t OPENRCT2_PLUGIN_API_VERSION = 67;
+    static constexpr int32_t OPENRCT2_PLUGIN_API_VERSION = 68;

    // Versions marking breaking changes.
    static constexpr int32_t API_VERSION_33_PEEP_DEPRECATION = 33;
--- a/test/tests/PlayTests.cpp
+++ b/test/tests/PlayTests.cpp
@@ -16,10 +16,10 @@
 #include <openrct2/GameState.h>
 #include <openrct2/OpenRCT2.h>
 #include <openrct2/ParkImporter.h>
+#include <openrct2/actions/ParkSetEntranceFeeAction.h>
 #include <openrct2/actions/ParkSetParameterAction.h>
 #include <openrct2/actions/RideSetPriceAction.h>
 #include <openrct2/actions/RideSetStatusAction.h>
-#include <openrct2/actions/SetParkEntranceFeeAction.h>
 #include <openrct2/entity/EntityRegistry.h>
 #include <openrct2/entity/EntityTweener.h>
 #include <openrct2/entity/Peep.h>
@@ -99,7 +99,7 @@ TEST_F(PlayTests, SecondGuestInQueueShouldNotRideIfNoFunds)

    // Open park for free but charging for rides
    execute<ParkSetParameterAction>(ParkParameter::Open);
-    execute<SetParkEntranceFeeAction>(0);
+    execute<ParkSetEntranceFeeAction>(0);
    gParkFlags |= PARK_FLAGS_UNLOCK_ALL_PRICES;

    // Find ferris wheel
@@ -160,7 +160,7 @@ TEST_F(PlayTests, CarRideWithOneCarOnlyAcceptsTwoGuests)

    // Open park for free but charging for rides
    execute<ParkSetParameterAction>(ParkParameter::Open);
-    execute<SetParkEntranceFeeAction>(0);
+    execute<ParkSetEntranceFeeAction>(0);
    gParkFlags |= PARK_FLAGS_UNLOCK_ALL_PRICES;

    // Find car ride