diff --git a/powerwall.sh b/powerwall.sh
index 7ccd8691..f405827d 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1648,21 +1648,21 @@ HOSTMGMT(){
 		HOST=${1}
 		if [ "${PW_iDRACHOST_SHORTNAMES[${HOST}]}" != "" ]; then
 			tmp=${PW_iDRACHOST_SHORTNAMES[${HOST}]}
-			ESXIHOST=${PW_HOST_ADDRESSES[${tmp}]}
+			ESXI_HOST=${PW_HOST_ADDRESSES[${tmp}]}
 		elif [ "${PW_ESXI_HOST_NAMES[${HOST}]}" != "" ]; then
-			ESXIHOST=${HOST}
+			ESXI_HOST=${HOST}
 		elif [ "${PW_HOST_IDRACS[iDS-vMS-Host${HOST}]}" != "" ]; then
-			ESXIHOST=${PW_HOST_ADDRESSES[iDS-vMS-Host${HOST}]}
+			ESXI_HOST=${PW_HOST_ADDRESSES[iDS-vMS-Host${HOST}]}
 		elif [ "${PW_HOST_ADDRESSES[${HOST}]}" != "" ]; then
-			ESXIHOST=${PW_HOST_ADDRESSES[${HOST}]}
+			ESXI_HOST=${PW_HOST_ADDRESSES[${HOST}]}
 		elif [ "${1^^}" == "ALL" ] || [ "${1^^}" == "MAIN" ] || [ "${1^^}" == "SYS" ] || [ "${1^^}" == "OFFSITE" ]; then
-			ESXIHOST=${1^^}
+			ESXI_HOST=${1^^}
 		else
-			ESXIHOST=''
+			ESXI_HOST=''
 		fi
-		[ "${ESXIHOST}" == "" ] && echo -e "Invalid host\n" && exit 1
-		if [ "${PW_ESXI_HOST_NAMES[${ESXIHOST}]}" != "" ]; then
-			tmp=${PW_ESXI_HOST_NAMES[${ESXIHOST}]}
+		[ "${ESXI_HOST}" == "" ] && echo -e "Invalid host\n" && exit 1
+		if [ "${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}" != "" ]; then
+			tmp=${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}
 			idracip=${PW_HOST_IDRACS[${tmp}]}
 			hostname=${PW_iDRACHOST_SHORTNAMES[${idracip}]}
 		fi
@@ -1687,9 +1687,9 @@ HOSTMGMT(){
 	
 	
 	c=0; spcA=''; spc1=`expr 21 - ${#hostname} - 1`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; c=`expr ${c} + 1`; done
-	c=0; spcB=''; spc1=`expr 18 - ${#ESXIHOST} - 1`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; c=`expr ${c} + 1`; done
+	c=0; spcB=''; spc1=`expr 18 - ${#ESXI_HOST} - 1`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; c=`expr ${c} + 1`; done
 	echo -en "${idsCL[LightCyan]} Host: ${idsCL[Green]}${hostname}${spcA}"
-	echo -en "${idsCL[LightCyan]}Host IP: ${idsCL[Green]}${ESXIHOST}${spcB}"
+	echo -en "${idsCL[LightCyan]}Host IP: ${idsCL[Green]}${ESXI_HOST}${spcB}"
 	echo -e "${idsCL[LightCyan]}iDrac IP: ${idsCL[Green]}${idracip}${idsCL[Default]}"
 	DIVIDER . yellow 75
 	echo
@@ -1697,13 +1697,13 @@ HOSTMGMT(){
 	([ "${HOST}" == "" ] || ([ "${POWER}" == "" ] && [ "${ESXI}" == "" ])) && echo -e "Invalid command arguments\n" && exit 1
 	
 	if [ "${MODE}" == "esxi" ]; then
-		if [ "${ESXIHOST}" == "ALL" ] || [ "${ESXIHOST}" == "MAIN" ] || [ "${ESXIHOST}" == "SYS" ] || [ "${ESXIHOST}" == "OFFSITE" ]; then
+		if [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "SYS" ] || [ "${ESXI_HOST}" == "OFFSITE" ]; then
 			if [ "${ESXI}" == "maint" ] || [ "${ESXI}" == "maintenance" ] || [ "${ESXI}" == "mm" ]; then
-				echo -e "${idsCL[LightGreen]}PUTTING '${ESXIHOST}' HOSTS INTO MAINTENANCE MODE${idsCL[Default]}\n"
-				SHUTDOWN_SERVERS ${ESXIHOST,,} maintenance
+				echo -e "${idsCL[LightGreen]}PUTTING '${ESXI_HOST}' HOSTS INTO MAINTENANCE MODE${idsCL[Default]}\n"
+				SHUTDOWN_SERVERS ${ESXI_HOST,,} maintenance
 			else
 				echo -e "${idsCL[LightGreen]}SHUTTING DOWN '${ESXIHOST}' HOSTS${idsCL[Default]}\n"
-				SHUTDOWN_SERVERS ${ESXIHOST,,}
+				SHUTDOWN_SERVERS ${ESXI_HOST,,}
 			fi
 
 		else