diff --git a/tools/test/bin/atomix-kill b/tools/test/bin/atomix-kill
index 8238fd3..f5caa1c 100755
--- a/tools/test/bin/atomix-kill
+++ b/tools/test/bin/atomix-kill
@@ -7,7 +7,7 @@
 . $ONOS_ROOT/tools/build/envDefaults
 
 ssh $ONOS_USER@${1:-$OCI} "
-    pid=\$(ps -ef | grep atomix-agent.jar | grep -v grep | cut -c10-15 | tr -d ' ')
+    pid=\$(ps -ef | grep AtomixAgent | grep -v grep | cut -c10-15 | tr -d ' ')
     if [ -n \"\$pid\" ]; then
         echo \"Killing Atomix process \$pid on \$(hostname)...\"
         kill -9 \$pid
diff --git a/tools/test/bin/atomix-service b/tools/test/bin/atomix-service
index 1da285b..7b60d93 100755
--- a/tools/test/bin/atomix-service
+++ b/tools/test/bin/atomix-service
@@ -50,7 +50,7 @@
         # Execute the remote commands
         for node in $nodes; do
             ssh -tt $ONOS_USER@${node} "
-                pid=\$(ps -ef | grep atomix | grep -v grep | cut -c10-15 | tr -d ' ')
+                pid=\$(ps -ef | grep AtomixAgent | grep -v grep | cut -c10-15 | tr -d ' ')
                 if [ -n \"\$pid\" ]; then
                     echo \"Killing Atomix process \$pid on \$(hostname)...\"
                     kill -9 \$pid
diff --git a/tools/test/bin/atomix-uninstall b/tools/test/bin/atomix-uninstall
index eb42d95..271b86a 100755
--- a/tools/test/bin/atomix-uninstall
+++ b/tools/test/bin/atomix-uninstall
@@ -27,7 +27,7 @@
 remote=$ONOS_USER@${1:-$OCI}
 
 ssh -tt $remote "
-    pid=\$(ps -ef | grep atomix | grep -v grep | cut -c10-15 | tr -d ' ')
+    pid=\$(ps -ef | grep AtomixAgent | grep -v grep | cut -c10-15 | tr -d ' ')
     if [ -n \"\$pid\" ]; then
         echo \"Killing Atomix process \$pid on \$(hostname)...\"
         kill -9 \$pid