diff --git a/vars/createKubernetesCluster.groovy b/vars/createKubernetesCluster.groovy
index a95d084..f31cd1e 100644
--- a/vars/createKubernetesCluster.groovy
+++ b/vars/createKubernetesCluster.groovy
@@ -166,7 +166,7 @@
       make -C "$WORKSPACE/voltha-system-tests" KAIL_PATH="$WORKSPACE/bin" kail
 """)
 
-    enter('leave')
+    leave('main')
     return
 }
 
diff --git a/vars/installVoltctl.groovy b/vars/installVoltctl.groovy
index fc983b4..5a0a55b 100644
--- a/vars/installVoltctl.groovy
+++ b/vars/installVoltctl.groovy
@@ -184,7 +184,7 @@
     voltctl version --clientonly
 """)
 
-    enter('process')
+    leave('process')
     return(ans)
 }
 
diff --git a/vars/pgrep_port_forward.groovy b/vars/pgrep_port_forward.groovy
index 78ce5a7..de1bcb1 100644
--- a/vars/pgrep_port_forward.groovy
+++ b/vars/pgrep_port_forward.groovy
@@ -103,7 +103,7 @@
         throw err
     }
     finally {
-        enter('main')
+        leave('main')
     }
 
     return(ans)
diff --git a/vars/showCommands.groovy b/vars/showCommands.groovy
index 9e83ab9..bee4936 100644
--- a/vars/showCommands.groovy
+++ b/vars/showCommands.groovy
@@ -31,7 +31,7 @@
         "Running command: $command",
     ]
 
-    println("** ${iam}: Running ${command} LEAVE")
+    println("** ${iam}: Running ${command} ENTER")
     try {
         // Run command for output
         buffer = sh(