diff --git a/src/main/java/moe/nekojimi/chords/MusicHandler.java b/src/main/java/moe/nekojimi/chords/MusicHandler.java
index 127f6d6..d15d69d 100644
--- a/src/main/java/moe/nekojimi/chords/MusicHandler.java
+++ b/src/main/java/moe/nekojimi/chords/MusicHandler.java
@@ -112,7 +112,7 @@ public class MusicHandler implements AudioSendHandler, Closeable
             return true;
         } catch (UnsupportedAudioFileException | IOException ex)
         {
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+            Logger.getLogger(Chords.class.getName()).log(Level.SEVERE, null, ex);
         } finally
         {
         }
@@ -215,7 +215,7 @@ public class MusicHandler implements AudioSendHandler, Closeable
 //            audioBuffer.add(bytes, 0, read);
 //        } catch (IOException ex)
 //        {
-//            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+//            Logger.getLogger(Chords.class.getName()).log(Level.SEVERE, null, ex);
 //            return false;
 //        } catch (ArrayIndexOutOfBoundsException ex)
 //        {
@@ -223,7 +223,7 @@ public class MusicHandler implements AudioSendHandler, Closeable
 //                arrayErr = true;
 //            else
 //            {
-//                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+//                Logger.getLogger(Chords.class.getName()).log(Level.SEVERE, null, ex);
 //                return false;
 //            }
 //        }
diff --git a/src/main/java/moe/nekojimi/chords/commands/Command.java b/src/main/java/moe/nekojimi/chords/commands/Command.java
index 035a4b7..438110d 100644
--- a/src/main/java/moe/nekojimi/chords/commands/Command.java
+++ b/src/main/java/moe/nekojimi/chords/commands/Command.java
@@ -5,7 +5,7 @@
  */
 package moe.nekojimi.chords.commands;
 
-import moe.nekojimi.chords.Main;
+import moe.nekojimi.chords.Chords;
 
 /**
  *
@@ -14,11 +14,11 @@ import moe.nekojimi.chords.Main;
 public abstract class Command
 {
 
-    protected final Main bot;
+    protected final Chords bot;
     protected final String keyword;
     protected String documentation;
 
-    public Command(Main bot, String keyword)
+    public Command(Chords bot, String keyword)
     {
         this.bot = bot;
         this.keyword = keyword;
diff --git a/src/main/java/moe/nekojimi/chords/commands/HelpCommand.java b/src/main/java/moe/nekojimi/chords/commands/HelpCommand.java
index ae11bcc..9ce2d21 100644
--- a/src/main/java/moe/nekojimi/chords/commands/HelpCommand.java
+++ b/src/main/java/moe/nekojimi/chords/commands/HelpCommand.java
@@ -16,12 +16,12 @@
  */
 package moe.nekojimi.chords.commands;
 
-import moe.nekojimi.chords.Main;
+import moe.nekojimi.chords.Chords;
 
 public class HelpCommand extends Command
 {
 
-    public HelpCommand(Main bot)
+    public HelpCommand(Chords bot)
     {
         super(bot, "help");
     }
diff --git a/src/main/java/moe/nekojimi/chords/commands/JoinCommand.java b/src/main/java/moe/nekojimi/chords/commands/JoinCommand.java
index 8b4e846..380ad58 100644
--- a/src/main/java/moe/nekojimi/chords/commands/JoinCommand.java
+++ b/src/main/java/moe/nekojimi/chords/commands/JoinCommand.java
@@ -6,14 +6,14 @@
 package moe.nekojimi.chords.commands;
 
 import java.util.List;
-import moe.nekojimi.chords.Main;
+import moe.nekojimi.chords.Chords;
 import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 
 public class JoinCommand extends Command
 {
 
-    public JoinCommand(Main bot)
+    public JoinCommand(Chords bot)
     {
         super(bot, "join");
     }
diff --git a/src/main/java/moe/nekojimi/chords/commands/LeaveCommand.java b/src/main/java/moe/nekojimi/chords/commands/LeaveCommand.java
index 7d68cfe..86f0391 100644
--- a/src/main/java/moe/nekojimi/chords/commands/LeaveCommand.java
+++ b/src/main/java/moe/nekojimi/chords/commands/LeaveCommand.java
@@ -6,13 +6,13 @@
 package moe.nekojimi.chords.commands;
 
 import java.util.List;
-import moe.nekojimi.chords.Main;
+import moe.nekojimi.chords.Chords;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 
 public class LeaveCommand extends Command
 {
 
-    public LeaveCommand(Main bot)
+    public LeaveCommand(Chords bot)
     {
         super(bot, "leave");
     }
diff --git a/src/main/java/moe/nekojimi/chords/commands/PlayCommand.java b/src/main/java/moe/nekojimi/chords/commands/PlayCommand.java
index 3aebcf6..f028ffc 100644
--- a/src/main/java/moe/nekojimi/chords/commands/PlayCommand.java
+++ b/src/main/java/moe/nekojimi/chords/commands/PlayCommand.java
@@ -21,7 +21,7 @@ import java.net.URL;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
-import moe.nekojimi.chords.Main;
+import moe.nekojimi.chords.Chords;
 import moe.nekojimi.chords.SongRequest;
 import moe.nekojimi.musicsearcher.Query;
 import moe.nekojimi.musicsearcher.Result;
@@ -37,7 +37,7 @@ public class PlayCommand extends Command
 
 //    private List<Result> lastSearchResults;
 
-    public PlayCommand(Main main)
+    public PlayCommand(Chords main)
     {
         super(main, "play");
     }
diff --git a/src/main/java/moe/nekojimi/chords/commands/QueueCommand.java b/src/main/java/moe/nekojimi/chords/commands/QueueCommand.java
index c61bb6e..d56dd53 100644
--- a/src/main/java/moe/nekojimi/chords/commands/QueueCommand.java
+++ b/src/main/java/moe/nekojimi/chords/commands/QueueCommand.java
@@ -19,13 +19,13 @@ package moe.nekojimi.chords.commands;
 import java.util.List;
 import java.util.Queue;
 import moe.nekojimi.chords.Downloader;
-import moe.nekojimi.chords.Main;
+import moe.nekojimi.chords.Chords;
 import moe.nekojimi.chords.Song;
 
 public class QueueCommand extends Command
 {
 
-    public QueueCommand(Main bot)
+    public QueueCommand(Chords bot)
     {
         super(bot, "queue");
     }
diff --git a/src/main/java/moe/nekojimi/chords/commands/RemoveCommand.java b/src/main/java/moe/nekojimi/chords/commands/RemoveCommand.java
index 8132c8c..7afe6d4 100644
--- a/src/main/java/moe/nekojimi/chords/commands/RemoveCommand.java
+++ b/src/main/java/moe/nekojimi/chords/commands/RemoveCommand.java
@@ -16,12 +16,12 @@
  */
 package moe.nekojimi.chords.commands;
 
-import moe.nekojimi.chords.Main;
+import moe.nekojimi.chords.Chords;
 
 public class RemoveCommand extends Command
 {
 
-    public RemoveCommand(Main bot)
+    public RemoveCommand(Chords bot)
     {
         super(bot, "remove");
     }
diff --git a/src/main/java/moe/nekojimi/chords/commands/RestartCommand.java b/src/main/java/moe/nekojimi/chords/commands/RestartCommand.java
index 7c065ad..e55d685 100644
--- a/src/main/java/moe/nekojimi/chords/commands/RestartCommand.java
+++ b/src/main/java/moe/nekojimi/chords/commands/RestartCommand.java
@@ -16,12 +16,12 @@
  */
 package moe.nekojimi.chords.commands;
 
-import moe.nekojimi.chords.Main;
+import moe.nekojimi.chords.Chords;
 
 public class RestartCommand extends Command
 {
 
-    public RestartCommand(Main bot)
+    public RestartCommand(Chords bot)
     {
         super(bot, "restart");
     }
diff --git a/src/main/java/moe/nekojimi/chords/commands/SkipCommand.java b/src/main/java/moe/nekojimi/chords/commands/SkipCommand.java
index 8a1b2ed..90e69f7 100644
--- a/src/main/java/moe/nekojimi/chords/commands/SkipCommand.java
+++ b/src/main/java/moe/nekojimi/chords/commands/SkipCommand.java
@@ -16,12 +16,12 @@
  */
 package moe.nekojimi.chords.commands;
 
-import moe.nekojimi.chords.Main;
+import moe.nekojimi.chords.Chords;
 
 public class SkipCommand extends Command
 {
 
-    public SkipCommand(Main bot)
+    public SkipCommand(Chords bot)
     {
         super(bot, "skip");
     }