diff --git a/src/arch/xtensa/CMakeLists.txt b/src/arch/xtensa/CMakeLists.txt
index 2f08553ac8fc..e9dd8cef5eaa 100644
--- a/src/arch/xtensa/CMakeLists.txt
+++ b/src/arch/xtensa/CMakeLists.txt
@@ -35,7 +35,7 @@ if(CONFIG_CAVS)
 	set(family_path intel/cavs)
 endif()
 
-set(fw_name ${CONFIG_FIRMWARE_SHORT_NAME})
+set(fw_name ${CONFIG_RIMAGE_SIGNING_SCHEMA})
 
 if(CONFIG_BOOT_LOADER)
 	set(build_bootloader y)
@@ -462,13 +462,19 @@ else()
 	add_custom_target(run_meu DEPENDS run_rimage)
 endif()
 
+if(NOT DEFINED FIRMWARE_NAME)
+	set(fw_output_name "${fw_name}")
+else()
+	set(fw_output_name "${FIRMWARE_NAME}")
+endif()
+
 if(MEU_NO_SIGN)
 	# copy rimage output that can be used to sign firmware
 	add_custom_target(
 		bin ALL
-		COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name}.ri.uns ${PROJECT_BINARY_DIR}/sof-${fw_name}.ri.uns
-		COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name}.ri.met ${PROJECT_BINARY_DIR}/sof-${fw_name}.ri.met
-		COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name}.ldc ${PROJECT_BINARY_DIR}/sof-${fw_name}.ldc
+		COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name}.ri.uns ${PROJECT_BINARY_DIR}/sof-${fw_output_name}.ri.uns
+		COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name}.ri.met ${PROJECT_BINARY_DIR}/sof-${fw_output_name}.ri.met
+		COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name}.ldc ${PROJECT_BINARY_DIR}/sof-${fw_output_name}.ldc
 		DEPENDS run_meu bin_extras
 		VERBATIM
 		USES_TERMINAL
@@ -476,8 +482,8 @@ if(MEU_NO_SIGN)
 else()
 	add_custom_target(
 		bin ALL
-		COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name}.ri ${PROJECT_BINARY_DIR}/sof-${fw_name}.ri
-		COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name}.ldc ${PROJECT_BINARY_DIR}/sof-${fw_name}.ldc
+		COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name}.ri ${PROJECT_BINARY_DIR}/sof-${fw_output_name}.ri
+		COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name}.ldc ${PROJECT_BINARY_DIR}/sof-${fw_output_name}.ldc
 		DEPENDS run_meu bin_extras
 		VERBATIM
 		USES_TERMINAL
@@ -485,7 +491,7 @@ else()
 endif()
 
 install(
-	FILES ${PROJECT_BINARY_DIR}/sof-${fw_name}.ri
-		${PROJECT_BINARY_DIR}/sof-${fw_name}.ldc
+	FILES ${PROJECT_BINARY_DIR}/sof-${fw_output_name}.ri
+		${PROJECT_BINARY_DIR}/sof-${fw_output_name}.ldc
 	DESTINATION bin
 )
diff --git a/src/arch/xtensa/configs/jasperlake_defconfig b/src/arch/xtensa/configs/jasperlake_defconfig
index 5ca8a5541e86..4b5802afa268 100644
--- a/src/arch/xtensa/configs/jasperlake_defconfig
+++ b/src/arch/xtensa/configs/jasperlake_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ICELAKE=y
-CONFIG_FIRMWARE_SHORT_NAME="jsl"
+CONFIG_RIMAGE_SIGNING_SCHEMA="jsl"
 CONFIG_INTEL_DMIC=y
 CONFIG_INTEL_SSP=y
 CONFIG_INTEL_ALH=y
diff --git a/src/arch/xtensa/configs/kabylake_defconfig b/src/arch/xtensa/configs/kabylake_defconfig
index 02e311443f22..2b1227e0a3bc 100644
--- a/src/arch/xtensa/configs/kabylake_defconfig
+++ b/src/arch/xtensa/configs/kabylake_defconfig
@@ -1,5 +1,5 @@
 CONFIG_APOLLOLAKE=y
-CONFIG_FIRMWARE_SHORT_NAME="kbl"
+CONFIG_RIMAGE_SIGNING_SCHEMA="kbl"
 CONFIG_INTEL_DMIC=y
 CONFIG_INTEL_SSP=y
 CONFIG_CORE_COUNT=2
diff --git a/src/arch/xtensa/configs/skylake_defconfig b/src/arch/xtensa/configs/skylake_defconfig
index f26a7780e2eb..918a2365a3ce 100644
--- a/src/arch/xtensa/configs/skylake_defconfig
+++ b/src/arch/xtensa/configs/skylake_defconfig
@@ -1,5 +1,5 @@
 CONFIG_APOLLOLAKE=y
-CONFIG_FIRMWARE_SHORT_NAME="skl"
+CONFIG_RIMAGE_SIGNING_SCHEMA="skl"
 CONFIG_INTEL_DMIC=y
 CONFIG_INTEL_SSP=y
 CONFIG_CORE_COUNT=2
diff --git a/src/platform/Kconfig b/src/platform/Kconfig
index e5b425f3d86e..9a0ecc5ec4d0 100644
--- a/src/platform/Kconfig
+++ b/src/platform/Kconfig
@@ -316,8 +316,8 @@ config CAVS_USE_LPRO_IN_WAITI
 	  Choose n if unclear.
 
 # TODO: it should just take manifest version and offsets
-config FIRMWARE_SHORT_NAME
-	string "Rimage firmware name"
+config RIMAGE_SIGNING_SCHEMA
+	string "Rimage firmware signing schema name"
 	default "byt" if BAYTRAIL
 	default "cht" if CHERRYTRAIL
 	default "hsw" if HASWELL
@@ -332,8 +332,7 @@ config FIRMWARE_SHORT_NAME
 	default "imx8m" if IMX8M
 	default ""
 	help
-	  3-characters long firmware identifer
-	  used by rimage to decide how to build final binary
+	  Signing schema name used by rimage to decide how to build final binary
 
 config SYSTICK_PERIOD
 	int "System tick period in microseconds"