diff --git a/distribution/openrct2.d.ts b/distribution/openrct2.d.ts
index 784912f123..8c1ce7768c 100644
--- a/distribution/openrct2.d.ts
+++ b/distribution/openrct2.d.ts
@@ -285,6 +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: "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;
@@ -334,7 +335,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;
@@ -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;
@@ -425,7 +426,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;
@@ -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" |
@@ -658,7 +659,6 @@ declare global {
         "ridesetstatus" |
         "ridesetvehicle" |
         "scenariosetsetting" |
-        "setcheat" |
         "setparkentrancefee" |
         "signsetname" |
         "signsetstyle" |
@@ -729,6 +729,12 @@ declare global {
         parameter: number; // primary colour | secondary colour | 0: disable, 1: enable
     }
 
+    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 {
         itemsToClear: number; // Bit mask. 1: small scenery and walls, 2: large scenery, 4: footpaths.
     }
@@ -1080,12 +1086,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;
     }
diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp
index 7cc1bebd60..3ffdf5ae73 100644
--- 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()
diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp
index b9b78cc62f..b904bebaa9 100644
--- 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:
diff --git a/src/openrct2-ui/windows/Transparency.cpp b/src/openrct2-ui/windows/Transparency.cpp
index 83bf367ea2..00cfe211b4 100644
--- 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>
diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp
index 4bbedc7e5f..3f3321b056 100644
--- 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)
diff --git a/src/openrct2/ReplayManager.cpp b/src/openrct2/ReplayManager.cpp
index ea3711956b..9c8d525aa0 100644
--- 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"
diff --git a/src/openrct2/actions/SetCheatAction.cpp b/src/openrct2/actions/CheatSetAction.cpp
similarity index 94%
rename from src/openrct2/actions/SetCheatAction.cpp
rename to src/openrct2/actions/CheatSetAction.cpp
index 209319a0e5..59c1c46115 100644
--- a/src/openrct2/actions/SetCheatAction.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++)
     {
diff --git a/src/openrct2/actions/SetCheatAction.h b/src/openrct2/actions/CheatSetAction.h
similarity index 92%
rename from src/openrct2/actions/SetCheatAction.h
rename to src/openrct2/actions/CheatSetAction.h
index 360f8e4130..a218bb7500 100644
--- a/src/openrct2/actions/SetCheatAction.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;
 
diff --git a/src/openrct2/actions/GameActionRegistry.cpp b/src/openrct2/actions/GameActionRegistry.cpp
index 930b0f5420..b0cc9f2395 100644
--- a/src/openrct2/actions/GameActionRegistry.cpp
+++ b/src/openrct2/actions/GameActionRegistry.cpp
@@ -13,6 +13,7 @@
 #include "BannerSetColourAction.h"
 #include "BannerSetNameAction.h"
 #include "BannerSetStyleAction.h"
+#include "CheatSetAction.h"
 #include "ClearAction.h"
 #include "ClimateSetAction.h"
 #include "CustomAction.h"
@@ -64,7 +65,6 @@
 #include "RideSetStatusAction.h"
 #include "RideSetVehicleAction.h"
 #include "ScenarioSetSettingAction.h"
-#include "SetCheatAction.h"
 #include "SetParkEntranceFeeAction.h"
 #include "SignSetNameAction.h"
 #include "SignSetStyleAction.h"
@@ -204,7 +204,7 @@ namespace GameActions
         REGISTER_ACTION(WaterRaiseAction);
         REGISTER_ACTION(GuestSetFlagsAction);
         REGISTER_ACTION(ParkSetDateAction);
-        REGISTER_ACTION(SetCheatAction);
+        REGISTER_ACTION(CheatSetAction);
         REGISTER_ACTION(MapChangeSizeAction);
 #ifdef ENABLE_SCRIPTING
         REGISTER_ACTION(CustomAction);
diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp
index 97ca05f25a..3b41c136ee 100644
--- 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
             {
diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp
index d8889d50ae..f3c20756f8 100644
--- 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"
diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj
index 74b0373bdc..59c2cba937 100644
--- a/src/openrct2/libopenrct2.vcxproj
+++ b/src/openrct2/libopenrct2.vcxproj
@@ -67,6 +67,7 @@
     <ClInclude Include="actions\BannerSetColourAction.h" />
     <ClInclude Include="actions\BannerSetNameAction.h" />
     <ClInclude Include="actions\BannerSetStyleAction.h" />
+    <ClInclude Include="actions\CheatSetAction.h" />
     <ClInclude Include="actions\ClearAction.h" />
     <ClInclude Include="actions\ClimateSetAction.h" />
     <ClInclude Include="actions\CustomAction.h" />
@@ -120,7 +121,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" />
@@ -567,6 +567,7 @@
     <ClCompile Include="actions\BannerSetColourAction.cpp" />
     <ClCompile Include="actions\BannerSetNameAction.cpp" />
     <ClCompile Include="actions\BannerSetStyleAction.cpp" />
+    <ClCompile Include="actions\CheatSetAction.cpp" />
     <ClCompile Include="actions\ClearAction.cpp" />
     <ClCompile Include="actions\ClimateSetAction.cpp" />
     <ClCompile Include="actions\CustomAction.cpp" />
@@ -620,7 +621,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" />
diff --git a/src/openrct2/scripting/ScriptEngine.h b/src/openrct2/scripting/ScriptEngine.h
index ae87e8c69e..c298960dba 100644
--- 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;