diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control b/server/site_tests/firmware_CorruptBothFwBodyAB/control
index ed8bcad..df2568a 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control
@@ -5,7 +5,7 @@
 from autotest_lib.server import utils
 
 AUTHOR = "Chrome OS Team"
-NAME = "firmware_CorruptFwBodyAB"
+NAME = "firmware_CorruptBothFwBodyAB"
 PURPOSE = "Servo based both firmware body A and B corruption test"
 CRITERIA = "This test will fail if firmware does not enter recovery mode"
 SUITE = "faft,faft_bios,faft_normal,faft_lv3"
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
index 5aa8ce5..39fdc60 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
@@ -5,7 +5,7 @@
 from autotest_lib.server import utils
 
 AUTHOR = "Chrome OS Team"
-NAME = "firmware_CorruptFwBodyAB"
+NAME = "firmware_CorruptBothFwBodyAB"
 PURPOSE = "Servo based both firmware body A and B corruption test"
 CRITERIA = "This test will fail if firmware does not enter recovery mode"
 SUITE = "faft,faft_bios,faft_dev,faft_lv3"
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control b/server/site_tests/firmware_CorruptBothFwSigAB/control
index ecec673..faf52df 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control
@@ -5,7 +5,7 @@
 from autotest_lib.server import utils
 
 AUTHOR = "Chrome OS Team"
-NAME = "firmware_CorruptFwSigAB"
+NAME = "firmware_CorruptBothFwSigAB"
 PURPOSE = "Servo based both firmware signature A and B corruption test"
 CRITERIA = "This test will fail if firmware does not enter recovery mode"
 SUITE = "faft,faft_bios,faft_normal,faft_lv3"
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
index a4df532..3788dc2 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
@@ -5,7 +5,7 @@
 from autotest_lib.server import utils
 
 AUTHOR = "Chrome OS Team"
-NAME = "firmware_CorruptFwSigAB"
+NAME = "firmware_CorruptBothFwSigAB"
 PURPOSE = "Servo based both firmware signature A and B corruption test"
 CRITERIA = "This test will fail if firmware does not enter recovery mode"
 SUITE = "faft,faft_bios,faft_dev,faft_lv3"
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control b/server/site_tests/firmware_CorruptBothKernelAB/control
index 040d2bf..c2d05fb 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control
@@ -5,7 +5,7 @@
 from autotest_lib.server import utils
 
 AUTHOR = "Chrome OS Team"
-NAME = "firmware_CorruptKernelAB"
+NAME = "firmware_CorruptBothKernelAB"
 PURPOSE = "Servo based both kernel A and B corruption test"
 CRITERIA = "This test will fail if firmware does not enter recovery mode"
 SUITE = "faft,faft_bios,faft_normal,faft_lv3"
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control.dev b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
index f1381a2..caee907 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
@@ -5,7 +5,7 @@
 from autotest_lib.server import utils
 
 AUTHOR = "Chrome OS Team"
-NAME = "firmware_CorruptKernelAB"
+NAME = "firmware_CorruptBothKernelAB"
 PURPOSE = "Servo based both kernel A and B corruption test"
 CRITERIA = "This test will fail if firmware does not enter recovery mode"
 SUITE = "faft,faft_bios,faft_dev,faft_lv3"