diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java
index bfe167f2bf..b6d00569be 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java
@@ -410,12 +410,12 @@ public void doFinalDebugOutput(String rawText) {
     public void addFormatScriptDefinitions(DefinitionProvider definitionProvider, TagContext context) {
         BukkitTagContext bukkitContext = (BukkitTagContext) context;
         String name = null;
-        if (bukkitContext.player != null) {
-            name = bukkitContext.player.getName();
-        }
-        else if (bukkitContext.npc != null) {
+        if (bukkitContext.npc != null) {
             name = bukkitContext.npc.getName();
         }
+        else if (bukkitContext.player != null) {
+            name = bukkitContext.player.getName();
+        }
         if (name != null) {
             definitionProvider.addDefinition("name", name);
         }