diff --git a/script/build_package.sh b/script/build_package.sh
index 3cd116f..2e45da0 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -1388,7 +1388,7 @@
 fi
 
 if [ "$rmm_config" ] && assert_can_git_clone "rmm_root"; then
-	# If the Trusted Firmware TF repository has already been checked out,
+	# If the RMM repository has already been checked out,
 	# use that location. Otherwise, clone one ourselves.
 	echo "Cloning TF-RMM..."
 	clone_url="${RMM_CHECKOUT_LOC:-$rmm_src_repo_url}" where="$rmm_root" \
diff --git a/script/clone_repos.sh b/script/clone_repos.sh
index 0aab33d..bf6cb3d 100755
--- a/script/clone_repos.sh
+++ b/script/clone_repos.sh
@@ -479,7 +479,7 @@
 		loc="TF_M_EXTRAS_PATH" clone_and_sync
 fi
 
-RMM_EXTRAS_REFSPEC="${rmm_refspec:-$RMM_REFSPEC}"
+RMM_REFSPEC="${rmm_refspec:-$RMM_REFSPEC}"
 if not_upon "$no_rmm"; then
 	url="$rmm_src_repo_url" name="tf-rmm" ref="RMM_REFSPEC" \
 		loc="RMM_PATH" clone_and_sync
diff --git a/script/translate_refspec.py b/script/translate_refspec.py
index 7c81c90..6de3c89 100755
--- a/script/translate_refspec.py
+++ b/script/translate_refspec.py
@@ -30,6 +30,7 @@
 	"cc_plugin": gerrit.GerritProject("tests/lava/test-definitions.git", gerrit_arm),
         "scp": gerrit.GerritProject("scp/firmware", gerrit_arm),
         "spm": gerrit.GerritProject("trusted-firmware/spm", gerrit_arm),
+        "tf-rmm": gerrit.GerritProject("trusted-firmware/tf-rmm", gerrit_arm),
         "tf-m-tests": gerrit.GerritProject("iot-sw/tf-m/internal/tf-m-tests", gerrit_arm),
         "tf-m-extras": gerrit.GerritProject("iot-sw/tf-m/internal/tf-m-extras", gerrit_arm),
     },
@@ -40,6 +41,7 @@
         "trusted-firmware-tf": gerrit.GerritProject("TF-A/tf-a-tests", gerrit_tforg),
         "trusted-firmware-ci": gerrit.GerritProject("ci/tf-a-ci-scripts", gerrit_tforg),
         "spm": gerrit.GerritProject("hafnium/hafnium", gerrit_tforg),
+        "tf-rmm": gerrit.GerritProject("TF-RMM/tf-rmm", gerrit_tforg),
         "tf-m-tests": gerrit.GerritProject("TF-M/tf-m-tests", gerrit_tforg),
         "tf-m-extras": gerrit.GerritProject("TF-M/tf-m-extras", gerrit_tforg),
     },