diff --git a/src/main/java/co/aikar/commands/BaseCommand.java b/src/main/java/co/aikar/commands/BaseCommand.java
index 4770837d..7dd6e281 100644
--- a/src/main/java/co/aikar/commands/BaseCommand.java
+++ b/src/main/java/co/aikar/commands/BaseCommand.java
@@ -363,12 +363,12 @@ public class BaseCommand extends Command {
                     cmd = Iterables.getOnlyElement(cmds);
                 } else {
                     Optional<RegisteredCommand> optCmd = cmds.stream().filter(c -> {
-                        int nonSender = c.nonSenderAwareResolvers;
+                        int nonSender = c.requiredResolvers;
                         int partialSender = c.optionalResolvers;
                         return extraArgs <= nonSender + partialSender && (completion || extraArgs >= nonSender);
                     }).sorted((c1, c2) -> {
-                        int a = c1.nonSenderAwareResolvers + c1.optionalResolvers;
-                        int b = c2.nonSenderAwareResolvers + c2.optionalResolvers;
+                        int a = c1.requiredResolvers + c1.optionalResolvers;
+                        int b = c2.requiredResolvers + c2.optionalResolvers;
 
                         if (a == b) {
                             return 0;
@@ -436,7 +436,7 @@ public class BaseCommand extends Command {
     }
 
     private List<String> completeCommand(CommandSender sender, RegisteredCommand cmd, String[] args, String commandLabel) {
-        if (args.length > cmd.nonSenderAwareResolvers + cmd.optionalResolvers) {
+        if (args.length > cmd.requiredResolvers + cmd.optionalResolvers) {
             return ImmutableList.of();
         }
         if (args.length == 0 || cmd.complete == null) {
diff --git a/src/main/java/co/aikar/commands/RegisteredCommand.java b/src/main/java/co/aikar/commands/RegisteredCommand.java
index 9ee96dc7..244a0408 100644
--- a/src/main/java/co/aikar/commands/RegisteredCommand.java
+++ b/src/main/java/co/aikar/commands/RegisteredCommand.java
@@ -60,7 +60,7 @@ public class RegisteredCommand {
 
     private final String permission;
     final String complete;
-    final int nonSenderAwareResolvers;
+    final int requiredResolvers;
     final int optionalResolvers;
     private MCTiming timing;
 
@@ -82,7 +82,7 @@ public class RegisteredCommand {
         final CommandManager manager = scope.manager;
         final CommandContexts commandContexts = manager.getCommandContexts();
 
-        int nonSenderAwareResolvers = 0;
+        int requiredResolvers = 0;
         int optionalResolvers = 0;
         StringBuilder syntaxB = new StringBuilder(64);
 
@@ -99,7 +99,7 @@ public class RegisteredCommand {
                         optionalResolvers++;
                         syntaxB.append('[').append(parameter.getName()).append("] ");
                     } else {
-                        nonSenderAwareResolvers++;
+                        requiredResolvers++;
                         syntaxB.append('<').append(parameter.getName()).append("> ");
                     }
                 }
@@ -114,7 +114,7 @@ public class RegisteredCommand {
         } else {
             this.syntaxText = manager.getCommandReplacements().replace(syntaxB.toString());
         }
-        this.nonSenderAwareResolvers = nonSenderAwareResolvers;
+        this.requiredResolvers = requiredResolvers;
         this.optionalResolvers = optionalResolvers;
     }
 
@@ -164,7 +164,7 @@ public class RegisteredCommand {
         args = Lists.newArrayList(args);
         String[] origArgs = args.toArray(new String[args.size()]);
         Map<String, Object> passedArgs = Maps.newLinkedHashMap();
-        int remainingRequired = nonSenderAwareResolvers;
+        int remainingRequired = requiredResolvers;
         for (int i = 0; i < parameters.length && i < argLimit; i++) {
             boolean isLast = i == parameters.length - 1;
             boolean allowOptional = remainingRequired == 0;