diff --git a/shutdown-test.sh b/shutdown-test.sh
index 3cc13a77..9f53b8a2 100644
--- a/shutdown-test.sh
+++ b/shutdown-test.sh
@@ -125,7 +125,7 @@ SHUTDOWN_SERVER2(){
 				fi
 				MSG="Enabling maintenance mode on: ${PW_ESXI_HOST_NAMES[${ESXIHOST}]}"
 				c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done
-				echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
+				echo -en "${idsCL[White]}${MSG//${PW_ESXI_HOST_NAMES[${ESXIHOST}]}/${idsCL[LightCyan]}${PW_ESXI_HOST_NAMES[${ESXIHOST}]}}${idsCL[White]}${MSG_SPC}: "
 				if [ "${TEST}" != "true" ]; then
 					${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_VCENTER_HOST_NAMES[${ESXIHOST}]} >/dev/null 2>&1 &
 					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
@@ -141,7 +141,7 @@ SHUTDOWN_SERVER2(){
 			for ESXIHOST in "${ESXI_HOSTS[@]}"; do
 				MSG="Enabling maintenance mode & starting iSCSI migrations on: ${PW_ESXI_HOST_NAMES[${ESXIHOST}]}"
 				c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done
-				echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
+				echo -en "${idsCL[White]}${MSG//${PW_ESXI_HOST_NAMES[${ESXIHOST}]}/${idsCL[LightCyan]}${PW_ESXI_HOST_NAMES[${ESXIHOST}]}}${idsCL[White]}${MSG_SPC}: "
 				if [ "${TEST}" != "true" ]; then
 					${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_VCENTER_HOST_NAMES[${ESXIHOST}]} >/dev/null 2>&1 &
 					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
@@ -166,7 +166,7 @@ SHUTDOWN_SERVER2(){
 		for ESXIHOST in "${ESXI_HOSTS[@]}"; do
 			MSG="Shutting down remaining VM's on: ${PW_ESXI_HOST_NAMES[${ESXIHOST}]}"
 			c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done
-			echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
+			echo -en "${idsCL[White]}${MSG//${PW_ESXI_HOST_NAMES[${ESXIHOST}]}/${idsCL[LightCyan]}${PW_ESXI_HOST_NAMES[${ESXIHOST}]}}${idsCL[White]}${MSG_SPC}: "
 			if [ "${TEST}" != "true" ]; then
 				${PW_FOLDER}/esxi-scripts/vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 &
 				echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}"
@@ -180,7 +180,7 @@ SHUTDOWN_SERVER2(){
 			for ESXIHOST in "${ESXI_HOSTS[@]}"; do
 				MSG="Waiting for iSCSI VM's to be: ${PW_ESXI_HOST_NAMES[${ESXIHOST}]}"
 				c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done
-				echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
+				echo -en "${idsCL[White]}${MSG//${PW_ESXI_HOST_NAMES[${ESXIHOST}]}/${idsCL[LightCyan]}${PW_ESXI_HOST_NAMES[${ESXIHOST}]}}${idsCL[White]}${MSG_SPC}: "
 				if [ "${TEST}" != "true" ]; then
 					if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "MAIN" ]; then
 						${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 10.10.2.10 >/dev/null 2>&1 &
@@ -218,7 +218,7 @@ SHUTDOWN_SERVER2(){
 			for ESXIHOST in "${ESXI_HOSTS[@]}"; do
 				MSG="Waiting for VM's, will then shutdown: ${PW_ESXI_HOST_NAMES[${ESXIHOST}]}"
 				c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done
-				echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "
+				echo -en "${idsCL[White]}${MSG//${PW_ESXI_HOST_NAMES[${ESXIHOST}]}/${idsCL[LightCyan]}${PW_ESXI_HOST_NAMES[${ESXIHOST}]}}${idsCL[White]}${MSG_SPC}: "
 				if [ "${TEST}" != "true" ]; then
 					MAINT_MODE_VERIFY_SHUTDOWN ${ESXIHOST} &
 					echo -e "${idsCL[Green]}Continuing in background${idsCL[Default]}"