38 files changed, 62 insertions, 90 deletions
diff --git a/src/SMAPI.Installer/InteractiveInstaller.cs b/src/SMAPI.Installer/InteractiveInstaller.cs
index 1a132e54..cbc8a401 100644
--- a/src/SMAPI.Installer/InteractiveInstaller.cs
+++ b/src/SMAPI.Installer/InteractiveInstaller.cs
@@ -97,6 +97,7 @@ namespace StardewModdingApi.Installer
 
             // obsolete
             yield return GetInstallPath("Mods/.cache"); // 1.3-1.4
+            yield return GetInstallPath("Mods/TrainerMod"); // *–2.0 (renamed to ConsoleCommands)
             yield return GetInstallPath("Mono.Cecil.Rocks.dll"); // 1.3–1.8
             yield return GetInstallPath("StardewModdingAPI-settings.json"); // 1.0-1.4
             if (modsDir.Exists)
diff --git a/src/TrainerMod/TrainerMod.cs b/src/SMAPI.Mods.ConsoleCommands/ConsoleCommandsMod.cs
index 5db02cd6..96658928 100644
--- a/src/TrainerMod/TrainerMod.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/ConsoleCommandsMod.cs
@@ -1,14 +1,13 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using StardewModdingAPI;
 using StardewModdingAPI.Events;
-using TrainerMod.Framework.Commands;
+using StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands;
 
-namespace TrainerMod
+namespace StardewModdingAPI.Mods.ConsoleCommands
 {
     /// <summary>The main entry point for the mod.</summary>
-    public class TrainerMod : Mod
+    public class ConsoleCommandsMod : Mod
     {
         /*********
         ** Properties
@@ -52,7 +51,7 @@ namespace TrainerMod
             }
         }
 
-        /// <summary>Handle a TrainerMod command.</summary>
+        /// <summary>Handle a console command.</summary>
         /// <param name="command">The command to invoke.</param>
         /// <param name="commandName">The command name specified by the user.</param>
         /// <param name="args">The command arguments.</param>
diff --git a/src/TrainerMod/Framework/Commands/ArgumentParser.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ArgumentParser.cs
index 6bcd3ff8..3ad1e168 100644
--- a/src/TrainerMod/Framework/Commands/ArgumentParser.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ArgumentParser.cs
@@ -2,9 +2,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using StardewModdingAPI;
 
-namespace TrainerMod.Framework.Commands
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands
 {
     /// <summary>Provides methods for parsing command-line arguments.</summary>
     internal class ArgumentParser : IReadOnlyList<string>
diff --git a/src/TrainerMod/Framework/Commands/ITrainerCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ITrainerCommand.cs
index 3d97e799..a0b739f8 100644
--- a/src/TrainerMod/Framework/Commands/ITrainerCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ITrainerCommand.cs
@@ -1,8 +1,6 @@
-using StardewModdingAPI;
-
-namespace TrainerMod.Framework.Commands
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands
 {
-    /// <summary>A TrainerMod command to register.</summary>
+    /// <summary>A console command to register.</summary>
     internal interface ITrainerCommand
     {
         /*********
diff --git a/src/TrainerMod/Framework/Commands/Other/DebugCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs
index 8c6e9f3b..e4010111 100644
--- a/src/TrainerMod/Framework/Commands/Other/DebugCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs
@@ -1,7 +1,6 @@
-using StardewModdingAPI;
-using StardewValley;
+using StardewValley;
 
-namespace TrainerMod.Framework.Commands.Other
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
 {
     /// <summary>A command which sends a debug command to the game.</summary>
     internal class DebugCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Other/ShowDataFilesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs
index 367a70c6..54d27185 100644
--- a/src/TrainerMod/Framework/Commands/Other/ShowDataFilesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs
@@ -1,7 +1,6 @@
 using System.Diagnostics;
-using StardewModdingAPI;
 
-namespace TrainerMod.Framework.Commands.Other
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
 {
     /// <summary>A command which shows the data files.</summary>
     internal class ShowDataFilesCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Other/ShowGameFilesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs
index 67fa83a3..0257892f 100644
--- a/src/TrainerMod/Framework/Commands/Other/ShowGameFilesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs
@@ -1,7 +1,6 @@
 using System.Diagnostics;
-using StardewModdingAPI;
 
-namespace TrainerMod.Framework.Commands.Other
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
 {
     /// <summary>A command which shows the game files.</summary>
     internal class ShowGameFilesCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Player/AddCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
index 47840202..81167747 100644
--- a/src/TrainerMod/Framework/Commands/Player/AddCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Linq;
-using StardewModdingAPI;
+using StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData;
 using StardewValley;
-using TrainerMod.Framework.ItemData;
 using Object = StardewValley.Object;
 
-namespace TrainerMod.Framework.Commands.Player
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which adds an item to the player inventory.</summary>
     internal class AddCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Player/ListItemTypesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
index 5f14edbb..34f1760c 100644
--- a/src/TrainerMod/Framework/Commands/Player/ListItemTypesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
@@ -1,8 +1,7 @@
 using System.Linq;
-using StardewModdingAPI;
-using TrainerMod.Framework.ItemData;
+using StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData;
 
-namespace TrainerMod.Framework.Commands.Player
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which list item types.</summary>
     internal class ListItemTypesCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Player/ListItemsCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
index 7f4f454c..942a50b8 100644
--- a/src/TrainerMod/Framework/Commands/Player/ListItemsCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using StardewModdingAPI;
-using TrainerMod.Framework.ItemData;
+using StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData;
 
-namespace TrainerMod.Framework.Commands.Player
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which list items available to spawn.</summary>
     internal class ListItemsCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Player/SetColorCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs
index 28ace0df..5d098593 100644
--- a/src/TrainerMod/Framework/Commands/Player/SetColorCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs
@@ -1,8 +1,7 @@
 using Microsoft.Xna.Framework;
-using StardewModdingAPI;
 using StardewValley;
 
-namespace TrainerMod.Framework.Commands.Player
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the color of a player feature.</summary>
     internal class SetColorCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Player/SetHealthCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs
index f64e9035..2e8f6630 100644
--- a/src/TrainerMod/Framework/Commands/Player/SetHealthCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs
@@ -1,8 +1,7 @@
 using System.Linq;
-using StardewModdingAPI;
 using StardewValley;
 
-namespace TrainerMod.Framework.Commands.Player
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's current health.</summary>
     internal class SetHealthCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Player/SetImmunityCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs
index 59b28a3c..9c66c4fe 100644
--- a/src/TrainerMod/Framework/Commands/Player/SetImmunityCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs
@@ -1,8 +1,7 @@
 using System.Linq;
-using StardewModdingAPI;
 using StardewValley;
 
-namespace TrainerMod.Framework.Commands.Player
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's current immunity.</summary>
     internal class SetImmunityCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Player/SetLevelCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetLevelCommand.cs
index 54d5e47b..68891267 100644
--- a/src/TrainerMod/Framework/Commands/Player/SetLevelCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetLevelCommand.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
-using StardewModdingAPI;
 using StardewValley;
 using SFarmer = StardewValley.Farmer;
 
-namespace TrainerMod.Framework.Commands.Player
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's current level for a skill.</summary>
     internal class SetLevelCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Player/SetMaxHealthCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs
index 4b9d87dc..f4ae0694 100644
--- a/src/TrainerMod/Framework/Commands/Player/SetMaxHealthCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs
@@ -1,8 +1,7 @@
 using System.Linq;
-using StardewModdingAPI;
 using StardewValley;
 
-namespace TrainerMod.Framework.Commands.Player
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's maximum health.</summary>
     internal class SetMaxHealthCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Player/SetMaxStaminaCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs
index 3997bb1b..5bce5ea3 100644
--- a/src/TrainerMod/Framework/Commands/Player/SetMaxStaminaCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs
@@ -1,8 +1,7 @@
 using System.Linq;
-using StardewModdingAPI;
 using StardewValley;
 
-namespace TrainerMod.Framework.Commands.Player
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's maximum stamina.</summary>
     internal class SetMaxStaminaCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Player/SetMoneyCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs
index 55e069a4..3fc504b1 100644
--- a/src/TrainerMod/Framework/Commands/Player/SetMoneyCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs
@@ -1,8 +1,7 @@
 using System.Linq;
-using StardewModdingAPI;
 using StardewValley;
 
-namespace TrainerMod.Framework.Commands.Player
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's current money.</summary>
     internal class SetMoneyCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Player/SetNameCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs
index 3fd4475c..5b1225e8 100644
--- a/src/TrainerMod/Framework/Commands/Player/SetNameCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs
@@ -1,7 +1,6 @@
-using StardewModdingAPI;
-using StardewValley;
+using StardewValley;
 
-namespace TrainerMod.Framework.Commands.Player
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's name.</summary>
     internal class SetNameCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Player/SetSpeedCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetSpeedCommand.cs
index 40b87b62..e9693540 100644
--- a/src/TrainerMod/Framework/Commands/Player/SetSpeedCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetSpeedCommand.cs
@@ -1,7 +1,6 @@
-using StardewModdingAPI;
-using StardewValley;
+using StardewValley;
 
-namespace TrainerMod.Framework.Commands.Player
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's current added speed.</summary>
     internal class SetSpeedCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Player/SetStaminaCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs
index d44d1370..866c3d22 100644
--- a/src/TrainerMod/Framework/Commands/Player/SetStaminaCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs
@@ -1,8 +1,7 @@
 using System.Linq;
-using StardewModdingAPI;
 using StardewValley;
 
-namespace TrainerMod.Framework.Commands.Player
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's current stamina.</summary>
     internal class SetStaminaCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/Player/SetStyleCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs
index 96e34af2..b59be2e5 100644
--- a/src/TrainerMod/Framework/Commands/Player/SetStyleCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs
@@ -1,7 +1,6 @@
-using StardewModdingAPI;
-using StardewValley;
+using StardewValley;
 
-namespace TrainerMod.Framework.Commands.Player
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits a player style.</summary>
     internal class SetStyleCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/TrainerCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/TrainerCommand.cs
index abe9ee41..466b8f6e 100644
--- a/src/TrainerMod/Framework/Commands/TrainerCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/TrainerCommand.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using StardewModdingAPI;
 
-namespace TrainerMod.Framework.Commands
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands
 {
     /// <summary>The base implementation for a trainer command.</summary>
     internal abstract class TrainerCommand : ITrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/World/DownMineLevelCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs
index 4e62cf77..da117006 100644
--- a/src/TrainerMod/Framework/Commands/World/DownMineLevelCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs
@@ -1,8 +1,7 @@
-using StardewModdingAPI;
-using StardewValley;
+using StardewValley;
 using StardewValley.Locations;
 
-namespace TrainerMod.Framework.Commands.World
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which moves the player to the next mine level.</summary>
     internal class DownMineLevelCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/World/FreezeTimeCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/FreezeTimeCommand.cs
index 13d08398..2627b714 100644
--- a/src/TrainerMod/Framework/Commands/World/FreezeTimeCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/FreezeTimeCommand.cs
@@ -1,8 +1,7 @@
 using System.Linq;
-using StardewModdingAPI;
 using StardewValley;
 
-namespace TrainerMod.Framework.Commands.World
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which freezes the current time.</summary>
     internal class FreezeTimeCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/World/SetDayCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs
index 54267384..8d6bd759 100644
--- a/src/TrainerMod/Framework/Commands/World/SetDayCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs
@@ -1,8 +1,7 @@
 using System.Linq;
-using StardewModdingAPI;
 using StardewValley;
 
-namespace TrainerMod.Framework.Commands.World
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which sets the current day.</summary>
     internal class SetDayCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/World/SetMineLevelCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs
index 225ec091..1024b7b6 100644
--- a/src/TrainerMod/Framework/Commands/World/SetMineLevelCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs
@@ -1,8 +1,7 @@
 using System;
-using StardewModdingAPI;
 using StardewValley;
 
-namespace TrainerMod.Framework.Commands.World
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which moves the player to the given mine level.</summary>
     internal class SetMineLevelCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/World/SetSeasonCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs
index 96c3d920..897d052f 100644
--- a/src/TrainerMod/Framework/Commands/World/SetSeasonCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs
@@ -1,8 +1,7 @@
 using System.Linq;
-using StardewModdingAPI;
 using StardewValley;
 
-namespace TrainerMod.Framework.Commands.World
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which sets the current season.</summary>
     internal class SetSeasonCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/World/SetTimeCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs
index c827ea5e..d6c71387 100644
--- a/src/TrainerMod/Framework/Commands/World/SetTimeCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs
@@ -1,8 +1,7 @@
 using System.Linq;
-using StardewModdingAPI;
 using StardewValley;
 
-namespace TrainerMod.Framework.Commands.World
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which sets the current time.</summary>
     internal class SetTimeCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/Commands/World/SetYearCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs
index 760fc170..66abd6dc 100644
--- a/src/TrainerMod/Framework/Commands/World/SetYearCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs
@@ -1,8 +1,7 @@
 using System.Linq;
-using StardewModdingAPI;
 using StardewValley;
 
-namespace TrainerMod.Framework.Commands.World
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which sets the current year.</summary>
     internal class SetYearCommand : TrainerCommand
diff --git a/src/TrainerMod/Framework/ItemData/ItemType.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/ItemType.cs
index 423455e9..797d4650 100644
--- a/src/TrainerMod/Framework/ItemData/ItemType.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/ItemType.cs
@@ -1,4 +1,4 @@
-namespace TrainerMod.Framework.ItemData
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData
 {
     /// <summary>An item type that can be searched and added to the player through the console.</summary>
     internal enum ItemType
diff --git a/src/TrainerMod/Framework/ItemData/SearchableItem.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/SearchableItem.cs
index 146da1a8..3eede413 100644
--- a/src/TrainerMod/Framework/ItemData/SearchableItem.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/SearchableItem.cs
@@ -1,6 +1,6 @@
 using StardewValley;
 
-namespace TrainerMod.Framework.ItemData
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData
 {
     /// <summary>A game item with metadata.</summary>
     internal class SearchableItem
diff --git a/src/TrainerMod/Framework/ItemRepository.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
index 96d3159e..b5fe9f2f 100644
--- a/src/TrainerMod/Framework/ItemRepository.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using Microsoft.Xna.Framework;
+using StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData;
 using StardewValley;
 using StardewValley.Objects;
 using StardewValley.Tools;
-using TrainerMod.Framework.ItemData;
 using SObject = StardewValley.Object;
 
-namespace TrainerMod.Framework
+namespace StardewModdingAPI.Mods.ConsoleCommands.Framework
 {
     /// <summary>Provides methods for searching and constructing items.</summary>
     internal class ItemRepository
diff --git a/src/SMAPI.Mods.ConsoleCommands/Properties/AssemblyInfo.cs b/src/SMAPI.Mods.ConsoleCommands/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..ac15ec72
--- /dev/null
+++ b/src/SMAPI.Mods.ConsoleCommands/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("SMAPI.Mods.ConsoleCommands")]
+[assembly: AssemblyDescription("")]
+[assembly: Guid("76791e28-b1b5-407c-82d6-50c3e5b7e037")]
diff --git a/src/TrainerMod/TrainerMod.csproj b/src/SMAPI.Mods.ConsoleCommands/StardewModdingAPI.Mods.ConsoleCommands.csproj
index cb5ec47e..437d0986 100644
--- a/src/TrainerMod/TrainerMod.csproj
+++ b/src/SMAPI.Mods.ConsoleCommands/StardewModdingAPI.Mods.ConsoleCommands.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{28480467-1A48-46A7-99F8-236D95225359}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TrainerMod</RootNamespace>
-    <AssemblyName>TrainerMod</AssemblyName>
+    <RootNamespace>StardewModdingAPI.Mods.ConsoleCommands</RootNamespace>
+    <AssemblyName>ConsoleCommands</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -16,7 +16,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)\..\bin\Debug\Mods\TrainerMod\</OutputPath>
+    <OutputPath>$(SolutionDir)\..\bin\Debug\Mods\ConsoleCommands\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)\..\bin\Release\Mods\TrainerMod\</OutputPath>
+    <OutputPath>$(SolutionDir)\..\bin\Release\Mods\ConsoleCommands\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -80,7 +80,7 @@
     <Compile Include="Framework\Commands\ITrainerCommand.cs" />
     <Compile Include="Framework\ItemData\SearchableItem.cs" />
     <Compile Include="Framework\ItemRepository.cs" />
-    <Compile Include="TrainerMod.cs" />
+    <Compile Include="ConsoleCommandsMod.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/TrainerMod/manifest.json b/src/SMAPI.Mods.ConsoleCommands/manifest.json
index 22e35bce..664dfabf 100644
--- a/src/TrainerMod/manifest.json
+++ b/src/SMAPI.Mods.ConsoleCommands/manifest.json
@@ -1,5 +1,5 @@
 {
-  "Name": "Trainer Mod",
+  "Name": "Console Commands",
   "Author": "SMAPI",
   "Version": {
     "MajorVersion": 2,
@@ -8,6 +8,6 @@
     "Build": null
   },
   "Description": "Adds SMAPI console commands that let you manipulate the game.",
-  "UniqueID": "SMAPI.TrainerMod",
-  "EntryDll": "TrainerMod.dll"
+  "UniqueID": "SMAPI.ConsoleCommands",
+  "EntryDll": "ConsoleCommands.dll"
 }
diff --git a/src/TrainerMod/packages.config b/src/SMAPI.Mods.ConsoleCommands/packages.config
index ee51c237..ee51c237 100644
--- a/src/TrainerMod/packages.config
+++ b/src/SMAPI.Mods.ConsoleCommands/packages.config
diff --git a/src/SMAPI.sln b/src/SMAPI.sln
index 89a8d45c..8d730f37 100644
--- a/src/SMAPI.sln
+++ b/src/SMAPI.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.16
+VisualStudioVersion = 15.0.27004.2002
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrainerMod", "TrainerMod\TrainerMod.csproj", "{28480467-1A48-46A7-99F8-236D95225359}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleCommands", "SMAPI.Mods.ConsoleCommands\StardewModdingAPI.Mods.ConsoleCommands.csproj", "{28480467-1A48-46A7-99F8-236D95225359}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StardewModdingAPI", "SMAPI\StardewModdingAPI.csproj", "{F1A573B0-F436-472C-AE29-0B91EA6B9F8F}"
 EndProject
diff --git a/src/TrainerMod/Properties/AssemblyInfo.cs b/src/TrainerMod/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0b19e78a..00000000
--- a/src/TrainerMod/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("TrainerMod")]
-[assembly: AssemblyDescription("")]
-[assembly: Guid("76791e28-b1b5-407c-82d6-50c3e5b7e037")]
-\ No newline at end of file