@@ -7,9 +7,9 @@ General utility bot for the [JavaDiscord Community](https://join.javadiscord.net
 To start up, run the bot once, and it will generate a `config` directory. Stop the bot, and set the `jdaBotToken` (in `systems.json`) to contain your token. Additionally, you should set the `mongoDatabaseUrl` to a URL to your own instance of MongoDB.
 
 # Commands
-Commands are defined in this bot using a `commands.yaml` configuration file. The data in this file is transformed at startup time into an array of `net.javadiscord.javabot.command.data.CommandConfig` objects using JSON deserialization.
+Commands are defined in this bot using a `commands.yaml` configuration file. The data in this file is transformed at startup time into an array of `net.javadiscord.javabot.command.data.slash_commands.SlashCommandConfig` objects using JSON deserialization.
 
-These commands are then used by `net.javadiscord.javabot.command.SlashCommands#registerSlashCommands(Guild)` to register the defined commands as Discord slash commands which become available to users in guilds and private messages with the bot.
+These commands are then used by `net.javadiscord.javabot.command.InteractionHandler#registerSlashCommands(Guild)` to register the defined commands as Discord slash commands which become available to users in guilds and private messages with the bot.
 
 **Each command MUST define a `handler` property, whose name is the fully-qualified class name of a `SlashCommandHandler`.** When registering commands, the bot will look for such a class, and attempt to create a new instance of it using a no-args constructor. Therefore, make sure that your handler class has a no-args constructor.
 
 
@@ -9,7 +9,7 @@
 import net.dv8tion.jda.api.utils.ChunkingFilter;
 import net.dv8tion.jda.api.utils.MemberCachePolicy;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
-import net.javadiscord.javabot.command.SlashCommands;
+import net.javadiscord.javabot.command.InteractionHandler;
 import net.javadiscord.javabot.data.config.BotConfig;
 import net.javadiscord.javabot.data.h2db.DbHelper;
 import net.javadiscord.javabot.events.*;
@@ -42,10 +42,10 @@ public class Bot {
 	/**
 	 * A reference to the slash command listener that's the main point of
 	 * interaction for users with this bot. It's marked as a publicly accessible
-	 * reference so that {@link SlashCommands#registerSlashCommands} can
+	 * reference so that {@link InteractionHandler#registerCommands} can
 	 * be called wherever it's needed.
 	 */
-	public static SlashCommands slashCommands;
+	public static InteractionHandler interactionHandler;
 	/**
 	 * An instance of {@link AutoMod}.
 	 * */
@@ -74,7 +74,7 @@ private Bot() {
 	 * <ol>
 	 *     <li>Setting the time zone to UTC, to keep our sanity when working with times.</li>
 	 *     <li>Loading the configuration JSON file.</li>
-	 *     <li>Initializing the {@link SlashCommands} listener (which reads command data from a YAML file).</li>
+	 *     <li>Initializing the {@link InteractionHandler} listener (which reads command data from a YAML file).</li>
 	 *     <li>Creating and configuring the {@link JDA} instance that enables the bot's Discord connectivity.</li>
 	 *     <li>Adding event listeners to the bot.</li>
 	 * </ol>
@@ -86,7 +86,7 @@ public static void main(String[] args) throws Exception {
 		TimeZone.setDefault(TimeZone.getTimeZone(ZoneOffset.UTC));
 		config = new BotConfig(Path.of("config"));
 		dataSource = DbHelper.initDataSource(config);
-		slashCommands = new SlashCommands();
+		interactionHandler = new InteractionHandler();
 		autoMod = new AutoMod();
 		imageCache = new ImageCacheUtils();
 		asyncPool = Executors.newScheduledThreadPool(config.getSystems().getAsyncPoolSize());
@@ -96,7 +96,7 @@ public static void main(String[] args) throws Exception {
 				.setMemberCachePolicy(MemberCachePolicy.ALL)
 				.enableCache(CacheFlag.ACTIVITY)
 				.enableIntents(GatewayIntent.GUILD_MEMBERS, GatewayIntent.GUILD_PRESENCES)
-				.addEventListeners(slashCommands)
+				.addEventListeners(interactionHandler)
 				.build();
 		addEventListeners(jda);
 		try {
@@ -110,7 +110,7 @@ public static void main(String[] args) throws Exception {
 
 	/**
 	 * Adds all the bot's event listeners to the JDA instance, except for the
-	 * main {@link SlashCommands} listener and {@link AutoMod}.
+	 * main {@link InteractionHandler} listener and {@link AutoMod}.
 	 *
 	 * @param jda The JDA bot instance to add listeners to.
 	 */
 
@@ -2,6 +2,7 @@
 
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
+import net.javadiscord.javabot.command.interfaces.ISlashCommand;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -13,23 +14,23 @@
  * that this parent handler can do the logic of finding the right subcommand to
  * invoke depending on the event received.
  */
-public class DelegatingCommandHandler implements SlashCommandHandler {
-	private final Map<String, SlashCommandHandler> subcommandHandlers;
-	private final Map<String, SlashCommandHandler> subcommandGroupHandlers;
+public class DelegatingCommandHandler implements ISlashCommand {
+	private final Map<String, ISlashCommand> subcommandHandlers;
+	private final Map<String, ISlashCommand> subcommandGroupHandlers;
 
 	/**
 	 * Constructs the handler with an already-initialized map of subcommands.
 	 *
 	 * @param subcommandHandlers The map of subcommands to use.
 	 */
-	public DelegatingCommandHandler(Map<String, SlashCommandHandler> subcommandHandlers) {
+	public DelegatingCommandHandler(Map<String, ISlashCommand> subcommandHandlers) {
 		this.subcommandHandlers = subcommandHandlers;
 		this.subcommandGroupHandlers = new HashMap<>();
 	}
 
 	/**
 	 * Constructs the handler with an empty map, which subcommands can be added
-	 * to via {@link DelegatingCommandHandler#addSubcommand(String, SlashCommandHandler)}.
+	 * to via {@link DelegatingCommandHandler#addSubcommand(String, ISlashCommand)}.
 	 */
 	public DelegatingCommandHandler() {
 		this.subcommandHandlers = new HashMap<>();
@@ -42,7 +43,7 @@ public DelegatingCommandHandler() {
 	 *
 	 * @return An unmodifiable map containing all registered subcommands.
 	 */
-	public Map<String, SlashCommandHandler> getSubcommandHandlers() {
+	public Map<String, ISlashCommand> getSubcommandHandlers() {
 		return Collections.unmodifiableMap(this.subcommandHandlers);
 	}
 
@@ -52,7 +53,7 @@ public Map<String, SlashCommandHandler> getSubcommandHandlers() {
 	 *
 	 * @return An unmodifiable map containing all registered group handlers.
 	 */
-	public Map<String, SlashCommandHandler> getSubcommandGroupHandlers() {
+	public Map<String, ISlashCommand> getSubcommandGroupHandlers() {
 		return Collections.unmodifiableMap(this.subcommandGroupHandlers);
 	}
 
@@ -65,7 +66,7 @@ public Map<String, SlashCommandHandler> getSubcommandGroupHandlers() {
 	 * @throws UnsupportedOperationException If this handler was initialized
 	 *                                       with an unmodifiable map of subcommand handlers.
 	 */
-	protected void addSubcommand(String name, SlashCommandHandler handler) {
+	protected void addSubcommand(String name, ISlashCommand handler) {
 		this.subcommandHandlers.put(name, handler);
 	}
 
@@ -78,7 +79,7 @@ protected void addSubcommand(String name, SlashCommandHandler handler) {
 	 * @throws UnsupportedOperationException If this handler was initialized
 	 *                                       with an unmodifiable map of subcommand group handlers.
 	 */
-	protected void addSubcommandGroup(String name, SlashCommandHandler handler) {
+	protected void addSubcommandGroup(String name, ISlashCommand handler) {
 		this.subcommandGroupHandlers.put(name, handler);
 	}
 
@@ -90,21 +91,21 @@ protected void addSubcommandGroup(String name, SlashCommandHandler handler) {
 	 * @return The reply action that is sent to the user.
 	 */
 	@Override
-	public ReplyCallbackAction handle(SlashCommandInteractionEvent event) throws ResponseException {
+	public ReplyCallbackAction handleSlashCommandInteraction(SlashCommandInteractionEvent event) throws ResponseException {
 		// First we check if the event has specified a subcommand group, and if we have a group handler for it.
 		if (event.getSubcommandGroup() != null) {
-			SlashCommandHandler groupHandler = this.getSubcommandGroupHandlers().get(event.getSubcommandGroup());
+			ISlashCommand groupHandler = this.getSubcommandGroupHandlers().get(event.getSubcommandGroup());
 			if (groupHandler != null) {
-				return groupHandler.handle(event);
+				return groupHandler.handleSlashCommandInteraction(event);
 			}
 		}
 		// If the event doesn't have a subcommand group, or no handler was found for the group, we just move on to the subcommand.
 		if (event.getSubcommandName() == null) {
 			return this.handleNonSubcommand(event);
 		} else {
-			SlashCommandHandler handler = this.getSubcommandHandlers().get(event.getSubcommandName());
+			ISlashCommand handler = this.getSubcommandHandlers().get(event.getSubcommandName());
 			if (handler != null) {
-				return handler.handle(event);
+				return handler.handleSlashCommandInteraction(event);
 			} else {
 				return Responses.warning(event, "Unknown Subcommand", "The subcommand you entered could not be found.");
 			}