diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt
index 5dd9fca3..8d96480e 100644
--- a/firmware/CMakeLists.txt
+++ b/firmware/CMakeLists.txt
@@ -31,7 +31,7 @@ SET(PATH_HACKRF ${PATH_HACKRF_FIRMWARE}/..)
 SET(PATH_HACKRF_FIRMWARE_COMMON ${PATH_HACKRF_FIRMWARE}/common)
 SET(LIBOPENCM3 ${PATH_HACKRF_FIRMWARE}/libopencm3)
 SET(PATH_DFU_PY ${PATH_HACKRF_FIRMWARE}/dfu.py)
-SET(PATH_XSVF_TOOL ${PATH_HACKRF_FIRMWARE}/tools/cpld_crc.py)
+SET(PATH_CPLD_BITSTREAM_TOOL ${PATH_HACKRF_FIRMWARE}/tools/cpld_bitstream.py)
 set(PATH_HACKRF_CPLD_DATA_C ${CMAKE_CURRENT_BINARY_DIR}/hackrf_cpld_data.c)
 
 include(ExternalProject)
diff --git a/firmware/hackrf_usb/CMakeLists.txt b/firmware/hackrf_usb/CMakeLists.txt
index 43865bdb..fb58e08e 100644
--- a/firmware/hackrf_usb/CMakeLists.txt
+++ b/firmware/hackrf_usb/CMakeLists.txt
@@ -27,8 +27,8 @@ include(../hackrf-common.cmake)
 
 add_custom_command(
 	OUTPUT ${PATH_HACKRF_CPLD_DATA_C}
-	COMMAND ${PATH_XSVF_TOOL} --code ${PATH_HACKRF_CPLD_XSVF} >${PATH_HACKRF_CPLD_DATA_C}
-	DEPENDS ${PATH_XSVF_TOOL} ${PATH_HACKRF_CPLD_XSVF}
+	COMMAND ${PATH_CPLD_BITSTREAM_TOOL} --code ${PATH_HACKRF_CPLD_XSVF} >${PATH_HACKRF_CPLD_DATA_C}
+	DEPENDS ${PATH_CPLD_BITSTREAM_TOOL} ${PATH_HACKRF_CPLD_XSVF}
 )
 
 set(SRC_M4
diff --git a/firmware/tools/cpld_crc.py b/firmware/tools/cpld_bitstream.py
similarity index 99%
rename from firmware/tools/cpld_crc.py
rename to firmware/tools/cpld_bitstream.py
index ac70742f..6825726d 100755
--- a/firmware/tools/cpld_crc.py
+++ b/firmware/tools/cpld_bitstream.py
@@ -196,8 +196,8 @@ if args.checksum:
 		crc = DumbCRC32()
 
 	verify_block = verify_blocks[1]
-	for address, data, mask in verify_block:
-		valid_data = data & mask
+	for row in verify_block:
+		valid_data = row['data'] & row['mask']
 		bytes = valid_data.to_bytes(bytes_of_data, byteorder='little')
 		crc.update(bytes)