diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common
index ec0ad390a..b770a5551 100755
--- a/salt/common/tools/sbin/so-common
+++ b/salt/common/tools/sbin/so-common
@@ -153,16 +153,16 @@ Do you agree to the terms of the Elastic License?
 If so, type AGREE to accept the Elastic License and continue.  Otherwise, press Enter to exit this program without making any changes.
 EOM
 
-AGREED=$(whiptail --title "Security Onion Setup" --inputbox \
-"$message" 20 75 3>&1 1>&2 2>&3)
+	AGREED=$(whiptail --title "$whiptail_title" --inputbox \
+	"$message" 20 75 3>&1 1>&2 2>&3)
 
-if [ "${AGREED^^}" = 'AGREE' ]; then
-  mkdir -p /opt/so/state
-  touch /opt/so/state/yeselastic.txt 
-else
-  echo "Starting in 2.3.40 you must accept the Elastic license if you want to run Security Onion."
-  exit 1
-fi
+	if [ "${AGREED^^}" = 'AGREE' ]; then
+		mkdir -p /opt/so/state
+		touch /opt/so/state/yeselastic.txt 
+	else
+		echo "Starting in 2.3.40 you must accept the Elastic license if you want to run Security Onion."
+		exit 1
+	fi
 
 }
 
diff --git a/salt/common/tools/sbin/so-zeek-logs b/salt/common/tools/sbin/so-zeek-logs
index 551213580..788312df5 100755
--- a/salt/common/tools/sbin/so-zeek-logs
+++ b/salt/common/tools/sbin/so-zeek-logs
@@ -10,7 +10,7 @@ zeek_logs_enabled() {
 }
 
 whiptail_manager_adv_service_zeeklogs() {
-  BLOGS=$(whiptail --title "Security Onion Setup" --checklist "Please Select Logs to Send:" 24 78 12 \
+  BLOGS=$(whiptail --title "so-zeek-logs" --checklist "Please Select Logs to Send:" 24 78 12 \
   "conn" "Connection Logging" ON \
   "dce_rpc" "RPC Logs" ON \
   "dhcp" "DHCP Logs" ON \
@@ -61,10 +61,10 @@ whiptail_manager_adv_service_zeeklogs
 return_code=$?
 case $return_code in
   1)
-    whiptail --title "Security Onion Setup" --msgbox "Cancelling. No changes have been made." 8 75
+    whiptail --title "so-zeek-logs" --msgbox "Cancelling. No changes have been made." 8 75
     ;;
   255)
-    whiptail --title "Security Onion Setup" --msgbox "Whiptail error occured, exiting." 8 75
+    whiptail --title "so-zeek-logs" --msgbox "Whiptail error occured, exiting." 8 75
     ;;
   *)
     zeek_logs_enabled
diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index d1261fe30..198761428 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -25,6 +25,7 @@ BATCHSIZE=5
 SOUP_LOG=/root/soup.log
 INFLUXDB_MIGRATION_LOG=/opt/so/log/influxdb/soup_migration.log
 WHATWOULDYOUSAYYAHDOHERE=soup
