diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
index 71634d87f..eb85ce266 100644
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -162,7 +162,7 @@ debug ()
     read foo
     echo ""
     $EXEC_CMD "$ERL \
-      $NAME ${NODE}debug \
+      $NAME debug-${ERLANG_NODE} \
       -remsh $ERLANG_NODE \
       -hidden \
       $ERLANG_OPTS $ARGS \"$@\""
@@ -217,7 +217,7 @@ ctl ()
 {
     COMMAND=$@
     $EXEC_CMD "$ERL \
-      $NAME ejabberdctl \
+      $NAME ctl-${ERLANG_NODE} \
       -noinput \
       -hidden \
       -pa $EJABBERD_EBIN_PATH \