diff --git a/build/components/hyena.TWL/Makefile b/build/components/hyena.TWL/Makefile
index 7b27c365..a9d9d186 100644
--- a/build/components/hyena.TWL/Makefile
+++ b/build/components/hyena.TWL/Makefile
@@ -26,6 +26,8 @@ override TWL_ARCHGEN		=	LIMITED
 TWL_NO_STD_PCHDR			=	True
 TWL_CODEGEN					?=	ARM
 
+FIRM_LIBSUFFIX	=	.firm$(ARCHGEN_TYPE)$(CODEGEN_ARCH)
+
 #----------------------------------------------------------------------------
 
 SUBDIRS			=	$(SYSMENU_ROOT)/build/libraries/aes \
@@ -84,7 +86,8 @@ endif
 MAKELCF_FLAGS	+=	-DADDRESS_LTDWRAM='0x037a0000' \
 					-DADDRESS_FLXMAIN='0x02280200' \
 					-DADDRESS_BOOTCORE='0x0380f000' \
-					-DCRT0_O='$(CRT0_O)'
+					-DCRT0_O='$(CRT0_O)' \
+					-DFIRM_LIBSUFFIX='$(FIRM_LIBSUFFIX)'
 
 MAKELCF_FLAGS	+=	-DISDBG_LIBS_TWL='$(if $(ISDBG_LIBS_TWL),$(ISDBG_LIBS_TWL),libstubsistd_sp$(TWL_LIBSUFFIX).a)'	\
 					-DISDBG_LIBS_NITRO='libstubsisd_sp$(TWL_LIBSUFFIX).a'
@@ -122,9 +125,9 @@ SYSMENU_LIBS	+=	\
 endif
 
 SDK_APPEND_LIBS	=	\
-					libwl_sp.TWL.LTD.a \
-					libaes_sp.firm.LTD.a \
-					libsea_sp.TWL.LTD.a \
+					libwl_sp$(TWL_LIBSUFFIX).a \
+					libaes_sp$(FIRM_LIBSUFFIX).a \
+					libsea_sp$(TWL_LIBSUFFIX).a \
 					libreboot_sp$(TWL_LIBSUFFIX).a
 
 LLIBRARIES		+=	$(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
diff --git a/build/components/hyena.TWL/hyena.lsf b/build/components/hyena.TWL/hyena.lsf
index 6173ceb0..8170a79b 100644
--- a/build/components/hyena.TWL/hyena.lsf
+++ b/build/components/hyena.TWL/hyena.lsf
@@ -145,7 +145,7 @@ Autoload WRAM
 				libsysmenu_sp$(LIBSUFFIX).a \
 				libsysmmcu_sp$(LIBSUFFIX).a \
 				libds_sp$(LIBSUFFIX).a \
-				libaes_sp.firm.LTD.a \
+				libaes_sp$(FIRM_LIBSUFFIX).a \
 				libsea_sp$(LIBSUFFIX).a \
 				libcrypto_sp$(LIBSUFFIX).a
 
diff --git a/build/components/jackal.TWL/Makefile b/build/components/jackal.TWL/Makefile
index 26b72e63..5921c0b7 100644
--- a/build/components/jackal.TWL/Makefile
+++ b/build/components/jackal.TWL/Makefile
@@ -27,6 +27,8 @@ override TWL_PLATFORM		=	TS
 TWL_NO_STD_PCHDR			=	True
 TWL_CODEGEN					?=	ARM
 
+FIRM_LIBSUFFIX	=	.firm$(ARCHGEN_TYPE)$(CODEGEN_ARCH)
+
 #----------------------------------------------------------------------------
 
 SUBDIRS			=	$(SYSMENU_ROOT)/build/libraries/aes \
@@ -65,7 +67,8 @@ MACRO_FLAGS		+=	-DSDK_ARM7COMP_LTD -DSDK_SEA \
 
 MAKELCF_FLAGS	+=	-DADDRESS_FLXMAIN='0x02280200' \
 					-DADDRESS_BOOTCORE='0x0380f000' \
-					-DCRT0_O='$(CRT0_O)'
+					-DCRT0_O='$(CRT0_O)' \
+					-DFIRM_LIBSUFFIX='$(FIRM_LIBSUFFIX)'
 
 MAKELCF_FLAGS	+=	-DISDBG_LIBS_TWL='$(if $(ISDBG_LIBS_TWL),$(ISDBG_LIBS_TWL),libstubsistd_sp$(TWL_LIBSUFFIX).a)'	\
 					-DISDBG_LIBS_NITRO='libstubsisd_sp$(TWL_LIBSUFFIX).a'
@@ -103,9 +106,9 @@ SYSMENU_LIBS	+=	\
 endif
 
 SDK_APPEND_LIBS	=	\
-					libwl_sp.TWL.LTD.a \
-					libaes_sp.firm.LTD.a \
-					libsea_sp.TWL.LTD.a \
+					libwl_sp$(TWL_LIBSUFFIX).a \
+					libaes_sp$(FIRM_LIBSUFFIX).a \
+					libsea_sp$(TWL_LIBSUFFIX).a \
 					libreboot_sp$(TWL_LIBSUFFIX).a
 
 LLIBRARIES		+=	$(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
diff --git a/build/components/jackal.TWL/jackal.lsf b/build/components/jackal.TWL/jackal.lsf
index 242e45f0..1d87ac44 100644
--- a/build/components/jackal.TWL/jackal.lsf
+++ b/build/components/jackal.TWL/jackal.lsf
@@ -93,7 +93,7 @@ Ltdautoload SCRWRAM
 	Library		libsysmenu_sp$(LIBSUFFIX).a
 	Library		libsysmmcu_sp$(LIBSUFFIX).a
 	Library		libds_sp$(LIBSUFFIX).a
-	Library		libaes_sp.firm.LTD.a
+	Library		libaes_sp$(FIRM_LIBSUFFIX).a
 	Library		libdht_sp$(LIBSUFFIX).a
 
 	Object		* (.wram)