+whiptail_title='Security Onion UPdater'
 
 check_err() {
   local exit_code=$1
diff --git a/setup/so-functions b/setup/so-functions
index 5ce3d6dee..19e0c804f 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -896,7 +896,10 @@ compare_main_nic_ip() {
 
 			This is not a supported configuration, please remediate and rerun setup.
 			EOM
-		  [[ -n $TESTING ]] || whiptail --title "Security Onion Setup" --msgbox "$message" 10 75
+
+			[[ "$WHATWOULDYOUSAYYAHDOHERE" == "setup" ]] || local whiptail_title="so-monitor-add"
+
+		  [[ -n $TESTING ]] || whiptail --title "$whiptail_title" --msgbox "$message" 10 75
 		  kill -SIGINT "$(ps --pid $$ -oppid=)"; exit 1
 	  fi
 	else
diff --git a/setup/so-setup b/setup/so-setup
index 4c364ded6..8760a39de 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -108,11 +108,10 @@ catch() {
 
 automated=no
 progress() {
-	local title='Security Onion Setup'
 	local msg=${1:-'Please wait while installing...'}
 
 	if [ $automated == no ]; then
-		whiptail --title "$title" --gauge "$msg" 6 70 0 # append to text
+		whiptail --title "$whiptail_title" --gauge "$msg" 6 70 0 # append to text
 	else
 		cat >> $setup_log 2>&1
 	fi		
diff --git a/setup/so-variables b/setup/so-variables
index 676cba4f0..a69ef9e1b 100644
--- a/setup/so-variables
+++ b/setup/so-variables
@@ -75,3 +75,6 @@ export net_init_file
 
 ntp_string="0.pool.ntp.org,1.pool.ntp.org"
 export ntp_string
+
+whiptail_title="Security Onion Setup - $SOVERSION"
+export whiptail_title
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 09792459d..458713591 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -22,7 +22,7 @@ whiptail_airgap() {
 	local node_str='node'
 	[[ $is_manager || $is_import ]] && node_str='manager'
 
-	INTERWEBS=$(whiptail --title "Security Onion Setup - $SOVERSION" --menu \
+	INTERWEBS=$(whiptail --title "$whiptail_title" --menu \
 	"How should this $node_str be installed?" 10 60 2 \
 	"Standard    " "This $node_str has internet accesss"  \
 	"Airgap      " "This $node_str does not have internet access" 3>&1 1>&2 2>&3 )
@@ -42,7 +42,7 @@ whiptail_avoid_default_hostname() {
 	You can choose to use this default hostname anyway, or change it to a new hostname.
 	EOM
 
-	whiptail --title "Security Onion Setup - $SOVERSION" \
+	whiptail --title "$whiptail_title" \
 		--yesno "$message" 11 75 \
 		--yes-button "Use Anyway" --no-button "Change" --defaultno
 }
@@ -51,7 +51,7 @@ whiptail_basic_suri() {
 
 	[ -n "$TESTING" ] && return
 
-	BASICSURI=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	BASICSURI=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter the number of Suricata processes:" 10 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -63,7 +63,7 @@ whiptail_basic_zeek() {
 
 	[ -n "$TESTING" ] && return
 
-	BASICZEEK=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	BASICZEEK=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter the number of Zeek processes:" 10 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -75,7 +75,7 @@ whiptail_bond_nics_mtu() {
 	[ -n "$TESTING" ] && return
 
 	# Set the MTU on the monitor interface
-	MTU=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	MTU=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter the MTU for the monitor NICs:" 10 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -84,7 +84,7 @@ whiptail_bond_nics_mtu() {
 
 whiptail_cancel() {
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "Cancelling Setup." 8 75
+	whiptail --title "$whiptail_title" --msgbox "Cancelling Setup." 8 75
 	if [ -d "/root/installtmp" ]; then
 		{
 			echo "/root/installtmp exists";
@@ -104,7 +104,7 @@ whiptail_check_exitstatus() {
 			whiptail_cancel
 			;;
 		255)
-			whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "Whiptail error occured, exiting. Check log for details." 8 75
+			whiptail --title "$whiptail_title" --msgbox "Whiptail error occured, exiting. Check log for details." 8 75
 			exit
 			;;
 	esac
@@ -114,7 +114,7 @@ whiptail_components_adv_warning() {
 
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "Please keep in mind the more services that you enable the more RAM that is required." 8 75
+	whiptail --title "$whiptail_title" --msgbox "Please keep in mind the more services that you enable the more RAM that is required." 8 75
 }
 
 whiptail_create_admin_user() {
@@ -187,7 +187,7 @@ whiptail_create_soremote_user() {
 
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "Set a password for the soremote user. This account is used for adding sensors remotely." 8 75
+	whiptail --title "$whiptail_title" --msgbox "Set a password for the soremote user. This account is used for adding sensors remotely." 8 75
 
 }
 
@@ -258,11 +258,11 @@ whiptail_requirements_error() {
 	[ -n "$TESTING" ] && return
 
 	if [[ $(echo "$requirement_needed" | tr '[:upper:]' '[:lower:]') == 'nics' ]]; then
-		whiptail --title "Security Onion Setup - $SOVERSION" \
+		whiptail --title "$whiptail_title" \
 			--msgbox "This machine currently has $current_val $requirement_needed, but needs $needed_val to meet minimum requirements. Select OK to exit setup and reconfigure the machine."  10 75
 		
 		# Same as whiptail_cancel, but changed the wording to exit instead of cancel.
-		whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "Exiting Setup. No changes have been made." 8 75
+		whiptail --title "$whiptail_title" --msgbox "Exiting Setup. No changes have been made." 8 75
 		if [ -d "/root/installtmp" ]; then
 			{
 				echo "/root/installtmp exists";
@@ -272,7 +272,7 @@ whiptail_requirements_error() {
 		fi
 		exit
 	else
-		whiptail --title "Security Onion Setup - $SOVERSION" \
+		whiptail --title "$whiptail_title" \
 			--yesno "This machine currently has $current_val $requirement_needed, but needs $needed_val to meet minimum requirements. Select YES to continue anyway, or select NO to cancel."  10 75
 
 		local exitstatus=$?
@@ -298,7 +298,7 @@ whiptail_storage_requirements() {
 	EOM
 
 	whiptail \
-		--title "Security Onion Setup - $SOVERSION" \
+		--title "$whiptail_title" \
 		--yesno "$message" \
 		14 75
 
@@ -310,7 +310,7 @@ whiptail_cur_close_days() {
 
 	[ -n "$TESTING" ] && return
 
-	CURCLOSEDAYS=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	CURCLOSEDAYS=$(whiptail --title "$whiptail_title" --inputbox \
 	"Please specify the threshold (in days) at which Elasticsearch indices will be closed:" 10 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -322,7 +322,7 @@ whiptail_dhcp_or_static() {
 
 	[ -n "$TESTING" ] && return
 
-	address_type=$(whiptail --title "Security Onion Setup - $SOVERSION" --radiolist \
+	address_type=$(whiptail --title "$whiptail_title" --radiolist \
 	"Choose how to set up your management interface:" 20 78 4 \
 	"STATIC" "Set a static IPv4 address" ON  \
 	"DHCP" "Use DHCP to configure the Management Interface" OFF 3>&1 1>&2 2>&3 )
@@ -355,7 +355,7 @@ whiptail_dhcp_warn() {
 	EOM
 
 	whiptail \
-	--title "Security Onion Setup - $SOVERSION" \
+	--title "$whiptail_title" \
 	--"$window_type" "$dhcp_message" \
 	14 75
 
@@ -366,7 +366,7 @@ whiptail_dhcp_warn() {
 				whiptail_dhcp_or_static
 				;;
 			255)
-				whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "Whiptail error occured, exiting. Check log for details." 8 75
+				whiptail --title "$whiptail_title" --msgbox "Whiptail error occured, exiting. Check log for details." 8 75
 				exit
 				;;
 		esac
@@ -380,7 +380,7 @@ whiptail_dockernet_check(){
 
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --yesno \
+	whiptail --title "$whiptail_title" --yesno \
 	"Do you want to keep the default Docker IP range?\n\nIf you are unsure, please accept the default option of Yes." 10 75
 
 }
@@ -389,7 +389,7 @@ whiptail_dockernet_net() {
 
 	[ -n "$TESTING" ] && return
 
-	DOCKERNET=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	DOCKERNET=$(whiptail --title "$whiptail_title" --inputbox \
 	"\nEnter a /24 size network range for docker to use WITHOUT the /24 suffix. This range will be used on ALL nodes." 11 65 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -409,7 +409,7 @@ whiptail_enable_components() {
 	STRELKA=0
 
 if [[ $is_eval ]]; then
-	COMPONENTS=$(whiptail --title "Security Onion Setup - $SOVERSION" --checklist \
+	COMPONENTS=$(whiptail --title "$whiptail_title" --checklist \
 	"Select Components to install:" 20 75 8 \
 	GRAFANA "Enable Grafana for system monitoring" ON \
 	OSQUERY "Enable Fleet with osquery" ON \
@@ -418,7 +418,7 @@ if [[ $is_eval ]]; then
 	PLAYBOOK "Enable Playbook" ON \
 	STRELKA "Enable Strelka" ON 3>&1 1>&2 2>&3)
 else
-	COMPONENTS=$(whiptail --title "Security Onion Setup - $SOVERSION" --checklist \
+	COMPONENTS=$(whiptail --title "$whiptail_title" --checklist \
 	"Select Components to install:" 20 75 7 \
 	OSQUERY "Enable Fleet with osquery" ON \
 	WAZUH "Enable Wazuh" ON \
@@ -658,7 +658,7 @@ whiptail_eval_adv() {
 
 	[ -n "$TESTING" ] && return
 
-	EVALADVANCED=$(whiptail --title "Security Onion Setup - $SOVERSION" --radiolist \
+	EVALADVANCED=$(whiptail --title "$whiptail_title" --radiolist \
 	"Choose your eval install:" 20 75 4 \
 	"BASIC" "Install basic components for evaluation" ON  \
 	"ADVANCED" "Choose additional components to be installed" OFF 3>&1 1>&2 2>&3 )
@@ -685,7 +685,7 @@ whiptail_gauge_post_setup() {
 	else
 		local msg=$1
 
-		whiptail --title "Security Onion Setup - $SOVERSION" --gauge "$msg" 6 60 96
+		whiptail --title "$whiptail_title" --gauge "$msg" 6 60 96
 	fi
 }
 
@@ -693,7 +693,7 @@ whiptail_helix_apikey() {
 
 	[ -n "$TESTING" ] && return
 
-	HELIXAPIKEY=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	HELIXAPIKEY=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter your Helix API Key: \n \nThis can be set later using so-helix-apikey" 10 75 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -707,7 +707,7 @@ whiptail_homenet_manager() {
 
 	[ -n "$TESTING" ] && return
 
-	HNMANAGER=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	HNMANAGER=$(whiptail --title "$whiptail_title" --inputbox \
 		"Enter your home network(s), separating CIDR blocks with a comma (,):" 10 75 "$1" 3>&1 1>&2 2>&3)
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
@@ -719,13 +719,13 @@ whiptail_homenet_sensor_inherit() {
 	[ -n "$TESTING" ] && return
 
 	# Ask to inherit from manager
-	whiptail --title "Security Onion Setup - $SOVERSION" --yesno "Do you want to inherit the HOME_NET from the Manager?" 8 75
+	whiptail --title "$whiptail_title" --yesno "Do you want to inherit the HOME_NET from the Manager?" 8 75
 }
 
 whiptail_homenet_sensor() {
 	[ -n "$TESTING" ] && return
 
-	HNSENSOR=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	HNSENSOR=$(whiptail --title "$whiptail_title" --inputbox \
 		"Enter your home network(s), separating CIDR blocks with a comma (,):" 10 75 "$1" 3>&1 1>&2 2>&3)
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
@@ -738,7 +738,7 @@ whiptail_install_type() {
 	[ -n "$TESTING" ] && return
 
 	# What kind of install are we doing?
-	install_type=$(whiptail --title "Security Onion Setup - $SOVERSION" --radiolist \
+	install_type=$(whiptail --title "$whiptail_title" --radiolist \
 	"Choose install type:" 12 65 5 \
 		"EVAL" "Evaluation mode (not for production) " ON \
 		"STANDALONE" "Standalone production install " OFF \
@@ -764,7 +764,7 @@ whiptail_install_type_dist() {
 
 	[ -n "$TESTING" ] && return
 	
-	install_type=$(whiptail --title "Security Onion Setup - $SOVERSION" --radiolist \
+	install_type=$(whiptail --title "$whiptail_title" --radiolist \
 	"Choose distributed node type:" 13 60 6 \
 		"MANAGER" "Start a new grid " ON \
 		"SENSOR" "Create a forward only sensor " OFF \
@@ -792,14 +792,14 @@ whiptail_install_type_other() {
 	# so-analyst-install will only work with a working network connection
 	# so only show it on network installs for now
 	if [[ $setup_type == 'network' ]]; then
-		install_type=$(whiptail --title "Security Onion Setup - $SOVERSION" --radiolist \
+		install_type=$(whiptail --title "$whiptail_title" --radiolist \
 		"Choose distributed node type:" 9 65 2 \
 			"ANALYST" "Quit setup and run so-analyst-install " ON \
 			"HELIXSENSOR" "Create a Helix sensor " OFF \
 			3>&1 1>&2 2>&3
 		)
 	else
-		install_type=$(whiptail --title "Security Onion Setup - $SOVERSION" --radiolist \
+		install_type=$(whiptail --title "$whiptail_title" --radiolist \
 		"Choose distributed node type:" 8 65 1 \
 			"HELIXSENSOR" "Create a Helix sensor " ON \
 			3>&1 1>&2 2>&3
@@ -815,7 +815,7 @@ whiptail_install_type_other() {
 whiptail_invalid_input() { # TODO: This should accept a list of arguments to specify what general pattern the input should follow
 	[ -n "$TESTING" ] && return
 	
-	whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "  Invalid input, please try again." 7 40
+	whiptail --title "$whiptail_title" --msgbox "  Invalid input, please try again." 7 40
 
 }
 
@@ -829,13 +829,13 @@ whiptail_invalid_proxy() {
 	Error was: ${proxy_test_err}
 	EOM
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --yesno "$message" --yes-button "Enter Again" --no-button "Skip" 11 60
+	whiptail --title "$whiptail_title" --yesno "$message" --yes-button "Enter Again" --no-button "Skip" 11 60
 }
 
 whiptail_invalid_string() {
 	[ -n "$TESTING" ] && return
 	
-	whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "Invalid input, please try again.\n\nThe $1 cannot contain spaces." 9 45
+	whiptail --title "$whiptail_title" --msgbox "Invalid input, please try again.\n\nThe $1 cannot contain spaces." 9 45
 
 }
 
@@ -843,21 +843,21 @@ whiptail_invalid_pass_characters_warning() {
 
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "Password is invalid. Please exclude single quotes, double quotes and backslashes from the password." 8 75
+	whiptail --title "$whiptail_title" --msgbox "Password is invalid. Please exclude single quotes, double quotes and backslashes from the password." 8 75
 }
 
 whiptail_invalid_pass_warning() {
 
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "Please choose a more secure password." 8 75
+	whiptail --title "$whiptail_title" --msgbox "Please choose a more secure password." 8 75
 }
 
 whiptail_invalid_user_warning() {
 
 	[ -n "$TESTING" ] && return
 	
-	whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "Please enter a valid email address." 8 75
+	whiptail --title "$whiptail_title" --msgbox "Please enter a valid email address." 8 75
 }
 
 whiptail_invalid_hostname() {
@@ -868,7 +868,7 @@ whiptail_invalid_hostname() {
 		the ASCII letters 'A-Z' and 'a-z' (case-sensitive), the digits '0' through '9', \
 		and hyphen ('-')" | tr -d '\t')
 
-	whiptail --title "Security Onion Setup - $SOVERSION" \
+	whiptail --title "$whiptail_title" \
 	--msgbox "$error_message" 10 75
 }
 
@@ -891,7 +891,7 @@ whiptail_log_size_limit() {
 	By default, this is set to ${percentage}% of the disk space allotted for /nsm.
 	EOM
 	
-	log_size_limit=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox "$message" 11 75 "$1" 3>&1 1>&2 2>&3)
+	log_size_limit=$(whiptail --title "$whiptail_title" --inputbox "$message" 11 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
@@ -901,7 +901,7 @@ whiptail_log_size_limit() {
 whiptail_first_menu_iso() {
 	[ -n "$TESTING" ] && return
 
-	option=$(whiptail --title "Security Onion Setup - $SOVERSION" --menu "Select an option" 10 75 2 \
+	option=$(whiptail --title "$whiptail_title" --menu "Select an option" 10 75 2 \
 		"Install              " "Run the standard Security Onion installation " \
 		"Configure Network    " "Configure networking only " \
 		 3>&1 1>&2 2>&3
@@ -915,7 +915,7 @@ whiptail_make_changes() {
 
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --yesno "We are going to set this machine up as a $install_type. Please press YES to make changes or NO to cancel." 8 75
+	whiptail --title "$whiptail_title" --yesno "We are going to set this machine up as a $install_type. Please press YES to make changes or NO to cancel." 8 75
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
@@ -926,7 +926,7 @@ whiptail_management_interface_dns() {
 
 	[ -n "$TESTING" ] && return
 
-	MDNS=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	MDNS=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter your DNS servers separated by commas:" 10 60 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -938,7 +938,7 @@ whiptail_management_interface_dns_search() {
 
 	[ -n "$TESTING" ] && return
 
-	MSEARCH=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	MSEARCH=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter your DNS search domain:" 10 60 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -949,7 +949,7 @@ whiptail_management_interface_gateway() {
 
 	[ -n "$TESTING" ] && return
 
-	MGATEWAY=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	MGATEWAY=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter your gateway's IPv4 address:" 10 60 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -959,7 +959,7 @@ whiptail_management_interface_gateway() {
 whiptail_management_interface_ip_mask() {
 	[ -n "$TESTING" ] && return
 
-	manager_ip_mask=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	manager_ip_mask=$(whiptail --title "$whiptail_title" --inputbox \
 		"Enter your IPv4 address with CIDR mask (e.g. 192.168.1.2/24):" 10 60 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -970,7 +970,7 @@ whiptail_management_interface_ip() {
 
 	[ -n "$TESTING" ] && return
 
-	MIP=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	MIP=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter your IP address:" 10 60 X.X.X.X 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -981,7 +981,7 @@ whiptail_management_interface_mask() {
 
 	[ -n "$TESTING" ] && return
 
-	MMASK=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	MMASK=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter the bit mask for your subnet:" 10 60 24 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -1060,7 +1060,7 @@ whiptail_net_method() {
 
 	local option_count=$(( ${#options[@]} / 2 ))
 
-	network_traffic=$(whiptail --title "Security Onion Setup - $SOVERSION" --menu "$msg" $height 75 $option_count "${options[@]}" 3>&1 1>&2 2>&3)
+	network_traffic=$(whiptail --title "$whiptail_title" --menu "$msg" $height 75 $option_count "${options[@]}" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
@@ -1071,7 +1071,7 @@ whiptail_net_method() {
 whiptail_net_setup_complete() {
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" \
+	whiptail --title "$whiptail_title" \
 		--msgbox "Successfully set up networking, setup will now exit." 7 75
 	exit 0
 }
@@ -1085,7 +1085,7 @@ whiptail_network_init_notice() {
 		Select OK to continue.
 	EOM
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "$message" 9 75
+	whiptail --title "$whiptail_title" --msgbox "$message" 9 75
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
 }
@@ -1094,7 +1094,7 @@ whiptail_management_server() {
 
 	[ -n "$TESTING" ] && return
 
-	MSRV=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	MSRV=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter your Manager Server hostname: \nIt is CASE SENSITIVE!" 10 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -1105,7 +1105,7 @@ whiptail_management_server() {
 whiptail_manager_ip() {
 	[ -n "$TESTING" ] && return
 
-	MSRVIP=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	MSRVIP=$(whiptail --title "$whiptail_title" --inputbox \
 		"Enter your Manager Server IP Address:" 10 60 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -1117,7 +1117,7 @@ whiptail_manager_adv() {
 
 	[ -n "$TESTING" ] && return
 
-	MANAGERADV=$(whiptail --title "Security Onion Setup - $SOVERSION" --radiolist \
+	MANAGERADV=$(whiptail --title "$whiptail_title" --radiolist \
 	"Choose which type of manager to install:" 20 75 4 \
 	"BASIC" "Install manager with recommended settings" ON  \
 	"ADVANCED" "Do additional configuration to the manager" OFF 3>&1 1>&2 2>&3 )
@@ -1132,7 +1132,7 @@ whiptail_manager_adv_escluster(){
 
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --yesno \
+	whiptail --title "$whiptail_title" --yesno \
 	"Do you want to set up a traditional ES cluster for using replicas and/or Hot-Warm indices? Recommended only for those who have experience with ES clustering! " 12 75
 
 }
@@ -1142,7 +1142,7 @@ whiptail_manager_adv_escluster_name(){
 
 	[ -n "$TESTING" ] && return
 
-	ESCLUSTERNAME=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	ESCLUSTERNAME=$(whiptail --title "$whiptail_title" --inputbox \
 		"Enter a name for your ES cluster!" 10 75 "$1" 3>&1 1>&2 2>&3)
 }
 
@@ -1151,7 +1151,7 @@ whiptail_manager_adv_service_zeeklogs() {
 
 	[ -n "$TESTING" ] && return
 
-	BLOGS=$(whiptail --title "Security Onion Setup - $SOVERSION" --checklist "Please select logs to send:" 24 75 12 \
+	BLOGS=$(whiptail --title "$whiptail_title" --checklist "Please select logs to send:" 24 75 12 \
 	"conn" "Connection Logging" ON \
 	"dce_rpc" "RPC Logs" ON \
 	"dhcp" "DHCP Logs" ON \
@@ -1213,13 +1213,13 @@ whiptail_manager_error() {
 	Would you like to continue anyway?
 	EOM
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --yesno "$msg" 13 75 || whiptail_check_exitstatus 1
+	whiptail --title "$whiptail_title" --yesno "$msg" 13 75 || whiptail_check_exitstatus 1
 }
 
 whiptail_manager_updates_warning() {
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION"\
+	whiptail --title "$whiptail_title"\
 	--msgbox "Updating through the manager node requires the manager to have internet access, press ENTER to continue."\
 	8 75
 
@@ -1230,7 +1230,7 @@ whiptail_manager_updates_warning() {
 whiptail_manager_unreachable() {
 	[ -n "$TESTING" ] && return
 	
-	whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "Setup cannot determine if $1 is listening on port 22. Please check the address entered and try again." 7 75
+	whiptail --title "$whiptail_title" --msgbox "Setup cannot determine if $1 is listening on port 22. Please check the address entered and try again." 7 75
 }
 
 whiptail_metadata_tool() {
@@ -1248,7 +1248,7 @@ whiptail_metadata_tool() {
 	EOM
 
 	# Legacy variable naming
-	ZEEKVERSION=$(whiptail --title "Security Onion Setup - $SOVERSION" --menu "$message" 20 75 2 \
+	ZEEKVERSION=$(whiptail --title "$whiptail_title" --menu "$message" 20 75 2 \
 	"Zeek      " "Use Zeek (Bro) for metadata and Suricata for NIDS alerts" \
 	"Suricata  " "Use Suricata for both metadata and NIDS alerts" 3>&1 1>&2 2>&3)
 
@@ -1262,7 +1262,7 @@ whiptail_nids() {
 
 	[ -n "$TESTING" ] && return
 
-	NIDS=$(whiptail --title "Security Onion Setup - $SOVERSION" --radiolist \
+	NIDS=$(whiptail --title "$whiptail_title" --radiolist \
 	"Choose which IDS to run: \n\n(Snort 3.0 support will be added once it is out of beta.)" 25 75 4 \
 	"Suricata" "Suricata" ON  \
 	"Snort" "Placeholder for Snort 3.0  " OFF 3>&1 1>&2 2>&3 )
@@ -1276,7 +1276,7 @@ whiptail_network_notice() {
 
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --yesno "Since this is a network install we assume the management interface, DNS, Hostname, etc are already set up. Select YES to continue." 8 75
+	whiptail --title "$whiptail_title" --yesno "Since this is a network install we assume the management interface, DNS, Hostname, etc are already set up. Select YES to continue." 8 75
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
@@ -1286,14 +1286,14 @@ whiptail_network_notice() {
 whiptail_net_reinit() {
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --yesno "The management interface has already been configured. Do you want to reconfigure it?" 8 75
+	whiptail --title "$whiptail_title" --yesno "The management interface has already been configured. Do you want to reconfigure it?" 8 75
 }
 
 whiptail_node_advanced() {
 
 	[ -n "$TESTING" ] && return
 
-	NODESETUP=$(whiptail --title "Security Onion Setup - $SOVERSION" --radiolist \
+	NODESETUP=$(whiptail --title "$whiptail_title" --radiolist \
 	"What type of config would you like to use?:" 20 75 4 \
 	"NODEBASIC" "Install Search Node with recommended settings" ON \
 	"NODEADVANCED" "Advanced Node Setup" OFF 3>&1 1>&2 2>&3 )
@@ -1306,7 +1306,7 @@ whiptail_node_advanced() {
 whiptail_node_description() {
 	[ -n "$TESTING" ] && return
 
-	NODE_DESCRIPTION=$(whiptail --title "Security Onion Setup - $SOVERSION" \
+	NODE_DESCRIPTION=$(whiptail --title "$whiptail_title" \
 		--inputbox "Enter a short description for the node or press ENTER to leave blank:" 10 75 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -1317,7 +1317,7 @@ whiptail_node_es_heap() {
 
 	[ -n "$TESTING" ] && return
 
-	NODE_ES_HEAP_SIZE=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	NODE_ES_HEAP_SIZE=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter ES heap size:" 10 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -1329,7 +1329,7 @@ whiptail_node_ls_heap() {
 
 	[ -n "$TESTING" ] && return
 
-	NODE_LS_HEAP_SIZE=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	NODE_LS_HEAP_SIZE=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter Logstash heap size:" 10 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -1341,7 +1341,7 @@ whiptail_node_ls_input_threads() {
 
 	[ -n "$TESTING" ] && return
 
-	LSINPUTTHREADS=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	LSINPUTTHREADS=$(whiptail --title "$whiptail_title" --inputbox \
 		"Enter number of Logstash input threads:" 10 75 "$1" 3>&1 1>&2 2>&3)
 
 		local exitstatus=$?
@@ -1354,7 +1354,7 @@ whiptail_node_ls_pipline_batchsize() {
 
 	[ -n "$TESTING" ] && return
 
-	LSPIPELINEBATCH=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	LSPIPELINEBATCH=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter Logstash pipeline batch size:" 10 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -1366,7 +1366,7 @@ whiptail_node_ls_pipeline_worker() {
 
 	[ -n "$TESTING" ] && return
 
-	LSPIPELINEWORKERS=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	LSPIPELINEWORKERS=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter number of Logstash pipeline workers:" 10 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -1377,13 +1377,13 @@ whiptail_node_ls_pipeline_worker() {
 whiptail_ntp_ask() {
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --yesno "Would you like to configure ntp servers?" 7 44
+	whiptail --title "$whiptail_title" --yesno "Would you like to configure ntp servers?" 7 44
 }
 
 whiptail_ntp_servers() {
 	[ -n "$TESTING" ] && return
 
-	ntp_string=$(whiptail --title "Security Onion Setup - $SOVERSION" \
+	ntp_string=$(whiptail --title "$whiptail_title" \
 		--inputbox "Input the NTP server(s) you would like to use, separated by commas:" 8 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -1394,7 +1394,7 @@ whiptail_oinkcode() {
 
 	[ -n "$TESTING" ] && return
 
-	OINKCODE=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	OINKCODE=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter your ET Pro or oinkcode:" 10 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -1407,7 +1407,7 @@ whiptail_oinkcode() {
 
 whiptail_passwords_dont_match() {
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "Passwords don't match. Please re-enter." 8 75
+	whiptail --title "$whiptail_title" --msgbox "Passwords don't match. Please re-enter." 8 75
 
 }
 
@@ -1415,7 +1415,7 @@ whiptail_patch_name_new_schedule() {
 
 	[ -n "$TESTING" ] && return
 
-	PATCHSCHEDULENAME=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	PATCHSCHEDULENAME=$(whiptail --title "$whiptail_title" --inputbox \
 	"What name do you want to give this OS patch schedule? This schedule needs to be named uniquely. Available schedules can be found on the manager under /opt/so/salt/patch/os/schedules/<schedulename>.yml" 10 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -1426,7 +1426,7 @@ whiptail_patch_schedule() {
 
 	[ -n "$TESTING" ] && return
 
-	patch_schedule=$(whiptail --title "Security Onion Setup - $SOVERSION" --radiolist \
+	patch_schedule=$(whiptail --title "$whiptail_title" --radiolist \
 		"Choose OS patch schedule.\n\nThis schedule will update the operating system packages but will NOT update Security Onion related tools such as Zeek, Elasticsearch, Kibana, SaltStack, etc." 20 75 5 \
 		"Automatic" "Updates installed every 8 hours if available" ON \
 		"Manual" "Updates will be installed manually" OFF \
@@ -1442,7 +1442,7 @@ whiptail_patch_schedule_import() {
 	[ -n "$TESTING" ] && return
 
 	unset PATCHSCHEDULENAME
-	PATCHSCHEDULENAME=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	PATCHSCHEDULENAME=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter the name of the OS patch schedule you want to inherit. \nAvailable schedules can be found on the manager under /opt/so/salt/patch/os/schedules/<schedulename>.yml" 10 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -1454,7 +1454,7 @@ whiptail_patch_schedule_select_days() {
 	[ -n "$TESTING" ] && return
 
 	 # Select the days to patch
-	PATCHSCHEDULEDAYS=$(whiptail --title "Security Onion Setup - $SOVERSION" --checklist \
+	PATCHSCHEDULEDAYS=$(whiptail --title "$whiptail_title" --checklist \
 	"Which days do you want to apply OS patches?" 15 75 8 \
 	Monday "" OFF \
 	Tuesday "" ON \
@@ -1478,7 +1478,7 @@ whiptail_patch_schedule_select_hours() {
 	[ -n "$TESTING" ] && return
 
     # Select the hours to patch
-    PATCHSCHEDULEHOURS=$(whiptail --title "Security Onion Setup - $SOVERSION" --checklist \
+    PATCHSCHEDULEHOURS=$(whiptail --title "$whiptail_title" --checklist \
     "At which time, UTC, do you want to apply OS patches on the selected days?" 22 75 13 \
     00:00 "" OFF \
     01:00 "" OFF \
@@ -1519,7 +1519,7 @@ whiptail_proxy_ask() {
 
 	local pkg_mngr
 	if [[ $OS = 'centos' ]]; then pkg_mngr="yum"; else pkg_mngr='apt'; fi
-	whiptail --title "Security Onion Setup - $SOVERSION" --yesno "Do you want to proxy the traffic for git, docker client, wget, curl, ${pkg_mngr}, and various other SO components through a separate server in your environment?" 9 65 --defaultno
+	whiptail --title "$whiptail_title" --yesno "Do you want to proxy the traffic for git, docker client, wget, curl, ${pkg_mngr}, and various other SO components through a separate server in your environment?" 9 65 --defaultno
 }
 
 whiptail_proxy_addr() {
@@ -1532,7 +1532,7 @@ whiptail_proxy_addr() {
 	If your proxy requires a username and password do not include them in your input. Setup will ask for those values next.
 	EOM
 
-	proxy_addr=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox "$message" 13 60 "$1" 3>&1 1>&2 2>&3)
+	proxy_addr=$(whiptail --title "$whiptail_title" --inputbox "$message" 13 60 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
@@ -1541,13 +1541,13 @@ whiptail_proxy_addr() {
 whiptail_proxy_auth_ask() {
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --yesno "Does your proxy require authentication?" 7 60
+	whiptail --title "$whiptail_title" --yesno "Does your proxy require authentication?" 7 60
 }
 
 whiptail_proxy_auth_user() {
 	[ -n "$TESTING" ] && return
 	
-	proxy_user=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox "Please input the proxy user:" 8 60 "$1" 3>&1 1>&2 2>&3)
+	proxy_user=$(whiptail --title "$whiptail_title" --inputbox "Please input the proxy user:" 8 60 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
@@ -1558,7 +1558,7 @@ whiptail_proxy_auth_pass() {
 
 	[ -n "$TESTING" ] && return
 
-	proxy_pass=$(whiptail --title "Security Onion Setup - $SOVERSION" --passwordbox "Please input the proxy password:" 8 60 3>&1 1>&2 2>&3)
+	proxy_pass=$(whiptail --title "$whiptail_title" --passwordbox "Please input the proxy password:" 8 60 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
@@ -1572,7 +1572,7 @@ whiptail_requirements_error() {
 
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" \
+	whiptail --title "$whiptail_title" \
 	--yesno "This machine currently has $current_val $requirement_needed, but needs $needed_val to meet minimum requirements. Press YES to continue anyway, or press NO to cancel."  10 75
 
 	local exitstatus=$?
@@ -1584,7 +1584,7 @@ whiptail_rule_setup() {
 	[ -n "$TESTING" ] && return
 
 	# Get pulled pork info
-	RULESETUP=$(whiptail --title "Security Onion Setup - $SOVERSION" --radiolist \
+	RULESETUP=$(whiptail --title "$whiptail_title" --radiolist \
 	"Which IDS ruleset would you like to use?\n\nThis manager server is responsible for downloading the IDS ruleset from the Internet.\n\nSensors then pull a copy of this ruleset from the manager server.\n\nIf you select a commercial ruleset, it is your responsibility to purchase enough licenses for all of your sensors in compliance with your vendor's policies." 20 75 4 \
 	"ETOPEN" "Emerging Threats Open" ON \
 	"ETPRO" "Emerging Threats PRO" OFF \
@@ -1600,7 +1600,7 @@ whiptail_sensor_config() {
 
 	[ -n "$TESTING" ] && return
 
-	NSMSETUP=$(whiptail --title "Security Onion Setup - $SOVERSION" --radiolist \
+	NSMSETUP=$(whiptail --title "$whiptail_title" --radiolist \
 	"What type of configuration would you like to use?" 20 75 4 \
 	"BASIC" "Install NSM components with recommended settings" ON \
 	"ADVANCED" "Configure each component individually" OFF 3>&1 1>&2 2>&3 )
@@ -1642,7 +1642,7 @@ whiptail_sensor_nics() {
 	for bond_nic in "${BNICS[@]}"; do
 		if [[ "${nmcli_dev_status_list}" =~ $bond_nic\:unmanaged ]]; then
 			whiptail \
-				--title "Security Onion Setup - $SOVERSION" \
+				--title "$whiptail_title" \
 				--msgbox "$bond_nic is unmanaged by Network Manager. Please remove it from other network management tools then re-run setup." \
 				8 75
 			exit
@@ -1654,7 +1654,7 @@ whiptail_set_hostname() {
 
 	[ -n "$TESTING" ] && return
 
-	HOSTNAME=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	HOSTNAME=$(whiptail --title "$whiptail_title" --inputbox \
 		"Enter the hostname (not FQDN) you would like to set:" 10 75 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -1665,7 +1665,7 @@ whiptail_set_redirect() {
 
 	[ -n "$TESTING" ] && return
 
-	REDIRECTINFO=$(whiptail --title "Security Onion Setup - $SOVERSION" --radiolist \
+	REDIRECTINFO=$(whiptail --title "$whiptail_title" --radiolist \
 	"How would you like to access the web interface?\n\nSecurity Onion uses strict cookie enforcement, so whatever you choose here will be the only way that you can access the web interface.\n\nIf you choose something other than IP address, then you'll need to ensure that you can resolve the name via DNS or hosts entry. If you are unsure, please select IP." 20 75 4 \
 	"IP" "Use IP address to access the web interface" ON  \
 	"HOSTNAME" "Use hostname to access the web interface" OFF \
@@ -1678,7 +1678,7 @@ whiptail_set_redirect_host() {
 
 	[ -n "$TESTING" ] && return
 
-	REDIRECTHOST=$(whiptail --title "Security Onion Setup - $SOVERSION" --inputbox \
+	REDIRECTHOST=$(whiptail --title "$whiptail_title" --inputbox \
 	"Enter the Hostname, IP, or FQDN you would like to use for the web interface:" 10 75 "$1" 3>&1 1>&2 2>&3)
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
@@ -1706,7 +1706,7 @@ whiptail_setup_complete() {
 		Press ENTER to reboot.
 	EOM
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "$message" 12 75
+	whiptail --title "$whiptail_title" --msgbox "$message" 12 75
 }
 
 whiptail_setup_failed() {
@@ -1726,13 +1726,13 @@ whiptail_setup_failed() {
 			Press Ok to exit.
 		EOM
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "$message" $height 75
+	whiptail --title "$whiptail_title" --msgbox "$message" $height 75
 }
 
 whiptail_so_allow_yesno() {
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" \
+	whiptail --title "$whiptail_title" \
 		--yesno "Do you want to run so-allow to allow access to the web tools?" \
 		8 75
 }
@@ -1741,7 +1741,7 @@ whiptail_so_allow() {
 
 	[ -n "$TESTING" ] && return
 	
-	ALLOW_CIDR=$(whiptail --title "Security Onion Setup - $SOVERSION" \
+	ALLOW_CIDR=$(whiptail --title "$whiptail_title" \
 		--inputbox "Enter a single IP address or an IP range, in CIDR notation, to allow:" \
 		10 75 "$1" 3>&1 1>&2 2>&3)
 	local exitstatus=$?
@@ -1761,7 +1761,7 @@ whiptail_ssh_key_copy_notice() {
 		Select OK to continue.
 	EOM
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --msgbox "$message" 11 75
+	whiptail --title "$whiptail_title" --msgbox "$message" 11 75
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
 }
@@ -1800,7 +1800,7 @@ whiptail_storage_requirements() {
 	EOM
 
 	whiptail \
-		--title "Security Onion Setup - $SOVERSION" \
+		--title "$whiptail_title" \
 		--yesno "$message" \
 		14 75
 
@@ -1812,7 +1812,7 @@ whiptail_strelka_rules() {
 
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup - $SOVERSION" --yesno "Do you want to enable the default YARA rules for Strelka?" 8 75
+	whiptail --title "$whiptail_title" --yesno "Do you want to enable the default YARA rules for Strelka?" 8 75
 
 	local exitstatus=$?
 
@@ -1852,7 +1852,7 @@ whiptail_node_updates() {
 
 	[ -n "$TESTING" ] && return
 
-	NODEUPDATES=$(whiptail --title "Security Onion Setup - $SOVERSION" --radiolist \
+	NODEUPDATES=$(whiptail --title "$whiptail_title" --radiolist \
 	"How would you like to download OS package updates for your grid?" 20 75 4 \
 	"MANAGER" "Manager node is proxy for updates." ON \
 	"OPEN" "Each node connects to the Internet for updates" OFF 3>&1 1>&2 2>&3 )
@@ -1877,7 +1877,7 @@ whiptail_you_sure() {
 	EOM
 
 	whiptail \
-		--title "Security Onion Setup - $SOVERSION" \
+		--title "$whiptail_title" \
 		--yesno "$you_sure_text" \
 		20 75