diff --git a/make_helpers/tbbr/tbbr_tools.mk b/make_helpers/tbbr/tbbr_tools.mk
index 71d9747..8d3f14f 100644
--- a/make_helpers/tbbr/tbbr_tools.mk
+++ b/make_helpers/tbbr/tbbr_tools.mk
@@ -30,7 +30,7 @@
 
 # This file defines the keys and certificates that must be created to establish
 # a Chain of Trust following the TBBR document. These definitions include the
-# command line options passed to the cert_create and fip_create tools.
+# command line options passed to the cert_create and fiptool commands.
 #
 # Expected environment:
 #
@@ -66,11 +66,11 @@
 $(eval $(call CERT_ADD_CMD_OPT,${TFW_NVCTR_VAL},--tfw-nvctr))
 $(eval $(call CERT_ADD_CMD_OPT,${NTFW_NVCTR_VAL},--ntfw-nvctr))
 
-# Add Trusted Key certificate to the fip_create and cert_create command line options
+# Add Trusted Key certificate to the fiptool and cert_create command line options
 $(eval $(call FIP_ADD_PAYLOAD,${TRUSTED_KEY_CERT},--trusted-key-cert))
 $(eval $(call CERT_ADD_CMD_OPT,${TRUSTED_KEY_CERT},--trusted-key-cert))
 
-# Add fwu certificate to the fip_create and cert_create command line options
+# Add fwu certificate to the fiptool and cert_create command line options
 $(eval $(call FWU_FIP_ADD_PAYLOAD,${FWU_CERT},--fwu-cert))
 $(eval $(call FWU_CERT_ADD_CMD_OPT,${FWU_CERT},--fwu-cert))