diff --git a/pswi/05_test.sh b/pswi/05_test.sh
index 4cf3682ad0..d43321a32d 100644
--- a/pswi/05_test.sh
+++ b/pswi/05_test.sh
@@ -73,8 +73,8 @@ echo " Running the deployment test for z/OSMF version 2.3"
 pip install requests
 python scripts/deploy_test_2_3.py
 
-echo "Mounting ${TEST_ZFS}"
-sh scripts/tmp_mounts.sh "${TEST_ZFS}" "${TEST_MOUNT}"
+echo "Mounting ${TEST_HLQ}.ZFS"
+sh scripts/tmp_mounts.sh "${TEST_HLQ}.ZFS" "${TEST_MOUNT}"
 if [ $? -gt 0 ];then exit -1;fi 
 
 echo "Registering/testing the configuration workflow ${TEST_HLQ}.WORKFLOW(ZWECONF)"
diff --git a/pswi/scripts/tmp_mounts.sh b/pswi/scripts/tmp_mounts.sh
index c2e5f89370..23fa144cdb 100644
--- a/pswi/scripts/tmp_mounts.sh
+++ b/pswi/scripts/tmp_mounts.sh
@@ -44,7 +44,7 @@ fi
 if [ "$MOUNTED" = false ]
 then
   # Check if data set exists
-  echo "Checking if temporary zFS ${TMP_ZFS} exists."
+  echo "Checking if temporary zFS ${ZFS} exists."
   RESP=`curl -s "${BASE_URL}/zosmf/restfiles/ds?dslevel=${ZFS}" -k -X "GET" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS`
   sh scripts/check_response.sh "${RESP}" $?
   if [ $? -gt 0 ];then exit -1;fi
@@ -61,7 +61,7 @@ then
     #TODO: also check the first dsname because it can be something that just has tmp_zfs as HLQ
     echo
   fi
-  # Mount zFS to TMP_MOUNT
+  # Mount zFS to MOUNT
   echo "Mounting zFS ${ZFS} to ${MOUNT} mount point with JCL because REST API doesn't allow AGGRGROW parm."
 
 echo ${JOBST1} > JCL