tweak new event naming convention (#310)

4 files changed, 180 insertions, 180 deletions

diff --git a/src/SMAPI/Framework/Events/EventManager.cs b/src/SMAPI/Framework/Events/EventManager.cs
index 168ddde0..1435976a 100644
--- a/src/SMAPI/Framework/Events/EventManager.cs
+++ b/src/SMAPI/Framework/Events/EventManager.cs
@@ -15,52 +15,52 @@ namespace StardewModdingAPI.Framework.Events
         ** Game loop
         ****/
         /// <summary>Raised after the game is launched, right before the first update tick.</summary>
-        public readonly ManagedEvent<GameLoopLaunchedEventArgs> GameLoop_Launched;
+        public readonly ManagedEvent<GameLaunchedEventArgs> GameLaunched;
 
         /// <summary>Raised before the game performs its overall update tick (≈60 times per second).</summary>
-        public readonly ManagedEvent<GameLoopUpdatingEventArgs> GameLoop_Updating;
+        public readonly ManagedEvent<UpdateTickingEventArgs> UpdateTicking;
 
         /// <summary>Raised after the game performs its overall update tick (≈60 times per second).</summary>
-        public readonly ManagedEvent<GameLoopUpdatedEventArgs> GameLoop_Updated;
+        public readonly ManagedEvent<UpdateTickedEventArgs> UpdateTicked;
 
         /****
         ** Input
         ****/
         /// <summary>Raised after the player presses a button on the keyboard, controller, or mouse.</summary>
-        public readonly ManagedEvent<InputButtonPressedEventArgs> Input_ButtonPressed;
+        public readonly ManagedEvent<ButtonPressedEventArgs> ButtonPressed;
 
         /// <summary>Raised after the player released a button on the keyboard, controller, or mouse.</summary>
-        public readonly ManagedEvent<InputButtonReleasedEventArgs> Input_ButtonReleased;
+        public readonly ManagedEvent<ButtonReleasedEventArgs> ButtonReleased;
 
         /// <summary>Raised after the player moves the in-game cursor.</summary>
-        public readonly ManagedEvent<InputCursorMovedEventArgs> Input_CursorMoved;
+        public readonly ManagedEvent<CursorMovedEventArgs> CursorMoved;
 
         /// <summary>Raised after the player scrolls the mouse wheel.</summary>
-        public readonly ManagedEvent<InputMouseWheelScrolledEventArgs> Input_MouseWheelScrolled;
+        public readonly ManagedEvent<MouseWheelScrolledEventArgs> MouseWheelScrolled;
 
         /****
         ** World
         ****/
         /// <summary>Raised after a game location is added or removed.</summary>
-        public readonly ManagedEvent<WorldLocationListChangedEventArgs> World_LocationListChanged;
+        public readonly ManagedEvent<LocationListChangedEventArgs> LocationListChanged;
 
         /// <summary>Raised after buildings are added or removed in a location.</summary>
-        public readonly ManagedEvent<WorldBuildingListChangedEventArgs> World_BuildingListChanged;
+        public readonly ManagedEvent<BuildingListChangedEventArgs> BuildingListChanged;
 
         /// <summary>Raised after debris are added or removed in a location.</summary>
-        public readonly ManagedEvent<WorldDebrisListChangedEventArgs> World_DebrisListChanged;
+        public readonly ManagedEvent<DebrisListChangedEventArgs> DebrisListChanged;
 
         /// <summary>Raised after large terrain features (like bushes) are added or removed in a location.</summary>
-        public readonly ManagedEvent<WorldLargeTerrainFeatureListChangedEventArgs> World_LargeTerrainFeatureListChanged;
+        public readonly ManagedEvent<LargeTerrainFeatureListChangedEventArgs> LargeTerrainFeatureListChanged;
 
         /// <summary>Raised after NPCs are added or removed in a location.</summary>
-        public readonly ManagedEvent<WorldNpcListChangedEventArgs> World_NpcListChanged;
+        public readonly ManagedEvent<NpcListChangedEventArgs> NpcListChanged;
 
         /// <summary>Raised after objects are added or removed in a location.</summary>
-        public readonly ManagedEvent<WorldObjectListChangedEventArgs> World_ObjectListChanged;
+        public readonly ManagedEvent<ObjectListChangedEventArgs> ObjectListChanged;
 
         /// <summary>Raised after terrain features (like floors and trees) are added or removed in a location.</summary>
-        public readonly ManagedEvent<WorldTerrainFeatureListChangedEventArgs> World_TerrainFeatureListChanged;
+        public readonly ManagedEvent<TerrainFeatureListChangedEventArgs> TerrainFeatureListChanged;
 
 
         /*********
@@ -70,185 +70,185 @@ namespace StardewModdingAPI.Framework.Events
         ** ContentEvents
         ****/
         /// <summary>Raised after the content language changes.</summary>
-        public readonly ManagedEvent<EventArgsValueChanged<string>> Content_LocaleChanged;
+        public readonly ManagedEvent<EventArgsValueChanged<string>> Legacy_LocaleChanged;
 
         /****
         ** ControlEvents
         ****/
         /// <summary>Raised when the <see cref="KeyboardState"/> changes. That happens when the player presses or releases a key.</summary>
-        public readonly ManagedEvent<EventArgsKeyboardStateChanged> Legacy_Control_KeyboardChanged;
+        public readonly ManagedEvent<EventArgsKeyboardStateChanged> Legacy_KeyboardChanged;
 
         /// <summary>Raised after the player presses a keyboard key.</summary>
-        public readonly ManagedEvent<EventArgsKeyPressed> Legacy_Control_KeyPressed;
+        public readonly ManagedEvent<EventArgsKeyPressed> Legacy_KeyPressed;
 
         /// <summary>Raised after the player releases a keyboard key.</summary>
-        public readonly ManagedEvent<EventArgsKeyPressed> Legacy_Control_KeyReleased;
+        public readonly ManagedEvent<EventArgsKeyPressed> Legacy_KeyReleased;
 
         /// <summary>Raised when the <see cref="MouseState"/> changes. That happens when the player moves the mouse, scrolls the mouse wheel, or presses/releases a button.</summary>
-        public readonly ManagedEvent<EventArgsMouseStateChanged> Legacy_Control_MouseChanged;
+        public readonly ManagedEvent<EventArgsMouseStateChanged> Legacy_MouseChanged;
 
         /// <summary>The player pressed a controller button. This event isn't raised for trigger buttons.</summary>
-        public readonly ManagedEvent<EventArgsControllerButtonPressed> Legacy_Control_ControllerButtonPressed;
+        public readonly ManagedEvent<EventArgsControllerButtonPressed> Legacy_ControllerButtonPressed;
 
         /// <summary>The player released a controller button. This event isn't raised for trigger buttons.</summary>
-        public readonly ManagedEvent<EventArgsControllerButtonReleased> Legacy_Control_ControllerButtonReleased;
+        public readonly ManagedEvent<EventArgsControllerButtonReleased> Legacy_ControllerButtonReleased;
 
         /// <summary>The player pressed a controller trigger button.</summary>
-        public readonly ManagedEvent<EventArgsControllerTriggerPressed> Legacy_Control_ControllerTriggerPressed;
+        public readonly ManagedEvent<EventArgsControllerTriggerPressed> Legacy_ControllerTriggerPressed;
 
         /// <summary>The player released a controller trigger button.</summary>
-        public readonly ManagedEvent<EventArgsControllerTriggerReleased> Legacy_Control_ControllerTriggerReleased;
+        public readonly ManagedEvent<EventArgsControllerTriggerReleased> Legacy_ControllerTriggerReleased;
 
         /****
         ** GameEvents
         ****/
         /// <summary>Raised once after the game initialises and all <see cref="IMod.Entry"/> methods have been called.</summary>
-        public readonly ManagedEvent Game_FirstUpdateTick;
+        public readonly ManagedEvent Legacy_FirstUpdateTick;
 
         /// <summary>Raised when the game updates its state (≈60 times per second).</summary>
-        public readonly ManagedEvent Game_UpdateTick;
+        public readonly ManagedEvent Legacy_UpdateTick;
 
         /// <summary>Raised every other tick (≈30 times per second).</summary>
-        public readonly ManagedEvent Game_SecondUpdateTick;
+        public readonly ManagedEvent Legacy_SecondUpdateTick;
 
         /// <summary>Raised every fourth tick (≈15 times per second).</summary>
-        public readonly ManagedEvent Game_FourthUpdateTick;
+        public readonly ManagedEvent Legacy_FourthUpdateTick;
 
         /// <summary>Raised every eighth tick (≈8 times per second).</summary>
-        public readonly ManagedEvent Game_EighthUpdateTick;
+        public readonly ManagedEvent Legacy_EighthUpdateTick;
 
         /// <summary>Raised every 15th tick (≈4 times per second).</summary>
-        public readonly ManagedEvent Game_QuarterSecondTick;
+        public readonly ManagedEvent Legacy_QuarterSecondTick;
 
         /// <summary>Raised every 30th tick (≈twice per second).</summary>
-        public readonly ManagedEvent Game_HalfSecondTick;
+        public readonly ManagedEvent Legacy_HalfSecondTick;
 
         /// <summary>Raised every 60th tick (≈once per second).</summary>
-        public readonly ManagedEvent Game_OneSecondTick;
+        public readonly ManagedEvent Legacy_OneSecondTick;
 
         /****
         ** GraphicsEvents
         ****/
         /// <summary>Raised after the game window is resized.</summary>
-        public readonly ManagedEvent Graphics_Resize;
+        public readonly ManagedEvent Legacy_Resize;
 
         /// <summary>Raised before drawing the world to the screen.</summary>
-        public readonly ManagedEvent Graphics_OnPreRenderEvent;
+        public readonly ManagedEvent Legacy_OnPreRenderEvent;
 
         /// <summary>Raised after drawing the world to the screen.</summary>
-        public readonly ManagedEvent Graphics_OnPostRenderEvent;
+        public readonly ManagedEvent Legacy_OnPostRenderEvent;
 
         /// <summary>Raised before drawing the HUD (item toolbar, clock, etc) to the screen. The HUD is available at this point, but not necessarily visible. (For example, the event is raised even if a menu is open.)</summary>
-        public readonly ManagedEvent Graphics_OnPreRenderHudEvent;
+        public readonly ManagedEvent Legacy_OnPreRenderHudEvent;
 
         /// <summary>Raised after drawing the HUD (item toolbar, clock, etc) to the screen. The HUD is available at this point, but not necessarily visible. (For example, the event is raised even if a menu is open.)</summary>
-        public readonly ManagedEvent Graphics_OnPostRenderHudEvent;
+        public readonly ManagedEvent Legacy_OnPostRenderHudEvent;
 
         /// <summary>Raised before drawing a menu to the screen during a draw loop. This includes the game's internal menus like the title screen.</summary>
-        public readonly ManagedEvent Graphics_OnPreRenderGuiEvent;
+        public readonly ManagedEvent Legacy_OnPreRenderGuiEvent;
 
         /// <summary>Raised after drawing a menu to the screen during a draw loop. This includes the game's internal menus like the title screen.</summary>
-        public readonly ManagedEvent Graphics_OnPostRenderGuiEvent;
+        public readonly ManagedEvent Legacy_OnPostRenderGuiEvent;
 
         /****
         ** InputEvents
         ****/
         /// <summary>Raised after the player presses a button on the keyboard, controller, or mouse.</summary>
-        public readonly ManagedEvent<EventArgsInput> Legacy_Input_ButtonPressed;
+        public readonly ManagedEvent<EventArgsInput> Legacy_ButtonPressed;
 
         /// <summary>Raised after the player releases a keyboard key on the keyboard, controller, or mouse.</summary>
-        public readonly ManagedEvent<EventArgsInput> Legacy_Input_ButtonReleased;
+        public readonly ManagedEvent<EventArgsInput> Legacy_ButtonReleased;
 
         /****
         ** LocationEvents
         ****/
         /// <summary>Raised after a game location is added or removed.</summary>
-        public readonly ManagedEvent<EventArgsLocationsChanged> Legacy_Location_LocationsChanged;
+        public readonly ManagedEvent<EventArgsLocationsChanged> Legacy_LocationsChanged;
 
         /// <summary>Raised after buildings are added or removed in a location.</summary>
-        public readonly ManagedEvent<EventArgsLocationBuildingsChanged> Legacy_Location_BuildingsChanged;
+        public readonly ManagedEvent<EventArgsLocationBuildingsChanged> Legacy_BuildingsChanged;
 
         /// <summary>Raised after objects are added or removed in a location.</summary>
-        public readonly ManagedEvent<EventArgsLocationObjectsChanged> Legacy_Location_ObjectsChanged;
+        public readonly ManagedEvent<EventArgsLocationObjectsChanged> Legacy_ObjectsChanged;
 
         /****
         ** MenuEvents
         ****/
         /// <summary>Raised after a game menu is opened or replaced with another menu. This event is not invoked when a menu is closed.</summary>
-        public readonly ManagedEvent<EventArgsClickableMenuChanged> Menu_Changed;
+        public readonly ManagedEvent<EventArgsClickableMenuChanged> Legacy_MenuChanged;
 
         /// <summary>Raised after a game menu is closed.</summary>
-        public readonly ManagedEvent<EventArgsClickableMenuClosed> Menu_Closed;
+        public readonly ManagedEvent<EventArgsClickableMenuClosed> Legacy_MenuClosed;
 
         /****
         ** MultiplayerEvents
         ****/
         /// <summary>Raised before the game syncs changes from other players.</summary>
-        public readonly ManagedEvent Multiplayer_BeforeMainSync;
+        public readonly ManagedEvent Legacy_BeforeMainSync;
 
         /// <summary>Raised after the game syncs changes from other players.</summary>
-        public readonly ManagedEvent Multiplayer_AfterMainSync;
+        public readonly ManagedEvent Legacy_AfterMainSync;
 
         /// <summary>Raised before the game broadcasts changes to other players.</summary>
-        public readonly ManagedEvent Multiplayer_BeforeMainBroadcast;
+        public readonly ManagedEvent Legacy_BeforeMainBroadcast;
 
         /// <summary>Raised after the game broadcasts changes to other players.</summary>
-        public readonly ManagedEvent Multiplayer_AfterMainBroadcast;
+        public readonly ManagedEvent Legacy_AfterMainBroadcast;
 
         /****
         ** MineEvents
         ****/
         /// <summary>Raised after the player warps to a new level of the mine.</summary>
-        public readonly ManagedEvent<EventArgsMineLevelChanged> Mine_LevelChanged;
+        public readonly ManagedEvent<EventArgsMineLevelChanged> Legacy_MineLevelChanged;
 
         /****
         ** PlayerEvents
         ****/
         /// <summary>Raised after the player's inventory changes in any way (added or removed item, sorted, etc).</summary>
-        public readonly ManagedEvent<EventArgsInventoryChanged> Player_InventoryChanged;
+        public readonly ManagedEvent<EventArgsInventoryChanged> Legacy_InventoryChanged;
 
         /// <summary> Raised after the player levels up a skill. This happens as soon as they level up, not when the game notifies the player after their character goes to bed.</summary>
-        public readonly ManagedEvent<EventArgsLevelUp> Player_LeveledUp;
+        public readonly ManagedEvent<EventArgsLevelUp> Legacy_LeveledUp;
 
         /// <summary>Raised after the player warps to a new location.</summary>
-        public readonly ManagedEvent<EventArgsPlayerWarped> Player_Warped;
+        public readonly ManagedEvent<EventArgsPlayerWarped> Legacy_PlayerWarped;
 
 
         /****
         ** SaveEvents
         ****/
         /// <summary>Raised before the game creates the save file.</summary>
-        public readonly ManagedEvent Save_BeforeCreate;
+        public readonly ManagedEvent Legacy_BeforeCreateSave;
 
         /// <summary>Raised after the game finishes creating the save file.</summary>
-        public readonly ManagedEvent Save_AfterCreate;
+        public readonly ManagedEvent Legacy_AfterCreateSave;
 
         /// <summary>Raised before the game begins writes data to the save file.</summary>
-        public readonly ManagedEvent Save_BeforeSave;
+        public readonly ManagedEvent Legacy_BeforeSave;
 
         /// <summary>Raised after the game finishes writing data to the save file.</summary>
-        public readonly ManagedEvent Save_AfterSave;
+        public readonly ManagedEvent Legacy_AfterSave;
 
         /// <summary>Raised after the player loads a save slot.</summary>
-        public readonly ManagedEvent Save_AfterLoad;
+        public readonly ManagedEvent Legacy_AfterLoad;
 
         /// <summary>Raised after the game returns to the title screen.</summary>
-        public readonly ManagedEvent Save_AfterReturnToTitle;
+        public readonly ManagedEvent Legacy_AfterReturnToTitle;
 
         /****
         ** SpecialisedEvents
         ****/
         /// <summary>Raised when the game updates its state (≈60 times per second), regardless of normal SMAPI validation. This event is not thread-safe and may be invoked while game logic is running asynchronously. Changes to game state in this method may crash the game or corrupt an in-progress save. Do not use this event unless you're fully aware of the context in which your code will be run. Mods using this method will trigger a stability warning in the SMAPI console.</summary>
-        public readonly ManagedEvent Specialised_UnvalidatedUpdateTick;
+        public readonly ManagedEvent Legacy_UnvalidatedUpdateTick;
 
         /****
         ** TimeEvents
         ****/
         /// <summary>Raised after the game begins a new day, including when loading a save.</summary>
-        public readonly ManagedEvent Time_AfterDayStarted;
+        public readonly ManagedEvent Legacy_AfterDayStarted;
 
         /// <summary>Raised after the in-game clock changes.</summary>
-        public readonly ManagedEvent<EventArgsIntChanged> Time_TimeOfDayChanged;
+        public readonly ManagedEvent<EventArgsIntChanged> Legacy_TimeOfDayChanged;
 
 
         /*********
@@ -264,84 +264,84 @@ namespace StardewModdingAPI.Framework.Events
             ManagedEvent ManageEvent(string typeName, string eventName) => new ManagedEvent($"{typeName}.{eventName}", monitor, modRegistry);
 
             // init events (new)
-            this.GameLoop_Launched = ManageEventOf<GameLoopLaunchedEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.Launched));
-            this.GameLoop_Updating = ManageEventOf<GameLoopUpdatingEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.Updating));
-            this.GameLoop_Updated = ManageEventOf<GameLoopUpdatedEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.Updated));
-
-            this.Input_ButtonPressed = ManageEventOf<InputButtonPressedEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.ButtonPressed));
-            this.Input_ButtonReleased = ManageEventOf<InputButtonReleasedEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.ButtonReleased));
-            this.Input_CursorMoved = ManageEventOf<InputCursorMovedEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.CursorMoved));
-            this.Input_MouseWheelScrolled = ManageEventOf<InputMouseWheelScrolledEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.MouseWheelScrolled));
-
-            this.World_BuildingListChanged = ManageEventOf<WorldBuildingListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.LocationListChanged));
-            this.World_DebrisListChanged = ManageEventOf<WorldDebrisListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.DebrisListChanged));
-            this.World_LargeTerrainFeatureListChanged = ManageEventOf<WorldLargeTerrainFeatureListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.LargeTerrainFeatureListChanged));
-            this.World_LocationListChanged = ManageEventOf<WorldLocationListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.BuildingListChanged));
-            this.World_NpcListChanged = ManageEventOf<WorldNpcListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.NpcListChanged));
-            this.World_ObjectListChanged = ManageEventOf<WorldObjectListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.ObjectListChanged));
-            this.World_TerrainFeatureListChanged = ManageEventOf<WorldTerrainFeatureListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.TerrainFeatureListChanged));
+            this.GameLaunched = ManageEventOf<GameLaunchedEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.GameLaunched));
+            this.UpdateTicking = ManageEventOf<UpdateTickingEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.UpdateTicking));
+            this.UpdateTicked = ManageEventOf<UpdateTickedEventArgs>(nameof(IModEvents.GameLoop), nameof(IGameLoopEvents.UpdateTicked));
+
+            this.ButtonPressed = ManageEventOf<ButtonPressedEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.ButtonPressed));
+            this.ButtonReleased = ManageEventOf<ButtonReleasedEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.ButtonReleased));
+            this.CursorMoved = ManageEventOf<CursorMovedEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.CursorMoved));
+            this.MouseWheelScrolled = ManageEventOf<MouseWheelScrolledEventArgs>(nameof(IModEvents.Input), nameof(IInputEvents.MouseWheelScrolled));
+
+            this.BuildingListChanged = ManageEventOf<BuildingListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.LocationListChanged));
+            this.DebrisListChanged = ManageEventOf<DebrisListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.DebrisListChanged));
+            this.LargeTerrainFeatureListChanged = ManageEventOf<LargeTerrainFeatureListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.LargeTerrainFeatureListChanged));
+            this.LocationListChanged = ManageEventOf<LocationListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.BuildingListChanged));
+            this.NpcListChanged = ManageEventOf<NpcListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.NpcListChanged));
+            this.ObjectListChanged = ManageEventOf<ObjectListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.ObjectListChanged));
+            this.TerrainFeatureListChanged = ManageEventOf<TerrainFeatureListChangedEventArgs>(nameof(IModEvents.World), nameof(IWorldEvents.TerrainFeatureListChanged));
 
             // init events (old)
-            this.Content_LocaleChanged = ManageEventOf<EventArgsValueChanged<string>>(nameof(ContentEvents), nameof(ContentEvents.AfterLocaleChanged));
-
-            this.Legacy_Control_ControllerButtonPressed = ManageEventOf<EventArgsControllerButtonPressed>(nameof(ControlEvents), nameof(ControlEvents.ControllerButtonPressed));
-            this.Legacy_Control_ControllerButtonReleased = ManageEventOf<EventArgsControllerButtonReleased>(nameof(ControlEvents), nameof(ControlEvents.ControllerButtonReleased));
-            this.Legacy_Control_ControllerTriggerPressed = ManageEventOf<EventArgsControllerTriggerPressed>(nameof(ControlEvents), nameof(ControlEvents.ControllerTriggerPressed));
-            this.Legacy_Control_ControllerTriggerReleased = ManageEventOf<EventArgsControllerTriggerReleased>(nameof(ControlEvents), nameof(ControlEvents.ControllerTriggerReleased));
-            this.Legacy_Control_KeyboardChanged = ManageEventOf<EventArgsKeyboardStateChanged>(nameof(ControlEvents), nameof(ControlEvents.KeyboardChanged));
-            this.Legacy_Control_KeyPressed = ManageEventOf<EventArgsKeyPressed>(nameof(ControlEvents), nameof(ControlEvents.KeyPressed));
-            this.Legacy_Control_KeyReleased = ManageEventOf<EventArgsKeyPressed>(nameof(ControlEvents), nameof(ControlEvents.KeyReleased));
-            this.Legacy_Control_MouseChanged = ManageEventOf<EventArgsMouseStateChanged>(nameof(ControlEvents), nameof(ControlEvents.MouseChanged));
-
-            this.Game_FirstUpdateTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.FirstUpdateTick));
-            this.Game_UpdateTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.UpdateTick));
-            this.Game_SecondUpdateTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.SecondUpdateTick));
-            this.Game_FourthUpdateTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.FourthUpdateTick));
-            this.Game_EighthUpdateTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.EighthUpdateTick));
-            this.Game_QuarterSecondTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.QuarterSecondTick));
-            this.Game_HalfSecondTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.HalfSecondTick));
-            this.Game_OneSecondTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.OneSecondTick));
-
-            this.Graphics_Resize = ManageEvent(nameof(GraphicsEvents), nameof(GraphicsEvents.Resize));
-            this.Graphics_OnPreRenderEvent = ManageEvent(nameof(GraphicsEvents), nameof(GraphicsEvents.OnPreRenderEvent));
-            this.Graphics_OnPostRenderEvent = ManageEvent(nameof(GraphicsEvents), nameof(GraphicsEvents.OnPostRenderEvent));
-            this.Graphics_OnPreRenderHudEvent = ManageEvent(nameof(GraphicsEvents), nameof(GraphicsEvents.OnPreRenderHudEvent));
-            this.Graphics_OnPostRenderHudEvent = ManageEvent(nameof(GraphicsEvents), nameof(GraphicsEvents.OnPostRenderHudEvent));
-            this.Graphics_OnPreRenderGuiEvent = ManageEvent(nameof(GraphicsEvents), nameof(GraphicsEvents.OnPreRenderGuiEvent));
-            this.Graphics_OnPostRenderGuiEvent = ManageEvent(nameof(GraphicsEvents), nameof(GraphicsEvents.OnPostRenderGuiEvent));
-
-            this.Legacy_Input_ButtonPressed = ManageEventOf<EventArgsInput>(nameof(InputEvents), nameof(InputEvents.ButtonPressed));
-            this.Legacy_Input_ButtonReleased = ManageEventOf<EventArgsInput>(nameof(InputEvents), nameof(InputEvents.ButtonReleased));
-
-            this.Legacy_Location_LocationsChanged = ManageEventOf<EventArgsLocationsChanged>(nameof(LocationEvents), nameof(LocationEvents.LocationsChanged));
-            this.Legacy_Location_BuildingsChanged = ManageEventOf<EventArgsLocationBuildingsChanged>(nameof(LocationEvents), nameof(LocationEvents.BuildingsChanged));
-            this.Legacy_Location_ObjectsChanged = ManageEventOf<EventArgsLocationObjectsChanged>(nameof(LocationEvents), nameof(LocationEvents.ObjectsChanged));
-
-            this.Menu_Changed = ManageEventOf<EventArgsClickableMenuChanged>(nameof(MenuEvents), nameof(MenuEvents.MenuChanged));
-            this.Menu_Closed = ManageEventOf<EventArgsClickableMenuClosed>(nameof(MenuEvents), nameof(MenuEvents.MenuClosed));
-
-            this.Multiplayer_BeforeMainBroadcast = ManageEvent(nameof(MultiplayerEvents), nameof(MultiplayerEvents.BeforeMainBroadcast));
-            this.Multiplayer_AfterMainBroadcast = ManageEvent(nameof(MultiplayerEvents), nameof(MultiplayerEvents.AfterMainBroadcast));
-            this.Multiplayer_BeforeMainSync = ManageEvent(nameof(MultiplayerEvents), nameof(MultiplayerEvents.BeforeMainSync));
-            this.Multiplayer_AfterMainSync = ManageEvent(nameof(MultiplayerEvents), nameof(MultiplayerEvents.AfterMainSync));
-
-            this.Mine_LevelChanged = ManageEventOf<EventArgsMineLevelChanged>(nameof(MineEvents), nameof(MineEvents.MineLevelChanged));
-
-            this.Player_InventoryChanged = ManageEventOf<EventArgsInventoryChanged>(nameof(PlayerEvents), nameof(PlayerEvents.InventoryChanged));
-            this.Player_LeveledUp = ManageEventOf<EventArgsLevelUp>(nameof(PlayerEvents), nameof(PlayerEvents.LeveledUp));
-            this.Player_Warped = ManageEventOf<EventArgsPlayerWarped>(nameof(PlayerEvents), nameof(PlayerEvents.Warped));
-
-            this.Save_BeforeCreate = ManageEvent(nameof(SaveEvents), nameof(SaveEvents.BeforeCreate));
-            this.Save_AfterCreate = ManageEvent(nameof(SaveEvents), nameof(SaveEvents.AfterCreate));
-            this.Save_BeforeSave = ManageEvent(nameof(SaveEvents), nameof(SaveEvents.BeforeSave));
-            this.Save_AfterSave = ManageEvent(nameof(SaveEvents), nameof(SaveEvents.AfterSave));
-            this.Save_AfterLoad = ManageEvent(nameof(SaveEvents), nameof(SaveEvents.AfterLoad));
-            this.Save_AfterReturnToTitle = ManageEvent(nameof(SaveEvents), nameof(SaveEvents.AfterReturnToTitle));
-
-            this.Specialised_UnvalidatedUpdateTick = ManageEvent(nameof(SpecialisedEvents), nameof(SpecialisedEvents.UnvalidatedUpdateTick));
-
-            this.Time_AfterDayStarted = ManageEvent(nameof(TimeEvents), nameof(TimeEvents.AfterDayStarted));
-            this.Time_TimeOfDayChanged = ManageEventOf<EventArgsIntChanged>(nameof(TimeEvents), nameof(TimeEvents.TimeOfDayChanged));
+            this.Legacy_LocaleChanged = ManageEventOf<EventArgsValueChanged<string>>(nameof(ContentEvents), nameof(ContentEvents.AfterLocaleChanged));
+
+            this.Legacy_ControllerButtonPressed = ManageEventOf<EventArgsControllerButtonPressed>(nameof(ControlEvents), nameof(ControlEvents.ControllerButtonPressed));
+            this.Legacy_ControllerButtonReleased = ManageEventOf<EventArgsControllerButtonReleased>(nameof(ControlEvents), nameof(ControlEvents.ControllerButtonReleased));
+            this.Legacy_ControllerTriggerPressed = ManageEventOf<EventArgsControllerTriggerPressed>(nameof(ControlEvents), nameof(ControlEvents.ControllerTriggerPressed));
+            this.Legacy_ControllerTriggerReleased = ManageEventOf<EventArgsControllerTriggerReleased>(nameof(ControlEvents), nameof(ControlEvents.ControllerTriggerReleased));
+            this.Legacy_KeyboardChanged = ManageEventOf<EventArgsKeyboardStateChanged>(nameof(ControlEvents), nameof(ControlEvents.KeyboardChanged));
+            this.Legacy_KeyPressed = ManageEventOf<EventArgsKeyPressed>(nameof(ControlEvents), nameof(ControlEvents.KeyPressed));
+            this.Legacy_KeyReleased = ManageEventOf<EventArgsKeyPressed>(nameof(ControlEvents), nameof(ControlEvents.KeyReleased));
+            this.Legacy_MouseChanged = ManageEventOf<EventArgsMouseStateChanged>(nameof(ControlEvents), nameof(ControlEvents.MouseChanged));
+
+            this.Legacy_FirstUpdateTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.FirstUpdateTick));
+            this.Legacy_UpdateTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.UpdateTick));
+            this.Legacy_SecondUpdateTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.SecondUpdateTick));
+            this.Legacy_FourthUpdateTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.FourthUpdateTick));
+            this.Legacy_EighthUpdateTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.EighthUpdateTick));
+            this.Legacy_QuarterSecondTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.QuarterSecondTick));
+            this.Legacy_HalfSecondTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.HalfSecondTick));
+            this.Legacy_OneSecondTick = ManageEvent(nameof(GameEvents), nameof(GameEvents.OneSecondTick));
+
+            this.Legacy_Resize = ManageEvent(nameof(GraphicsEvents), nameof(GraphicsEvents.Resize));
+            this.Legacy_OnPreRenderEvent = ManageEvent(nameof(GraphicsEvents), nameof(GraphicsEvents.OnPreRenderEvent));
+            this.Legacy_OnPostRenderEvent = ManageEvent(nameof(GraphicsEvents), nameof(GraphicsEvents.OnPostRenderEvent));
+            this.Legacy_OnPreRenderHudEvent = ManageEvent(nameof(GraphicsEvents), nameof(GraphicsEvents.OnPreRenderHudEvent));
+            this.Legacy_OnPostRenderHudEvent = ManageEvent(nameof(GraphicsEvents), nameof(GraphicsEvents.OnPostRenderHudEvent));
+            this.Legacy_OnPreRenderGuiEvent = ManageEvent(nameof(GraphicsEvents), nameof(GraphicsEvents.OnPreRenderGuiEvent));
+            this.Legacy_OnPostRenderGuiEvent = ManageEvent(nameof(GraphicsEvents), nameof(GraphicsEvents.OnPostRenderGuiEvent));
+
+            this.Legacy_ButtonPressed = ManageEventOf<EventArgsInput>(nameof(InputEvents), nameof(InputEvents.ButtonPressed));
+            this.Legacy_ButtonReleased = ManageEventOf<EventArgsInput>(nameof(InputEvents), nameof(InputEvents.ButtonReleased));
+
+            this.Legacy_LocationsChanged = ManageEventOf<EventArgsLocationsChanged>(nameof(LocationEvents), nameof(LocationEvents.LocationsChanged));
+            this.Legacy_BuildingsChanged = ManageEventOf<EventArgsLocationBuildingsChanged>(nameof(LocationEvents), nameof(LocationEvents.BuildingsChanged));
+            this.Legacy_ObjectsChanged = ManageEventOf<EventArgsLocationObjectsChanged>(nameof(LocationEvents), nameof(LocationEvents.ObjectsChanged));
+
+            this.Legacy_MenuChanged = ManageEventOf<EventArgsClickableMenuChanged>(nameof(MenuEvents), nameof(MenuEvents.MenuChanged));
+            this.Legacy_MenuClosed = ManageEventOf<EventArgsClickableMenuClosed>(nameof(MenuEvents), nameof(MenuEvents.MenuClosed));
+
+            this.Legacy_BeforeMainBroadcast = ManageEvent(nameof(MultiplayerEvents), nameof(MultiplayerEvents.BeforeMainBroadcast));
+            this.Legacy_AfterMainBroadcast = ManageEvent(nameof(MultiplayerEvents), nameof(MultiplayerEvents.AfterMainBroadcast));
+            this.Legacy_BeforeMainSync = ManageEvent(nameof(MultiplayerEvents), nameof(MultiplayerEvents.BeforeMainSync));
+            this.Legacy_AfterMainSync = ManageEvent(nameof(MultiplayerEvents), nameof(MultiplayerEvents.AfterMainSync));
+
+            this.Legacy_MineLevelChanged = ManageEventOf<EventArgsMineLevelChanged>(nameof(MineEvents), nameof(MineEvents.MineLevelChanged));
+
+            this.Legacy_InventoryChanged = ManageEventOf<EventArgsInventoryChanged>(nameof(PlayerEvents), nameof(PlayerEvents.InventoryChanged));
+            this.Legacy_LeveledUp = ManageEventOf<EventArgsLevelUp>(nameof(PlayerEvents), nameof(PlayerEvents.LeveledUp));
+            this.Legacy_PlayerWarped = ManageEventOf<EventArgsPlayerWarped>(nameof(PlayerEvents), nameof(PlayerEvents.Warped));
+
+            this.Legacy_BeforeCreateSave = ManageEvent(nameof(SaveEvents), nameof(SaveEvents.BeforeCreate));
+            this.Legacy_AfterCreateSave = ManageEvent(nameof(SaveEvents), nameof(SaveEvents.AfterCreate));
+            this.Legacy_BeforeSave = ManageEvent(nameof(SaveEvents), nameof(SaveEvents.BeforeSave));
+            this.Legacy_AfterSave = ManageEvent(nameof(SaveEvents), nameof(SaveEvents.AfterSave));
+            this.Legacy_AfterLoad = ManageEvent(nameof(SaveEvents), nameof(SaveEvents.AfterLoad));
+            this.Legacy_AfterReturnToTitle = ManageEvent(nameof(SaveEvents), nameof(SaveEvents.AfterReturnToTitle));
+
+            this.Legacy_UnvalidatedUpdateTick = ManageEvent(nameof(SpecialisedEvents), nameof(SpecialisedEvents.UnvalidatedUpdateTick));
+
+            this.Legacy_AfterDayStarted = ManageEvent(nameof(TimeEvents), nameof(TimeEvents.AfterDayStarted));
+            this.Legacy_TimeOfDayChanged = ManageEventOf<EventArgsIntChanged>(nameof(TimeEvents), nameof(TimeEvents.TimeOfDayChanged));
         }
     }
 }
diff --git a/src/SMAPI/Framework/Events/ModGameLoopEvents.cs b/src/SMAPI/Framework/Events/ModGameLoopEvents.cs
index 379a4e96..781597ef 100644
--- a/src/SMAPI/Framework/Events/ModGameLoopEvents.cs
+++ b/src/SMAPI/Framework/Events/ModGameLoopEvents.cs
@@ -10,24 +10,24 @@ namespace StardewModdingAPI.Framework.Events
         ** Accessors
         *********/
         /// <summary>Raised after the game is launched, right before the first update tick.</summary>
-        public event EventHandler<GameLoopLaunchedEventArgs> Launched
+        public event EventHandler<GameLaunchedEventArgs> GameLaunched
         {
-            add => this.EventManager.GameLoop_Launched.Add(value);
-            remove => this.EventManager.GameLoop_Launched.Remove(value);
+            add => this.EventManager.GameLaunched.Add(value);
+            remove => this.EventManager.GameLaunched.Remove(value);
         }
 
         /// <summary>Raised before the game performs its overall update tick (≈60 times per second).</summary>
-        public event EventHandler<GameLoopUpdatingEventArgs> Updating
+        public event EventHandler<UpdateTickingEventArgs> UpdateTicking
         {
-            add => this.EventManager.GameLoop_Updating.Add(value);
-            remove => this.EventManager.GameLoop_Updating.Remove(value);
+            add => this.EventManager.UpdateTicking.Add(value);
+            remove => this.EventManager.UpdateTicking.Remove(value);
         }
 
         /// <summary>Raised after the game performs its overall update tick (≈60 times per second).</summary>
-        public event EventHandler<GameLoopUpdatedEventArgs> Updated
+        public event EventHandler<UpdateTickedEventArgs> UpdateTicked
         {
-            add => this.EventManager.GameLoop_Updated.Add(value);
-            remove => this.EventManager.GameLoop_Updated.Remove(value);
+            add => this.EventManager.UpdateTicked.Add(value);
+            remove => this.EventManager.UpdateTicked.Remove(value);
         }
 
 
diff --git a/src/SMAPI/Framework/Events/ModInputEvents.cs b/src/SMAPI/Framework/Events/ModInputEvents.cs
index feca34f3..6a4298b4 100644
--- a/src/SMAPI/Framework/Events/ModInputEvents.cs
+++ b/src/SMAPI/Framework/Events/ModInputEvents.cs
@@ -10,31 +10,31 @@ namespace StardewModdingAPI.Framework.Events
         ** Accessors
         *********/
         /// <summary>Raised after the player presses a button on the keyboard, controller, or mouse.</summary>
-        public event EventHandler<InputButtonPressedEventArgs> ButtonPressed
+        public event EventHandler<ButtonPressedEventArgs> ButtonPressed
         {
-            add => this.EventManager.Input_ButtonPressed.Add(value);
-            remove => this.EventManager.Input_ButtonPressed.Remove(value);
+            add => this.EventManager.ButtonPressed.Add(value);
+            remove => this.EventManager.ButtonPressed.Remove(value);
         }
 
         /// <summary>Raised after the player releases a button on the keyboard, controller, or mouse.</summary>
-        public event EventHandler<InputButtonReleasedEventArgs> ButtonReleased
+        public event EventHandler<ButtonReleasedEventArgs> ButtonReleased
         {
-            add => this.EventManager.Input_ButtonReleased.Add(value);
-            remove => this.EventManager.Input_ButtonReleased.Remove(value);
+            add => this.EventManager.ButtonReleased.Add(value);
+            remove => this.EventManager.ButtonReleased.Remove(value);
         }
 
         /// <summary>Raised after the player moves the in-game cursor.</summary>
-        public event EventHandler<InputCursorMovedEventArgs> CursorMoved
+        public event EventHandler<CursorMovedEventArgs> CursorMoved
         {
-            add => this.EventManager.Input_CursorMoved.Add(value);
-            remove => this.EventManager.Input_CursorMoved.Remove(value);
+            add => this.EventManager.CursorMoved.Add(value);
+            remove => this.EventManager.CursorMoved.Remove(value);
         }
 
         /// <summary>Raised after the player scrolls the mouse wheel.</summary>
-        public event EventHandler<InputMouseWheelScrolledEventArgs> MouseWheelScrolled
+        public event EventHandler<MouseWheelScrolledEventArgs> MouseWheelScrolled
         {
-            add => this.EventManager.Input_MouseWheelScrolled.Add(value);
-            remove => this.EventManager.Input_MouseWheelScrolled.Remove(value);
+            add => this.EventManager.MouseWheelScrolled.Add(value);
+            remove => this.EventManager.MouseWheelScrolled.Remove(value);
         }
 
 
diff --git a/src/SMAPI/Framework/Events/ModWorldEvents.cs b/src/SMAPI/Framework/Events/ModWorldEvents.cs
index dc9c0f4c..b85002a3 100644
--- a/src/SMAPI/Framework/Events/ModWorldEvents.cs
+++ b/src/SMAPI/Framework/Events/ModWorldEvents.cs
@@ -10,52 +10,52 @@ namespace StardewModdingAPI.Framework.Events
         ** Accessors
         *********/
         /// <summary>Raised after a game location is added or removed.</summary>
-        public event EventHandler<WorldLocationListChangedEventArgs> LocationListChanged
+        public event EventHandler<LocationListChangedEventArgs> LocationListChanged
         {
-            add => this.EventManager.World_LocationListChanged.Add(value, this.Mod);
-            remove => this.EventManager.World_LocationListChanged.Remove(value);
+            add => this.EventManager.LocationListChanged.Add(value, this.Mod);
+            remove => this.EventManager.LocationListChanged.Remove(value);
         }
 
         /// <summary>Raised after buildings are added or removed in a location.</summary>
-        public event EventHandler<WorldBuildingListChangedEventArgs> BuildingListChanged
+        public event EventHandler<BuildingListChangedEventArgs> BuildingListChanged
         {
-            add => this.EventManager.World_BuildingListChanged.Add(value, this.Mod);
-            remove => this.EventManager.World_BuildingListChanged.Remove(value);
+            add => this.EventManager.BuildingListChanged.Add(value, this.Mod);
+            remove => this.EventManager.BuildingListChanged.Remove(value);
         }
 
         /// <summary>Raised after debris are added or removed in a location.</summary>
-        public event EventHandler<WorldDebrisListChangedEventArgs> DebrisListChanged
+        public event EventHandler<DebrisListChangedEventArgs> DebrisListChanged
         {
-            add => this.EventManager.World_DebrisListChanged.Add(value, this.Mod);
-            remove => this.EventManager.World_DebrisListChanged.Remove(value);
+            add => this.EventManager.DebrisListChanged.Add(value, this.Mod);
+            remove => this.EventManager.DebrisListChanged.Remove(value);
         }
 
         /// <summary>Raised after large terrain features (like bushes) are added or removed in a location.</summary>
-        public event EventHandler<WorldLargeTerrainFeatureListChangedEventArgs> LargeTerrainFeatureListChanged
+        public event EventHandler<LargeTerrainFeatureListChangedEventArgs> LargeTerrainFeatureListChanged
         {
-            add => this.EventManager.World_LargeTerrainFeatureListChanged.Add(value, this.Mod);
-            remove => this.EventManager.World_LargeTerrainFeatureListChanged.Remove(value);
+            add => this.EventManager.LargeTerrainFeatureListChanged.Add(value, this.Mod);
+            remove => this.EventManager.LargeTerrainFeatureListChanged.Remove(value);
         }
 
         /// <summary>Raised after NPCs are added or removed in a location.</summary>
-        public event EventHandler<WorldNpcListChangedEventArgs> NpcListChanged
+        public event EventHandler<NpcListChangedEventArgs> NpcListChanged
         {
-            add => this.EventManager.World_NpcListChanged.Add(value);
-            remove => this.EventManager.World_NpcListChanged.Remove(value);
+            add => this.EventManager.NpcListChanged.Add(value);
+            remove => this.EventManager.NpcListChanged.Remove(value);
         }
 
         /// <summary>Raised after objects are added or removed in a location.</summary>
-        public event EventHandler<WorldObjectListChangedEventArgs> ObjectListChanged
+        public event EventHandler<ObjectListChangedEventArgs> ObjectListChanged
         {
-            add => this.EventManager.World_ObjectListChanged.Add(value);
-            remove => this.EventManager.World_ObjectListChanged.Remove(value);
+            add => this.EventManager.ObjectListChanged.Add(value);
+            remove => this.EventManager.ObjectListChanged.Remove(value);
         }
 
         /// <summary>Raised after terrain features (like floors and trees) are added or removed in a location.</summary>
-        public event EventHandler<WorldTerrainFeatureListChangedEventArgs> TerrainFeatureListChanged
+        public event EventHandler<TerrainFeatureListChangedEventArgs> TerrainFeatureListChanged
         {
-            add => this.EventManager.World_TerrainFeatureListChanged.Add(value);
-            remove => this.EventManager.World_TerrainFeatureListChanged.Remove(value);
+            add => this.EventManager.TerrainFeatureListChanged.Add(value);
+            remove => this.EventManager.TerrainFeatureListChanged.Remove(value);
         }