diff --git a/config/vendor-functions/show-vendor-menu.sh b/config/vendor-functions/show-vendor-menu.sh
index 6f3df1be..c79083bb 100755
--- a/config/vendor-functions/show-vendor-menu.sh
+++ b/config/vendor-functions/show-vendor-menu.sh
@@ -108,9 +108,6 @@ while true; do
   echo "${#CHOICES[@]}. Recreate Machine Cert"
   CHOICES+=('recreate-machine-cert')
 
-  echo "${#CHOICES[@]}. Reset System Authentication Code"
-  CHOICES+=('reset-totp')
-
   echo "${#CHOICES[@]}. Setup Boot Entry"
   CHOICES+=('setup-boot-entry')
 
@@ -242,18 +239,13 @@ while true; do
       prompt-to-restart
     ;;
     
-    reset-totp)
-      "${VX_FUNCTIONS_ROOT}/reset-totp.sh"
-      read -s -n 1
-    ;;
-    
     lockdown)
       sudo "${VX_FUNCTIONS_ROOT}/lockdown.sh"
       read -s -n 1
     ;;
 
-    hash-signature)
-      sudo "${VX_FUNCTIONS_ROOT}/hash-signature.sh"
+    show-system-hash)
+      sudo "${VX_FUNCTIONS_ROOT}/show-system-hash.sh"
     ;;
     
     setup-boot-entry)
diff --git a/setup-machine.sh b/setup-machine.sh
index c0d3d0be..f4a13f5e 100755
--- a/setup-machine.sh
+++ b/setup-machine.sh
@@ -28,13 +28,9 @@ CHOICES+=('central-scan')
 MODEL_NAMES+=('VxCentralScan')
 
 echo "${#CHOICES[@]}. VxMark"
-CHOICES+=('mark')
+CHOICES+=('mark-scan') # TODO: Transition this to "mark" once we've decided what to do about VxMark(Old)
 MODEL_NAMES+=('VxMark')
 
-echo "${#CHOICES[@]}. VxMarkScan"
-CHOICES+=('mark-scan')
-MODEL_NAMES+=('VxMarkScan')
-
 echo "${#CHOICES[@]}. VxScan"
 CHOICES+=('scan')
 MODEL_NAMES+=('VxScan')