diff --git a/Makefile b/Makefile
index 3a72d3d..849b6bd 100644
--- a/Makefile
+++ b/Makefile
@@ -376,6 +376,7 @@
 	firmware/2lib/2crc8.c \
 	firmware/2lib/2crypto.c \
 	firmware/2lib/2ec_sync.c \
+	firmware/2lib/2firmware.c \
 	firmware/2lib/2gbb.c \
 	firmware/2lib/2hmac.c \
 	firmware/2lib/2kernel.c \
@@ -400,7 +401,6 @@
 	firmware/lib/vboot_kernel.c \
 	firmware/lib20/api_kernel.c \
 	firmware/lib20/kernel.c \
-	firmware/lib20/misc.c \
 	firmware/lib20/packed_key.c
 
 # Only add these to firmware and test builds,
@@ -716,6 +716,7 @@
 	tests/vb2_common3_tests \
 	tests/vb2_crypto_tests \
 	tests/vb2_ec_sync_tests \
+	tests/vb2_firmware_tests \
 	tests/vb2_gbb_tests \
 	tests/vb2_host_flashrom_tests \
 	tests/vb2_host_key_tests \
@@ -739,7 +740,6 @@
 	tests/vb20_api_kernel_tests \
 	tests/vb20_verify_fw.c \
 	tests/vb20_kernel_tests \
-	tests/vb20_misc_tests \
 	tests/vb20_rsa_padding_tests \
 	tests/vb20_verify_fw
 
@@ -1246,6 +1246,7 @@
 	${RUNTEST} ${BUILD_RUN}/tests/vb2_common3_tests ${TEST_KEYS}
 	${RUNTEST} ${BUILD_RUN}/tests/vb2_crypto_tests
 	${RUNTEST} ${BUILD_RUN}/tests/vb2_ec_sync_tests
+	${RUNTEST} ${BUILD_RUN}/tests/vb2_firmware_tests
 	${RUNTEST} ${BUILD_RUN}/tests/vb2_gbb_tests
 	${RUNTEST} ${BUILD_RUN}/tests/vb2_host_key_tests
 	${RUNTEST} ${BUILD_RUN}/tests/vb2_kernel_tests
@@ -1262,7 +1263,6 @@
 	${RUNTEST} ${BUILD_RUN}/tests/vb2_ui_utility_tests
 	${RUNTEST} ${BUILD_RUN}/tests/vb20_api_kernel_tests
 	${RUNTEST} ${BUILD_RUN}/tests/vb20_kernel_tests
-	${RUNTEST} ${BUILD_RUN}/tests/vb20_misc_tests
 	${RUNTEST} ${BUILD_RUN}/tests/vb21_host_common_tests
 	${RUNTEST} ${BUILD_RUN}/tests/vb21_host_common2_tests ${TEST_KEYS}
 	${RUNTEST} ${BUILD_RUN}/tests/vb21_host_key_tests ${TEST_KEYS} ${BUILD}
diff --git a/firmware/lib20/misc.c b/firmware/2lib/2firmware.c
similarity index 100%
rename from firmware/lib20/misc.c
rename to firmware/2lib/2firmware.c
diff --git a/tests/vb20_misc_tests.c b/tests/vb2_firmware_tests.c
similarity index 99%
rename from tests/vb20_misc_tests.c
rename to tests/vb2_firmware_tests.c
index fdab37e..0e0c85f 100644
--- a/tests/vb20_misc_tests.c
+++ b/tests/vb2_firmware_tests.c
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
- * Tests for misc library
+ * Tests for firmware verification library
  */
 
 #include <stdio.h>