diff --git a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java
index 6e25171..ea7d030 100644
--- a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java
+++ b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java
@@ -235,15 +235,13 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab
 
 	private boolean unregisterCommand() {
 		if (commandMap == null || commands == null) return false;
-		Command c = commandMap.getCommand(commands.getName());
-		if (c == null) return false;
-		return c.unregister(commandMap);
+		return commands.unregister(commandMap);
 	}
 
 	private boolean registerCommand() {
 		if (commandMap == null) return false;
 		commands = new JavascriptExpansionCommands(this);
-		commandMap.register(commands.getName(), commands);
+		commandMap.register("papi" + commands.getName(), commands);
 		return commands.isRegistered();
 	}
 }