diff --git a/fpga_header.robot b/fpga_header.robot
index 270099a..9582264 100644
--- a/fpga_header.robot
+++ b/fpga_header.robot
@@ -17,5 +17,5 @@
 # prepended to, and otherwise via command line arguments to the robot test
 # framework.
 Variables  variables/common_fpga.py
-Library  FPGALibrary.py  board_id=${FPGA_BOARD_ID}  timeout=${LOG_TIMEOUT}  quiesce_delay_seconds=${FPGA_QUIESCE_DELAY_SECONDS}
+Library  FPGALibrary.py  board_id=${NEXUS_ID}  timeout=${LOG_TIMEOUT}  quiesce_delay_seconds=${FPGA_QUIESCE_DELAY_SECONDS}
 
diff --git a/fpga_test.sh b/fpga_test.sh
index abcfe7a..5892610 100755
--- a/fpga_test.sh
+++ b/fpga_test.sh
@@ -85,8 +85,8 @@
   usage
 fi
 
-FPGA_BOARD_ID="${1}"
-ARGS+=(--variable "FPGA_BOARD_ID:${FPGA_BOARD_ID}")
+NEXUS_ID="${1}"
+ARGS+=(--variable "NEXUS_ID:${NEXUS_ID}")
 shift
 TEST_SUITE="$1"
 shift
diff --git a/variables/common_fpga.py b/variables/common_fpga.py
index aae3173..7e7f974 100644
--- a/variables/common_fpga.py
+++ b/variables/common_fpga.py
@@ -6,11 +6,10 @@
 # This variable is set to be 0 for renode tests, and should be
 # overridden on CLI to test on the FPGA. Ie:
 # sim/tests/fpga_test.sh 02 sim/tests/shodan_boot.robot
-FPGA_BOARD_ID = 0
+NEXUS_ID = 0
 
 # Tunable. Can be overridden, but this is the default number of seconds
 # to wait between quiesce reads. Essentially, if we don't have any data
 # on the UART within this time, we consider the UART to be "quiesced"
 # and can then proceed with doing writes and readbacks.
 FPGA_QUIESCE_DELAY_SECONDS = 1
-
diff --git a/variables/nexus_debug.py b/variables/nexus_debug.py
index f80a8ff..f9eea4b 100644
--- a/variables/nexus_debug.py
+++ b/variables/nexus_debug.py
@@ -5,7 +5,7 @@
 # This variable is set to be 0 for renode tests, and should be
 # overridden on CLI to test on the FPGA. Ie:
 # sim/tests/fpga_test.sh 02 sim/tests/shodan_boot.robot
-FPGA_BOARD_ID = 0
+NEXUS_ID = 0
 
 # Tunable. Can be overridden, but this is the default number of seconds
 # to wait between quiesce reads. Essentially, if we don't have any data