diff --git a/src/main/java/fr/xephi/authme/settings/commandconfig/CommandSettingsHolder.java b/src/main/java/fr/xephi/authme/settings/commandconfig/CommandSettingsHolder.java
index 008d4b996..11557c096 100644
--- a/src/main/java/fr/xephi/authme/settings/commandconfig/CommandSettingsHolder.java
+++ b/src/main/java/fr/xephi/authme/settings/commandconfig/CommandSettingsHolder.java
@@ -29,19 +29,19 @@ public final class CommandSettingsHolder implements SettingsHolder {
             "onRegister:",
             "  welcome:",
             "    command: 'msg %p Welcome to the server!'",
-            "    as: CONSOLE",
+            "    executor: CONSOLE",
             "",
             "This will make the console execute the msg command to the player.",
             "Each command under an event has a name you can choose freely (e.g. 'welcome' as above),",
             "after which a mandatory 'command' field defines the command to run,",
-            "and 'as' defines who will run the command (either PLAYER or CONSOLE). Longer example:",
+            "and 'executor' defines who will run the command (either PLAYER or CONSOLE). Longer example:",
             "onLogin:",
             "  welcome:",
             "    command: 'msg %p Welcome back!'",
-            "    as: PLAYER",
+            "    executor: PLAYER",
             "  broadcast:",
             "    command: 'broadcast %p has joined, welcome back!'",
-            "    as: CONSOLE",
+            "    executor: CONSOLE",
             "",
             "Supported command events: onLogin, onJoin, onRegister"
         };
diff --git a/src/main/resources/commands.yml b/src/main/resources/commands.yml
index c3741a293..f23a68a5d 100644
--- a/src/main/resources/commands.yml
+++ b/src/main/resources/commands.yml
@@ -5,19 +5,19 @@
 # onRegister:
 #   welcome:
 #     command: 'msg %p Welcome to the server!'
-#     as: CONSOLE
+#     executor: CONSOLE
 #
 # This will make the console execute the msg command to the player.
 # Each command under an event has a name you can choose freely (e.g. 'welcome' as above),
 # after which a mandatory 'command' field defines the command to run,
-# and 'as' defines who will run the command (either PLAYER or CONSOLE). Longer example:
+# and 'executor' defines who will run the command (either PLAYER or CONSOLE). Longer example:
 # onLogin:
 #   welcome:
 #     command: 'msg %p Welcome back!'
-#     as: PLAYER
+#     executor: PLAYER
 #   broadcast:
 #     command: 'broadcast %p has joined, welcome back!'
-#     as: CONSOLE
+#     executor: CONSOLE
 #
 # Supported command events: onLogin, onJoin, onRegister
 onLogin: