diff --git a/src/api b/src/api
index 9620c7064..c2cddf85e 160000
--- a/src/api
+++ b/src/api
@@ -1 +1 @@
-Subproject commit 9620c7064dd512e16dc3ef5c12a00868fec0610a
+Subproject commit c2cddf85e4862f055a384b25693241cfd33d8cdc
diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java
index 975cbef1e..1c6ae1136 100644
--- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java
+++ b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java
@@ -8,40 +8,40 @@ import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 public class ConditionalAction extends Action implements IConditionalAction {
-    private Supplier<Boolean> predicate;
+    private Supplier<Boolean> condition;
     private Supplier<Boolean> terminateWhen;
     private Consumer<IAction> onTermination;
     private int maxChecks = -1;
     private int checkCount;
     private boolean taskExecuted;
 
-    public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> predicate, Consumer<IAction> task) {
+    public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> condition, Consumer<IAction> task) {
         super(manager, "conditional", task);
-        this.predicate = predicate;
+        this.condition = condition;
     }
 
-    public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> predicate, Consumer<IAction> task) {
+    public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> condition, Consumer<IAction> task) {
         super(manager, name, task);
-        this.predicate = predicate;
+        this.condition = condition;
     }
 
-    public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
-        this(manager, predicate, task);
+    public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
+        this(manager, condition, task);
         this.terminateWhen = terminateWhen;
     }
 
-    public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
-        this(manager, name, predicate, task);
+    public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
+        this(manager, name, condition, task);
         this.terminateWhen = terminateWhen;
     }
 
-    public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
-        this(manager, predicate, task, terminateWhen);
+    public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
+        this(manager, condition, task, terminateWhen);
         this.onTermination = onTermination;
     }
 
-    public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
-        this(manager, name, predicate, task, terminateWhen);
+    public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
+        this(manager, name, condition, task, terminateWhen);
         this.onTermination = onTermination;
     }
 
@@ -58,7 +58,7 @@ public class ConditionalAction extends Action implements IConditionalAction {
                 markDone();
                 return;
             }
-            if (predicate.get()) {
+            if (condition.get()) {
                 task.accept(this);
                 taskExecuted = true;
             }
@@ -73,19 +73,19 @@ public class ConditionalAction extends Action implements IConditionalAction {
     }
 
     @Override
-    public IConditionalAction setPredicate(Supplier<Boolean> predicate) {
-        this.predicate = predicate;
+    public IConditionalAction setCondition(Supplier<Boolean> condition) {
+        this.condition = condition;
         return this;
     }
 
     @Override
-    public IConditionalAction setTerminationPredicate(Supplier<Boolean> terminateWhen) {
+    public IConditionalAction terminateWhen(Supplier<Boolean> terminateWhen) {
         this.terminateWhen = terminateWhen;
         return this;
     }
 
     @Override
-    public IConditionalAction setTerminationTask(Consumer<IAction> onTermination) {
+    public IConditionalAction onTermination(Consumer<IAction> onTermination) {
         this.onTermination = onTermination;
         return this;
     }
@@ -111,32 +111,32 @@ public class ConditionalAction extends Action implements IConditionalAction {
     }
 
     @Override
-    public IConditionalAction after(Supplier<Boolean> predicate, Consumer<IAction> task) {
-        return after(manager.create(predicate, task));
+    public IConditionalAction after(Supplier<Boolean> condition, Consumer<IAction> task) {
+        return after(manager.create(condition, task));
     }
 
     @Override
-    public IConditionalAction after(String name, Supplier<Boolean> predicate, Consumer<IAction> task) {
-        return after(manager.create(name, predicate, task));
+    public IConditionalAction after(String name, Supplier<Boolean> condition, Consumer<IAction> task) {
+        return after(manager.create(name, condition, task));
     }
 
     @Override
-    public IConditionalAction after(Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
-        return after(manager.create(predicate, task, terminateWhen));
+    public IConditionalAction after(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
+        return after(manager.create(condition, task, terminateWhen));
     }
 
     @Override
-    public IConditionalAction after(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
-        return after(manager.create(name, predicate, task, terminateWhen));
+    public IConditionalAction after(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
+        return after(manager.create(name, condition, task, terminateWhen));
     }
 
     @Override
-    public IConditionalAction after(Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
-        return after(manager.create(predicate, task, terminateWhen, onTermination));
+    public IConditionalAction after(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
+        return after(manager.create(condition, task, terminateWhen, onTermination));
     }
 
     @Override
-    public IConditionalAction after(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
-        return after(manager.create(name, predicate, task, terminateWhen, onTermination));
+    public IConditionalAction after(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
+        return after(manager.create(name, condition, task, terminateWhen, onTermination));
     }
 }
diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
index 0fa993783..33ff81283 100644
--- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
+++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
@@ -59,33 +59,33 @@ public class ScriptedActionManager implements IActionManager {
     }
 
     @Override
-    public IConditionalAction create(Supplier<Boolean> predicate, Consumer<IAction> task) {
-        return new ConditionalAction(this, predicate, task);
+    public IConditionalAction create(Supplier<Boolean> condition, Consumer<IAction> task) {
+        return new ConditionalAction(this, condition, task);
     }
 
     @Override
-    public IConditionalAction create(String name, Supplier<Boolean> predicate, Consumer<IAction> task) {
-        return new ConditionalAction(this, name, predicate, task);
+    public IConditionalAction create(String name, Supplier<Boolean> condition, Consumer<IAction> task) {
+        return new ConditionalAction(this, name, condition, task);
     }
 
     @Override
-    public IConditionalAction create(Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
-        return new ConditionalAction(this, predicate, task, terminateWhen);
+    public IConditionalAction create(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
+        return new ConditionalAction(this, condition, task, terminateWhen);
     }
 
     @Override
-    public IConditionalAction create(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
-        return new ConditionalAction(this, name, predicate, task, terminateWhen);
+    public IConditionalAction create(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
+        return new ConditionalAction(this, name, condition, task, terminateWhen);
     }
 
     @Override
-    public IConditionalAction create(Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
-        return new ConditionalAction(this, predicate, task, terminateWhen, onTermination);
+    public IConditionalAction create(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
+        return new ConditionalAction(this, condition, task, terminateWhen, onTermination);
     }
 
     @Override
-    public IConditionalAction create(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
-        return new ConditionalAction(this, name, predicate, task, terminateWhen, onTermination);
+    public IConditionalAction create(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
+        return new ConditionalAction(this, name, condition, task, terminateWhen, onTermination);
     }
 
     @Override
@@ -177,18 +177,18 @@ public class ScriptedActionManager implements IActionManager {
     ///////////////////////////////////////////////////
     // Conditionals
     @Override
-    public IConditionalAction scheduleAction(String name, Supplier<Boolean> predicate, Consumer<IAction> task) {
-        return scheduleAction(new ConditionalAction(this, name, predicate, task));
+    public IConditionalAction scheduleAction(String name, Supplier<Boolean> condition, Consumer<IAction> task) {
+        return scheduleAction(new ConditionalAction(this, name, condition, task));
     }
 
     @Override
-    public IConditionalAction scheduleAction(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
-        return scheduleAction(new ConditionalAction(this, name, predicate, task, terminateWhen));
+    public IConditionalAction scheduleAction(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
+        return scheduleAction(new ConditionalAction(this, name, condition, task, terminateWhen));
     }
 
     @Override
-    public IConditionalAction scheduleAction(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
-        return scheduleAction(new ConditionalAction(this, name, predicate, task, terminateWhen, onTermination));
+    public IConditionalAction scheduleAction(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
+        return scheduleAction(new ConditionalAction(this, name, condition, task, terminateWhen, onTermination));
     }