diff --git a/commands/alias.py b/commands/alias.py
index 0b127ed..cd9ef7a 100644
--- a/commands/alias.py
+++ b/commands/alias.py
@@ -1,7 +1,7 @@
 import main
 from yaml import dump
 
-class Alias:
+class AliasCommand:
     def __init__(self, *args):
         self.alias(*args)
 
diff --git a/commands/chans.py b/commands/chans.py
index 3f00f43..f92482b 100644
--- a/commands/chans.py
+++ b/commands/chans.py
@@ -1,7 +1,7 @@
 import main
 import modules.userinfo as userinfo
 
-class Chans:
+class ChansCommand:
     def __init__(self, *args):
         self.chans(*args)
 
diff --git a/commands/cmd.py b/commands/cmd.py
index 5908bda..6c75ec5 100644
--- a/commands/cmd.py
+++ b/commands/cmd.py
@@ -1,7 +1,7 @@
 import main
 from core.bot import deliverRelayCommands
 
-class Cmd:
+class CmdCommand:
     def __init__(self, *args):
         self.cmd(*args)
 
diff --git a/commands/del.py b/commands/del.py
index 9d4868a..ef6f9ad 100644
--- a/commands/del.py
+++ b/commands/del.py
@@ -1,6 +1,6 @@
 import main
 
-class Del:
+class DelCommand:
     def __init__(self, *args):
         self.delete(*args)
 
diff --git a/commands/disable.py b/commands/disable.py
index 97c5742..d9182fd 100644
--- a/commands/disable.py
+++ b/commands/disable.py
@@ -1,7 +1,7 @@
 import main
 from core.bot import deliverRelayCommands
 
-class Disable:
+class DisableCommand:
     def __init__(self, *args):
         self.disable(*args)
 
diff --git a/commands/dist.py b/commands/dist.py
index 3c94f5d..d5f6f53 100644
--- a/commands/dist.py
+++ b/commands/dist.py
@@ -1,7 +1,7 @@
 import main
 from subprocess import run, PIPE
 
-class Dist:
+class DistCommand:
     def __init__(self, *args):
         self.dist(*args)
 
diff --git a/commands/enable.py b/commands/enable.py
index d6a29c5..81f1139 100644
--- a/commands/enable.py
+++ b/commands/enable.py
@@ -2,7 +2,7 @@ import main
 from core.helper import startBot
 from core.bot import deliverRelayCommands
 
-class Enable:
+class EnableCommand:
     def __init__(self, *args):
         self.enable(*args)
 
diff --git a/commands/get.py b/commands/get.py
index 51ccd7f..b56f5dc 100644
--- a/commands/get.py
+++ b/commands/get.py
@@ -1,6 +1,6 @@
 import main
 
-class Get:
+class GetCommand:
     def __init__(self, *args):
         self.get(*args)
 
diff --git a/commands/help.py b/commands/help.py
index 6e3e229..bb12aff 100644
--- a/commands/help.py
+++ b/commands/help.py
@@ -1,6 +1,6 @@
 import main
 
-class Help:
+class HelpCommand:
     def __init__(self, *args):
         self.help(*args)
 
diff --git a/commands/join.py b/commands/join.py
index 0b1c223..edf6577 100644
--- a/commands/join.py
+++ b/commands/join.py
@@ -1,6 +1,6 @@
 import main
 
-class Join:
+class JoinCommand:
     def __init__(self, *args):
         self.join(*args)
 
diff --git a/commands/list.py b/commands/list.py
index 3edef6d..55ba053 100644
--- a/commands/list.py
+++ b/commands/list.py
@@ -1,7 +1,7 @@
 import main
 from yaml import dump
 
-class List:
+class ListCommand:
     def __init__(self, *args):
         self.list(*args)
 
diff --git a/commands/load.py b/commands/load.py
index 3f61fcc..aa6b37d 100644
--- a/commands/load.py
+++ b/commands/load.py
@@ -1,6 +1,6 @@
 import main
 
-class Load:
+class LoadCommand:
     def __init__(self, *args):
         self.load(*args)
 
diff --git a/commands/loadmod.py b/commands/loadmod.py
index c5c463f..fb542b9 100644
--- a/commands/loadmod.py
+++ b/commands/loadmod.py
@@ -1,7 +1,7 @@
 import main
 from utils.loaders.single_loader import loadSingle
 
-class Loadmod:
+class LoadmodCommand:
     def __init__(self, *args):
         self.loadmod(*args)
 
diff --git a/commands/logout.py b/commands/logout.py
index 960ac1e..fca76d6 100644
--- a/commands/logout.py
+++ b/commands/logout.py
@@ -1,6 +1,6 @@
 import main
 
-class Logout:
+class LogoutCommand:
     def __init__(self, *args):
         self.logout(*args)
 
