diff --git a/migration/v01.16.00-aliases.py b/migration/v01.16.00-aliases.py
index e52167be..0164934b 100644
--- a/migration/v01.16.00-aliases.py
+++ b/migration/v01.16.00-aliases.py
@@ -24,7 +24,7 @@ for server_id, value in results:
         print("[%s] Migrating '%s' ('%s')" %
             (servers[server_id], alias, command))
         cursor.execute("INSERT INTO server_settings VALUES (?, ?, ?)",
-            [server_id, "alias-%s" % alias, json.dumps(command)])
+            [server_id, "command-alias-%s" % alias, json.dumps(command)])
 database.commit()
 database.close()
 
diff --git a/modules/aliases.py b/modules/aliases.py
index 1ab38097..ccb4a980 100644
--- a/modules/aliases.py
+++ b/modules/aliases.py
@@ -3,7 +3,7 @@ import re
 from src import EventManager, ModuleManager, utils
 
 REGEX_ARG_NUMBER = re.compile(r"\$(?:(\d+)(-?)|(-))")
-SETTING_PREFIX = "alias-"
+SETTING_PREFIX = "command-alias-"
 
 class Module(ModuleManager.BaseModule):
     def _arg_replace(self, s, args_split):