diff --git a/voltha b/voltha
index 8fd7929..939829a 100755
--- a/voltha
+++ b/voltha
@@ -1059,7 +1059,7 @@
         PF=$1; shift
         TAG=
         if [ "$PF" != "__ALL__" ]; then
-            TAG="$PF-$NAME"
+            TAG="$PF"
         fi
         PARENTS=
         KIDS=
@@ -1144,6 +1144,11 @@
         kill_port_forward "kafka"
     fi
 
+    if is_in "$WITH_BBSIM" "yes"; then
+        sspin "Remove port-forwards: bbsim$CEOL"
+        kill_port_forward bbsim
+    fi
+
     if [ "$WITH_PPROF" == "yes" ]; then
         sspin "Remove port-forwards: *-profiler$CEOL"
         kill_port_forward voltha-rw-core-profiler voltha-voltha-rw-core-profiler
@@ -2516,9 +2521,9 @@
     if [ "$WITH_PORT_FORWARDS" == "yes" ]; then
       for instance in $(seq 0 $((NUM_OF_BBSIM-1))); do
           bspin - "Forward BBSIM DMI port $FORWARD"
-          kill_port_forward "bbsim${instance_num}"
-          _PORT=$((50075 + "${instance_num}"))
-          port_forward "$BBSIM_NS" "bbsim${instance_num}" "50075:$_PORT"
+          kill_port_forward "bbsim"
+          _PORT=$((50075+instance))
+          port_forward "$BBSIM_NS" "bbsim${instance}" "50075:$_PORT"
           espin - "$VERIFIED"
       done
     fi