diff --git a/commands/mod.py b/commands/mod.py
index d11b33b..7f5a822 100644
--- a/commands/mod.py
+++ b/commands/mod.py
@@ -1,7 +1,7 @@
 import main
 from yaml import dump
 
-class Mod:
+class ModCommand:
     def __init__(self, *args):
         self.mod(*args)
 
diff --git a/commands/mon.py b/commands/mon.py
index c5a1ecc..65e83d1 100644
--- a/commands/mon.py
+++ b/commands/mon.py
@@ -4,7 +4,7 @@ import sys
 from io import StringIO
 from yaml import dump
 
-class Mon:
+class MonCommand:
     def __init__(self, *args):
         self.mon(*args)
 
diff --git a/commands/msg.py b/commands/msg.py
index 3638c28..001cbe8 100644
--- a/commands/msg.py
+++ b/commands/msg.py
@@ -1,6 +1,6 @@
 import main
 
-class Msg:
+class MsgCommand:
     def __init__(self, *args):
         self.msg(*args)
 
diff --git a/commands/network.py b/commands/network.py
index 024042e..9f0d67a 100644
--- a/commands/network.py
+++ b/commands/network.py
@@ -1,7 +1,7 @@
 import main
 from yaml import dump
 
-class Network:
+class NetworkCommand:
     def __init__(self, *args):
         self.network(*args)
 
diff --git a/commands/part.py b/commands/part.py
index 67bf539..a63a20d 100644
--- a/commands/part.py
+++ b/commands/part.py
@@ -1,6 +1,6 @@
 import main
 
-class Part:
+class PartCommand:
     def __init__(self, *args):
         self.part(*args)
 
diff --git a/commands/pass.py b/commands/pass.py
index 20f4d9a..fe3f240 100644
--- a/commands/pass.py
+++ b/commands/pass.py
@@ -1,6 +1,6 @@
 import main
 
-class Pass:
+class PassCommand:
     def __init__(self, *args):
         self.password(*args)
 
diff --git a/commands/provision.py b/commands/provision.py
index 3453171..edc0d07 100644
--- a/commands/provision.py
+++ b/commands/provision.py
@@ -1,7 +1,7 @@
 import main
 from modules import provision
 
-class Provision:
+class ProvisionCommand:
     def __init__(self, *args):
         self.provision(*args)
 
diff --git a/commands/relay.py b/commands/relay.py
index 894c80b..92ba014 100644
--- a/commands/relay.py
+++ b/commands/relay.py
@@ -1,7 +1,7 @@
 import main
 from yaml import dump
 
-class Relay:
+class RelayCommand:
     def __init__(self, *args):
         self.relay(*args)
 
diff --git a/commands/save.py b/commands/save.py
index edd4d1c..d61d1c1 100644
--- a/commands/save.py
+++ b/commands/save.py
@@ -1,6 +1,6 @@
 import main
 
-class Save:
+class SaveCommand:
     def __init__(self, *args):
         self.save(*args)
 
diff --git a/commands/stats.py b/commands/stats.py
index 178666e..3281a19 100644
--- a/commands/stats.py
+++ b/commands/stats.py
@@ -3,7 +3,7 @@ import modules.counters as count
 import modules.userinfo as userinfo
 from string import digits
 
-class Stats:
+class StatsCommand:
     def __init__(self, *args):
         self.stats(*args)
 
diff --git a/commands/token.py b/commands/token.py
index cd00e38..7e20e5b 100644
--- a/commands/token.py
+++ b/commands/token.py
@@ -2,7 +2,7 @@ import main
 from yaml import dump
 from uuid import uuid4
 
-class Token:
+class TokenCommand:
     def __init__(self, *args):
         self.token(*args)
 
diff --git a/commands/users.py b/commands/users.py
index 9836a41..30da28e 100644
--- a/commands/users.py
+++ b/commands/users.py
@@ -1,7 +1,7 @@
 import main
 import modules.userinfo as userinfo
 
-class Users:
+class UsersCommand:
     def __init__(self, *args):
         self.users(*args)
 
diff --git a/commands/who.py b/commands/who.py
index 7ae4909..f19e462 100644
--- a/commands/who.py
+++ b/commands/who.py
@@ -1,7 +1,7 @@
 import main
 import modules.userinfo as userinfo
 
-class Who:
+class WhoCommand:
     def __init__(self, *args):
         self.who(*args)
 
diff --git a/utils/loaders/command_loader.py b/utils/loaders/command_loader.py
index e3ea253..b22cbe1 100644
--- a/utils/loaders/command_loader.py
+++ b/utils/loaders/command_loader.py
@@ -9,7 +9,7 @@ def loadCommands():
     for filename in listdir("commands"):
         if filename.endswith(".py") and filename != "__init__.py":
             commandName = filename[0:-3]
-            className = commandName.capitalize()
+            className = commandName.capitalize()+"Command"
             try:
                 module = __import__('commands.%s' % commandName)
                 if not commandName in CommandMap: