diff --git a/setup/so-whiptail b/setup/so-whiptail
index 458713591..258a7b0ac 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -121,7 +121,7 @@ whiptail_create_admin_user() {
 
 	[ -n "$TESTING" ] && return
 
-	ADMINUSER=$(whiptail --title "Security Onion Install" --inputbox \
+	ADMINUSER=$(whiptail --title "$whiptail_title" --inputbox \
 	"Please enter a username for a new system admin user: \nThe local onion account will be disabled during this install" 10 60 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -132,7 +132,7 @@ whiptail_create_admin_user_password1() {
 
 	[ -n "$TESTING" ] && return
 
-	ADMINPASS1=$(whiptail --title "Security Onion Install" --passwordbox \
+	ADMINPASS1=$(whiptail --title "$whiptail_title" --passwordbox \
 	"Enter a password for $ADMINUSER:" 10 60 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -143,7 +143,7 @@ whiptail_create_admin_user_password2() {
 
 	[ -n "$TESTING" ] && return
 
-	ADMINPASS2=$(whiptail --title "Security Onion Install" --passwordbox \
+	ADMINPASS2=$(whiptail --title "$whiptail_title" --passwordbox \
 	"Re-enter a password for $ADMINUSER:" 10 60 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -155,7 +155,7 @@ whiptail_create_fleet_node_user() {
 
 	[ -n "$TESTING" ] && return
 
-	FLEETNODEUSER=$(whiptail --title "Security Onion Install" --inputbox \
+	FLEETNODEUSER=$(whiptail --title "$whiptail_title" --inputbox \
 	"Please enter an email for use as the username for the Fleet admin user:" 10 60 "$1" 3>&1 1>&2 2>&3)
 
 }
@@ -164,7 +164,7 @@ whiptail_create_fleet_node_user_password1() {
 
 	[ -n "$TESTING" ] && return
 
-	FLEETNODEPASSWD1=$(whiptail --title "Security Onion Install" --passwordbox \
+	FLEETNODEPASSWD1=$(whiptail --title "$whiptail_title" --passwordbox \
 	"Enter a password for $FLEETNODEUSER:" 10 60 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -175,7 +175,7 @@ whiptail_create_fleet_node_user_password2() {
 
 	[ -n "$TESTING" ] && return
 
-	FLEETNODEPASSWD2=$(whiptail --title "Security Onion Install" --passwordbox \
+	FLEETNODEPASSWD2=$(whiptail --title "$whiptail_title" --passwordbox \
 	"Re-enter a password for $FLEETNODEUSER:" 10 60 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -195,7 +195,7 @@ whiptail_create_soremote_user_password1() {
 
 	[ -n "$TESTING" ] && return
 
-	SOREMOTEPASS1=$(whiptail --title "Security Onion Install" --passwordbox \
+	SOREMOTEPASS1=$(whiptail --title "$whiptail_title" --passwordbox \
 	"Enter a password for user soremote:" 10 75 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -207,7 +207,7 @@ whiptail_create_soremote_user_password2() {
 
 	[ -n "$TESTING" ] && return	
 
-	SOREMOTEPASS2=$(whiptail --title "Security Onion Install" --passwordbox \
+	SOREMOTEPASS2=$(whiptail --title "$whiptail_title" --passwordbox \
 	"Re-enter a password for user soremote:" 10 75 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -219,7 +219,7 @@ whiptail_create_web_user() {
 
 	[ -n "$TESTING" ] && return
 
-	WEBUSER=$(whiptail --title "Security Onion Install" --inputbox \
+	WEBUSER=$(whiptail --title "$whiptail_title" --inputbox \
 	"Please enter an email address to create an administrator account for the web interface.\n\nThis will also be used for TheHive, Cortex, and Fleet." 12 60 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -230,7 +230,7 @@ whiptail_create_web_user_password1() {
 
 	[ -n "$TESTING" ] && return
 
-	WEBPASSWD1=$(whiptail --title "Security Onion Install" --passwordbox \
+	WEBPASSWD1=$(whiptail --title "$whiptail_title" --passwordbox \
 	"Enter a password for $WEBUSER:" 10 60 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -241,7 +241,7 @@ whiptail_create_web_user_password2() {
 
 	[ -n "$TESTING" ] && return
 
-	WEBPASSWD2=$(whiptail --title "Security Onion Install" --passwordbox \
+	WEBPASSWD2=$(whiptail --title "$whiptail_title" --passwordbox \
 	"Re-enter a password for $WEBUSER:" 10 60 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -671,7 +671,7 @@ whiptail_fleet_custom_hostname() {
 
 	[ -n "$TESTING" ] && return
 
-	FLEETCUSTOMHOSTNAME=$(whiptail --title "Security Onion Install" --inputbox \
+	FLEETCUSTOMHOSTNAME=$(whiptail --title "$whiptail_title" --inputbox \
 	"What FQDN should osquery clients use for connections to this Fleet node? Leave blank if the local system hostname will be used." 10 60 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -994,13 +994,13 @@ whiptail_management_nic() {
 
 	filter_unused_nics
 
-	MNIC=$(whiptail --title "NIC Setup" --radiolist "Please select your management NIC:" 20 75 12 "${nic_list[@]}" 3>&1 1>&2 2>&3 )	
+	MNIC=$(whiptail --title "$whiptail_title" --radiolist "Please select your management NIC:" 20 75 12 "${nic_list[@]}" 3>&1 1>&2 2>&3 )	
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
 
 	while [ -z "$MNIC" ]
 	do
-		MNIC=$(whiptail --title "NIC Setup" --radiolist "Please select your management NIC:" 20 75 12 "${nic_list[@]}" 3>&1 1>&2 2>&3 )	
+		MNIC=$(whiptail --title "$whiptail_title" --radiolist "Please select your management NIC:" 20 75 12 "${nic_list[@]}" 3>&1 1>&2 2>&3 )	
 		local exitstatus=$?
 		whiptail_check_exitstatus $exitstatus
 	done
@@ -1624,13 +1624,13 @@ whiptail_sensor_nics() {
 		local list_type="checklist"
 	fi
 
-	BNICS=$(whiptail --title "NIC Setup" --$list_type "$menu_text" 20 75 12 "${nic_list[@]}" 3>&1 1>&2 2>&3)
+	BNICS=$(whiptail --title "$whiptail_title" --$list_type "$menu_text" 20 75 12 "${nic_list[@]}" 3>&1 1>&2 2>&3)
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
 
 	while [ -z "$BNICS" ]
 	do
-		BNICS=$(whiptail --title "NIC Setup" --$list_type "$menu_text" 20 75 12 "${nic_list[@]}" 3>&1 1>&2 2>&3 )
+		BNICS=$(whiptail --title "$whiptail_title" --$list_type "$menu_text" 20 75 12 "${nic_list[@]}" 3>&1 1>&2 2>&3 )
 		local exitstatus=$?
 		whiptail_check_exitstatus $exitstatus
 	done
@@ -1838,7 +1838,7 @@ whiptail_suricata_pins() {
 	  local PROCS=$lb_procs
 	fi
 
-	SURIPINS=$(whiptail --noitem --title "Pin Suricata CPUS" --checklist "Please select $PROCS cores to pin Suricata to:" 20 75 12 "${filtered_core_str[@]}" 3>&1 1>&2 2>&3 )
+	SURIPINS=$(whiptail --noitem --title "$whiptail_title" --checklist "Please select $PROCS cores to pin Suricata to:" 20 75 12 "${filtered_core_str[@]}" 3>&1 1>&2 2>&3 )
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
 
@@ -1902,7 +1902,7 @@ whiptail_zeek_pins() {
 	  local PROCS=$lb_procs
 	fi
 
-	ZEEKPINS=$(whiptail --noitem --title "Pin Zeek CPUS" --checklist "Please select $PROCS cores to pin Zeek to:" 20 75 12 "${cpu_core_list_whiptail[@]}" 3>&1 1>&2 2>&3 )
+	ZEEKPINS=$(whiptail --noitem --title "$whiptail_title" --checklist "Please select $PROCS cores to pin Zeek to:" 20 75 12 "${cpu_core_list_whiptail[@]}" 3>&1 1>&2 2>&3 )
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus