Update control files for cellular tests to work with test_that.

test_that expects the NAME field in a control file to correspond to the full
name of the control file. Update names for cellular technology specific tests so
that each control file can be referenced individually when using test_that.

BUG=chromium:263605
TEST=Ran the control.e362 versions of the updated files.

Change-Id: I19d233288e1f5a0829ff42e2a2a469ee3f537d04
Reviewed-on: https://gerrit.chromium.org/gerrit/63490
Reviewed-by: Thieu Le <thieule@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Commit-Queue: Prathmesh Prabhu <pprabhu@chromium.org>
diff --git a/client/site_tests/network_3GDisableWhileConnecting/control.alt3100 b/client/site_tests/network_3GDisableWhileConnecting/control.alt3100
index 1eccd2c..04a8462 100644
--- a/client/site_tests/network_3GDisableWhileConnecting/control.alt3100
+++ b/client/site_tests/network_3GDisableWhileConnecting/control.alt3100
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GDisableWhileConnecting"
+NAME = "network_3GDisableWhileConnecting.alt3100"
 PURPOSE = "Check that the 3G modem can handle a disconnect while connecting."
 CRITERIA = """
 This test will fail if a disconnect request while the modem is
diff --git a/client/site_tests/network_3GDisableWhileConnecting/control.e362 b/client/site_tests/network_3GDisableWhileConnecting/control.e362
index f2f105e..3626043 100644
--- a/client/site_tests/network_3GDisableWhileConnecting/control.e362
+++ b/client/site_tests/network_3GDisableWhileConnecting/control.e362
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GDisableWhileConnecting"
+NAME = "network_3GDisableWhileConnecting.e362"
 PURPOSE = "Check that the 3G modem can handle a disconnect while connecting."
 CRITERIA = """
 This test will fail if a disconnect request while the modem is
diff --git a/client/site_tests/network_3GDisableWhileConnecting/control.gobi b/client/site_tests/network_3GDisableWhileConnecting/control.gobi
index dda831f..fe7291b 100644
--- a/client/site_tests/network_3GDisableWhileConnecting/control.gobi
+++ b/client/site_tests/network_3GDisableWhileConnecting/control.gobi
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GDisableWhileConnecting"
+NAME = "network_3GDisableWhileConnecting.gobi"
 PURPOSE = "Check that the 3G modem can handle a disconnect while connecting."
 CRITERIA = """
 This test will fail if a disconnect request while the modem is
diff --git a/client/site_tests/network_3GDisableWhileConnecting/control.gobi2k b/client/site_tests/network_3GDisableWhileConnecting/control.gobi2k
index 177e505..343e768 100644
--- a/client/site_tests/network_3GDisableWhileConnecting/control.gobi2k
+++ b/client/site_tests/network_3GDisableWhileConnecting/control.gobi2k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GDisableWhileConnecting"
+NAME = "network_3GDisableWhileConnecting.gobi2k"
 PURPOSE = "Check that the 3G modem can handle a disconnect while connecting."
 CRITERIA = """
 This test will fail if a disconnect request while the modem is
diff --git a/client/site_tests/network_3GDisableWhileConnecting/control.gobi3k b/client/site_tests/network_3GDisableWhileConnecting/control.gobi3k
index 0652f80..c4f785a 100644
--- a/client/site_tests/network_3GDisableWhileConnecting/control.gobi3k
+++ b/client/site_tests/network_3GDisableWhileConnecting/control.gobi3k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GDisableWhileConnecting"
+NAME = "network_3GDisableWhileConnecting.gobi3k"
 PURPOSE = "Check that the 3G modem can handle a disconnect while connecting."
 CRITERIA = """
 This test will fail if a disconnect request while the modem is
diff --git a/client/site_tests/network_3GDisableWhileConnecting/control.pseudomodem b/client/site_tests/network_3GDisableWhileConnecting/control.pseudomodem
index 151c734..f228b34 100644
--- a/client/site_tests/network_3GDisableWhileConnecting/control.pseudomodem
+++ b/client/site_tests/network_3GDisableWhileConnecting/control.pseudomodem
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GDisableWhileConnecting"
+NAME = "network_3GDisableWhileConnecting.pseudomodem"
 PURPOSE = "Check that the 3G modem can handle a disconnect while connecting."
 CRITERIA = """
 This test will fail if a disconnect request while the modem is
diff --git a/client/site_tests/network_3GDisableWhileConnecting/control.y3300 b/client/site_tests/network_3GDisableWhileConnecting/control.y3300
index 2cb8543..9e35710 100644
--- a/client/site_tests/network_3GDisableWhileConnecting/control.y3300
+++ b/client/site_tests/network_3GDisableWhileConnecting/control.y3300
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GDisableWhileConnecting"
+NAME = "network_3GDisableWhileConnecting.y3300"
 PURPOSE = "Check that the 3G modem can handle a disconnect while connecting."
 CRITERIA = """
 This test will fail if a disconnect request while the modem is
diff --git a/client/site_tests/network_3GDisableWhileConnecting/control.y3400 b/client/site_tests/network_3GDisableWhileConnecting/control.y3400
index fc82263..27291e4 100644
--- a/client/site_tests/network_3GDisableWhileConnecting/control.y3400
+++ b/client/site_tests/network_3GDisableWhileConnecting/control.y3400
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GDisableWhileConnecting"
+NAME = "network_3GDisableWhileConnecting.y3400"
 PURPOSE = "Check that the 3G modem can handle a disconnect while connecting."
 CRITERIA = """
 This test will fail if a disconnect request while the modem is
diff --git a/client/site_tests/network_3GFailedConnect/control.pseudomodem b/client/site_tests/network_3GFailedConnect/control.pseudomodem
index 871d20f..19051f9 100644
--- a/client/site_tests/network_3GFailedConnect/control.pseudomodem
+++ b/client/site_tests/network_3GFailedConnect/control.pseudomodem
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GFailedConnect"
+NAME = "network_3GFailedConnect.pseudomodem"
 PURPOSE = "Verify that a failed modem connect attempt puts the service in a failed state."
 CRITERIA = """
 This test will fail if a connect failure does not immediately cause the
diff --git a/client/site_tests/network_3GGobiPorts/control.gobi2k b/client/site_tests/network_3GGobiPorts/control.gobi2k
index 6ad3a48..91208a4 100644
--- a/client/site_tests/network_3GGobiPorts/control.gobi2k
+++ b/client/site_tests/network_3GGobiPorts/control.gobi2k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GGobiPorts"
+NAME = "network_3GGobiPorts.gobi2k"
 PURPOSE = "Verify that Gobi serial ports are present."
 CRITERIA = """
 This test will fail if the gobi serial ports for QXDM, AT commands and
diff --git a/client/site_tests/network_3GGobiPorts/control.gobi3k b/client/site_tests/network_3GGobiPorts/control.gobi3k
index 2ea0620..eda7b69 100644
--- a/client/site_tests/network_3GGobiPorts/control.gobi3k
+++ b/client/site_tests/network_3GGobiPorts/control.gobi3k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GGobiPorts"
+NAME = "network_3GGobiPorts.gobi3k"
 PURPOSE = "Verify that Gobi serial ports are present."
 CRITERIA = """
 This test will fail if the gobi serial ports for QXDM, AT commands and
diff --git a/client/site_tests/network_3GIdentifiers/control.alt3100 b/client/site_tests/network_3GIdentifiers/control.alt3100
index c14c1be..5178750 100644
--- a/client/site_tests/network_3GIdentifiers/control.alt3100
+++ b/client/site_tests/network_3GIdentifiers/control.alt3100
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GIdentifiers"
+NAME = "network_3GIdentifiers.alt3100"
 PURPOSE = "Verify cellular modem provides correct identification information."
 CRITERIA = """
 This test will fail if one of the following conditions occur:
diff --git a/client/site_tests/network_3GIdentifiers/control.e362 b/client/site_tests/network_3GIdentifiers/control.e362
index 217487a..a51e500 100644
--- a/client/site_tests/network_3GIdentifiers/control.e362
+++ b/client/site_tests/network_3GIdentifiers/control.e362
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GIdentifiers"
+NAME = "network_3GIdentifiers.e362"
 PURPOSE = "Verify cellular modem provides correct identification information."
 CRITERIA = """
 This test will fail if one of the following conditions occur:
diff --git a/client/site_tests/network_3GIdentifiers/control.gobi2k b/client/site_tests/network_3GIdentifiers/control.gobi2k
index 3ecaf9c..1648696 100644
--- a/client/site_tests/network_3GIdentifiers/control.gobi2k
+++ b/client/site_tests/network_3GIdentifiers/control.gobi2k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GIdentifiers"
+NAME = "network_3GIdentifiers.gobi2k"
 PURPOSE = "Verify cellular modem provides correct identification information."
 CRITERIA = """
 This test will fail if one of the following conditions occur:
diff --git a/client/site_tests/network_3GIdentifiers/control.gobi3k b/client/site_tests/network_3GIdentifiers/control.gobi3k
index bf1331b..b92f556 100644
--- a/client/site_tests/network_3GIdentifiers/control.gobi3k
+++ b/client/site_tests/network_3GIdentifiers/control.gobi3k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GIdentifiers"
+NAME = "network_3GIdentifiers.gobi3k"
 PURPOSE = "Verify cellular modem provides correct identification information."
 CRITERIA = """
 This test will fail if one of the following conditions occur:
diff --git a/client/site_tests/network_3GIdentifiers/control.pseudomodem b/client/site_tests/network_3GIdentifiers/control.pseudomodem
index 2ebbae2..47fddfe 100644
--- a/client/site_tests/network_3GIdentifiers/control.pseudomodem
+++ b/client/site_tests/network_3GIdentifiers/control.pseudomodem
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GIdentifiers"
+NAME = "network_3GIdentifiers.pseudomodem"
 PURPOSE = "Verify cellular modem provides correct identification information."
 CRITERIA = """
 This test will fail if one of the following conditions occur:
diff --git a/client/site_tests/network_3GIdentifiers/control.y3300 b/client/site_tests/network_3GIdentifiers/control.y3300
index 5cbf7d0..4a8866b 100644
--- a/client/site_tests/network_3GIdentifiers/control.y3300
+++ b/client/site_tests/network_3GIdentifiers/control.y3300
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GIdentifiers"
+NAME = "network_3GIdentifiers.y3300"
 PURPOSE = "Verify cellular modem provides correct identification information."
 CRITERIA = """
 This test will fail if one of the following conditions occur:
diff --git a/client/site_tests/network_3GIdentifiers/control.y3400 b/client/site_tests/network_3GIdentifiers/control.y3400
index 6254268..89a56da 100644
--- a/client/site_tests/network_3GIdentifiers/control.y3400
+++ b/client/site_tests/network_3GIdentifiers/control.y3400
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GIdentifiers"
+NAME = "network_3GIdentifiers.y3400"
 PURPOSE = "Verify cellular modem provides correct identification information."
 CRITERIA = """
 This test will fail if one of the following conditions occur:
diff --git a/client/site_tests/network_3GModemControl/control.alt3100 b/client/site_tests/network_3GModemControl/control.alt3100
index 05df9ed..e5de2ef 100644
--- a/client/site_tests/network_3GModemControl/control.alt3100
+++ b/client/site_tests/network_3GModemControl/control.alt3100
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GModemControl"
+NAME = "network_3GModemControl.alt3100"
 PURPOSE = "Verify commands sent to a modem manager are reflected in flimflam."
 CRITERIA = """
 This test will fail if modem manager state differs from flimflam state.
diff --git a/client/site_tests/network_3GModemControl/control.e362 b/client/site_tests/network_3GModemControl/control.e362
index 044d6f5..26489c0 100644
--- a/client/site_tests/network_3GModemControl/control.e362
+++ b/client/site_tests/network_3GModemControl/control.e362
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GModemControl"
+NAME = "network_3GModemControl.e362"
 PURPOSE = "Verify commands sent to a modem manager are reflected in flimflam."
 CRITERIA = """
 This test will fail if modem manager state differs from flimflam state.
diff --git a/client/site_tests/network_3GModemControl/control.gobi2k b/client/site_tests/network_3GModemControl/control.gobi2k
index ac335e6..90d26b9 100644
--- a/client/site_tests/network_3GModemControl/control.gobi2k
+++ b/client/site_tests/network_3GModemControl/control.gobi2k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GModemControl"
+NAME = "network_3GModemControl.gobi2k"
 PURPOSE = "Verify commands sent to a modem manager are reflected in flimflam."
 CRITERIA = """
 This test will fail if modem manager state differs from flimflam state.
diff --git a/client/site_tests/network_3GModemControl/control.gobi3k b/client/site_tests/network_3GModemControl/control.gobi3k
index e31e646..913e3b3 100644
--- a/client/site_tests/network_3GModemControl/control.gobi3k
+++ b/client/site_tests/network_3GModemControl/control.gobi3k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GModemControl"
+NAME = "network_3GModemControl.gobi3k"
 PURPOSE = "Verify commands sent to a modem manager are reflected in flimflam."
 CRITERIA = """
 This test will fail if modem manager state differs from flimflam state.
diff --git a/client/site_tests/network_3GModemControl/control.pseudomodem b/client/site_tests/network_3GModemControl/control.pseudomodem
index e216fcc..61c6b92 100644
--- a/client/site_tests/network_3GModemControl/control.pseudomodem
+++ b/client/site_tests/network_3GModemControl/control.pseudomodem
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GModemControl"
+NAME = "network_3GModemControl.pseudomodem"
 PURPOSE = "Verify commands sent to a modem manager are reflected in shill."
 CRITERIA = """
 This test will fail if modem manager state differs from shill state.
diff --git a/client/site_tests/network_3GModemControl/control.y3300 b/client/site_tests/network_3GModemControl/control.y3300
index b8216ea..b5bfdd6 100644
--- a/client/site_tests/network_3GModemControl/control.y3300
+++ b/client/site_tests/network_3GModemControl/control.y3300
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GModemControl"
+NAME = "network_3GModemControl.y3300"
 PURPOSE = "Verify commands sent to a modem manager are reflected in flimflam."
 CRITERIA = """
 This test will fail if modem manager state differs from flimflam state.
diff --git a/client/site_tests/network_3GModemControl/control.y3400 b/client/site_tests/network_3GModemControl/control.y3400
index 9ce0a7d..c30927f 100644
--- a/client/site_tests/network_3GModemControl/control.y3400
+++ b/client/site_tests/network_3GModemControl/control.y3400
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GModemControl"
+NAME = "network_3GModemControl.y3400"
 PURPOSE = "Verify commands sent to a modem manager are reflected in flimflam."
 CRITERIA = """
 This test will fail if modem manager state differs from flimflam state.
diff --git a/client/site_tests/network_3GModemPresent/control.alt3100 b/client/site_tests/network_3GModemPresent/control.alt3100
index 1e71f3e..d9cac4d 100644
--- a/client/site_tests/network_3GModemPresent/control.alt3100
+++ b/client/site_tests/network_3GModemPresent/control.alt3100
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GModemPresent"
+NAME = "network_3GModemPresent.alt3100"
 PURPOSE = "Verify 3G modem is visible to Flimflam."
 CRITERIA = """
 This test will fail if neither Cromo nor ModemManager is exporting a modem
diff --git a/client/site_tests/network_3GModemPresent/control.e362 b/client/site_tests/network_3GModemPresent/control.e362
index 29fb2d1..daa2eeb 100644
--- a/client/site_tests/network_3GModemPresent/control.e362
+++ b/client/site_tests/network_3GModemPresent/control.e362
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GModemPresent"
+NAME = "network_3GModemPresent.e362"
 PURPOSE = "Verify 3G modem is visible to Flimflam."
 CRITERIA = """
 This test will fail if neither Cromo nor ModemManager is exporting a modem
diff --git a/client/site_tests/network_3GModemPresent/control.gobi2k b/client/site_tests/network_3GModemPresent/control.gobi2k
index ff4790a..3e23d07 100644
--- a/client/site_tests/network_3GModemPresent/control.gobi2k
+++ b/client/site_tests/network_3GModemPresent/control.gobi2k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GModemPresent"
+NAME = "network_3GModemPresent.gobi2k"
 PURPOSE = "Verify 3G modem is visible to Flimflam."
 CRITERIA = """
 This test will fail if neither Cromo nor ModemManager is exporting a modem
diff --git a/client/site_tests/network_3GModemPresent/control.gobi3k b/client/site_tests/network_3GModemPresent/control.gobi3k
index bf82183..e06c78b 100644
--- a/client/site_tests/network_3GModemPresent/control.gobi3k
+++ b/client/site_tests/network_3GModemPresent/control.gobi3k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GModemPresent"
+NAME = "network_3GModemPresent.gobi3k"
 PURPOSE = "Verify 3G modem is visible to Flimflam."
 CRITERIA = """
 This test will fail if neither Cromo nor ModemManager is exporting a modem
diff --git a/client/site_tests/network_3GModemPresent/control.pseudomodem b/client/site_tests/network_3GModemPresent/control.pseudomodem
index 5c568ba..12ad3e0 100644
--- a/client/site_tests/network_3GModemPresent/control.pseudomodem
+++ b/client/site_tests/network_3GModemPresent/control.pseudomodem
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GModemPresent"
+NAME = "network_3GModemPresent.pseudomodem"
 PURPOSE = "Verify 3G modem is visible to Flimflam."
 CRITERIA = """
 This test will fail if neither Cromo nor ModemManager is exporting a modem
diff --git a/client/site_tests/network_3GModemPresent/control.y3300 b/client/site_tests/network_3GModemPresent/control.y3300
index c0b8971..34318ce 100644
--- a/client/site_tests/network_3GModemPresent/control.y3300
+++ b/client/site_tests/network_3GModemPresent/control.y3300
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GModemPresent"
+NAME = "network_3GModemPresent.y3300"
 PURPOSE = "Verify 3G modem is visible to Flimflam."
 CRITERIA = """
 This test will fail if neither Cromo nor ModemManager is exporting a modem
diff --git a/client/site_tests/network_3GModemPresent/control.y3400 b/client/site_tests/network_3GModemPresent/control.y3400
index dc4bd04..62cd08c 100644
--- a/client/site_tests/network_3GModemPresent/control.y3400
+++ b/client/site_tests/network_3GModemPresent/control.y3400
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GModemPresent"
+NAME = "network_3GModemPresent.y3400"
 PURPOSE = "Verify 3G modem is visible to Flimflam."
 CRITERIA = """
 This test will fail if neither Cromo nor ModemManager is exporting a modem
diff --git a/client/site_tests/network_3GRecoverFromGobiDesync/control.gobi2k b/client/site_tests/network_3GRecoverFromGobiDesync/control.gobi2k
index 1019f46..d425abc 100644
--- a/client/site_tests/network_3GRecoverFromGobiDesync/control.gobi2k
+++ b/client/site_tests/network_3GRecoverFromGobiDesync/control.gobi2k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GRecoverFromGobiDesync"
+NAME = "network_3GRecoverFromGobiDesync.gobi2k"
 PURPOSE = "Verify that gobi-cromo-plugin recovers from driver failures"
 SUITE = "network3g"
 TIME = "SHORT"
diff --git a/client/site_tests/network_3GRecoverFromGobiDesync/control.gobi3k b/client/site_tests/network_3GRecoverFromGobiDesync/control.gobi3k
index f777beb..68bc6ad 100644
--- a/client/site_tests/network_3GRecoverFromGobiDesync/control.gobi3k
+++ b/client/site_tests/network_3GRecoverFromGobiDesync/control.gobi3k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GRecoverFromGobiDesync"
+NAME = "network_3GRecoverFromGobiDesync.gobi3k"
 PURPOSE = "Verify that gobi-cromo-plugin recovers from driver failures"
 SUITE = "network3g"
 TIME = "SHORT"
diff --git a/client/site_tests/network_3GSafetyDance/control.alt3100 b/client/site_tests/network_3GSafetyDance/control.alt3100
index 49cacfc..3291ea0 100644
--- a/client/site_tests/network_3GSafetyDance/control.alt3100
+++ b/client/site_tests/network_3GSafetyDance/control.alt3100
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GSafetyDance"
+NAME = "network_3GSafetyDance.alt3100"
 PURPOSE = "Stress-test all connman 3G operations."
 CRITERIA = """
 This test will fail if any DBus call times out or flimflam crashes.
diff --git a/client/site_tests/network_3GSafetyDance/control.e362 b/client/site_tests/network_3GSafetyDance/control.e362
index 4b92e79..d987223 100644
--- a/client/site_tests/network_3GSafetyDance/control.e362
+++ b/client/site_tests/network_3GSafetyDance/control.e362
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GSafetyDance"
+NAME = "network_3GSafetyDance.e362"
 PURPOSE = "Stress-test all connman 3G operations."
 CRITERIA = """
 This test will fail if any DBus call times out or flimflam crashes.
diff --git a/client/site_tests/network_3GSafetyDance/control.gobi2k b/client/site_tests/network_3GSafetyDance/control.gobi2k
index f53e193..4f05176 100644
--- a/client/site_tests/network_3GSafetyDance/control.gobi2k
+++ b/client/site_tests/network_3GSafetyDance/control.gobi2k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GSafetyDance"
+NAME = "network_3GSafetyDance.gobi2k"
 PURPOSE = "Stress-test all connman 3G operations."
 CRITERIA = """
 This test will fail if any DBus call times out or flimflam crashes.
diff --git a/client/site_tests/network_3GSafetyDance/control.gobi3k b/client/site_tests/network_3GSafetyDance/control.gobi3k
index dfe98a5..f37998e 100644
--- a/client/site_tests/network_3GSafetyDance/control.gobi3k
+++ b/client/site_tests/network_3GSafetyDance/control.gobi3k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GSafetyDance"
+NAME = "network_3GSafetyDance.gobi3k"
 PURPOSE = "Stress-test all connman 3G operations."
 CRITERIA = """
 This test will fail if any DBus call times out or flimflam crashes.
diff --git a/client/site_tests/network_3GSafetyDance/control.pseudomodem b/client/site_tests/network_3GSafetyDance/control.pseudomodem
index 13d3455..b4f7e92 100644
--- a/client/site_tests/network_3GSafetyDance/control.pseudomodem
+++ b/client/site_tests/network_3GSafetyDance/control.pseudomodem
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GSafetyDance"
+NAME = "network_3GSafetyDance.pseudomodem"
 PURPOSE = "Stress-test all connman 3G operations."
 CRITERIA = """
 This test will fail if any DBus call times out or flimflam crashes.
diff --git a/client/site_tests/network_3GSafetyDance/control.y3300 b/client/site_tests/network_3GSafetyDance/control.y3300
index b5ca0eb..8ba9561 100644
--- a/client/site_tests/network_3GSafetyDance/control.y3300
+++ b/client/site_tests/network_3GSafetyDance/control.y3300
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GSafetyDance"
+NAME = "network_3GSafetyDance.y3300"
 PURPOSE = "Stress-test all connman 3G operations."
 CRITERIA = """
 This test will fail if any DBus call times out or flimflam crashes.
diff --git a/client/site_tests/network_3GSafetyDance/control.y3400 b/client/site_tests/network_3GSafetyDance/control.y3400
index ba38c90..1f60e83 100644
--- a/client/site_tests/network_3GSafetyDance/control.y3400
+++ b/client/site_tests/network_3GSafetyDance/control.y3400
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GSafetyDance"
+NAME = "network_3GSafetyDance.y3400"
 PURPOSE = "Stress-test all connman 3G operations."
 CRITERIA = """
 This test will fail if any DBus call times out or flimflam crashes.
diff --git a/client/site_tests/network_3GSmokeTest/control.alt3100 b/client/site_tests/network_3GSmokeTest/control.alt3100
index 60c32b8..914dcf4 100644
--- a/client/site_tests/network_3GSmokeTest/control.alt3100
+++ b/client/site_tests/network_3GSmokeTest/control.alt3100
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GSmokeTest"
+NAME = "network_3GSmokeTest.alt3100"
 PURPOSE = "Verify 3G modem can connect to the network."
 CRITERIA = """
 This test will fail if one of the following conditions occur:
diff --git a/client/site_tests/network_3GSmokeTest/control.e362 b/client/site_tests/network_3GSmokeTest/control.e362
index 61b32d4..dbbd940 100644
--- a/client/site_tests/network_3GSmokeTest/control.e362
+++ b/client/site_tests/network_3GSmokeTest/control.e362
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GSmokeTest"
+NAME = "network_3GSmokeTest.e362"
 PURPOSE = "Verify 3G modem can connect to the network."
 CRITERIA = """
 This test will fail if one of the following conditions occur:
diff --git a/client/site_tests/network_3GSmokeTest/control.gobi2k b/client/site_tests/network_3GSmokeTest/control.gobi2k
index d1bb83b..bc53838 100644
--- a/client/site_tests/network_3GSmokeTest/control.gobi2k
+++ b/client/site_tests/network_3GSmokeTest/control.gobi2k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GSmokeTest"
+NAME = "network_3GSmokeTest.gobi2k"
 PURPOSE = "Verify 3G modem can connect to the network."
 CRITERIA = """
 This test will fail if one of the following conditions occur:
diff --git a/client/site_tests/network_3GSmokeTest/control.gobi3k b/client/site_tests/network_3GSmokeTest/control.gobi3k
index aa1c7d6..0ed5670 100644
--- a/client/site_tests/network_3GSmokeTest/control.gobi3k
+++ b/client/site_tests/network_3GSmokeTest/control.gobi3k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GSmokeTest"
+NAME = "network_3GSmokeTest.gobi3k"
 PURPOSE = "Verify 3G modem can connect to the network."
 CRITERIA = """
 This test will fail if one of the following conditions occur:
diff --git a/client/site_tests/network_3GSmokeTest/control.pseudomodem b/client/site_tests/network_3GSmokeTest/control.pseudomodem
index d2fe4f9..bae3da4 100644
--- a/client/site_tests/network_3GSmokeTest/control.pseudomodem
+++ b/client/site_tests/network_3GSmokeTest/control.pseudomodem
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GSmokeTest"
+NAME = "network_3GSmokeTest.pseudomodem"
 PURPOSE = "Verify 3G modem can connect to the network."
 CRITERIA = """
 This test will fail if one of the following conditions occur:
diff --git a/client/site_tests/network_3GSmokeTest/control.y3300 b/client/site_tests/network_3GSmokeTest/control.y3300
index 0eab48d..bbc3d77 100644
--- a/client/site_tests/network_3GSmokeTest/control.y3300
+++ b/client/site_tests/network_3GSmokeTest/control.y3300
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GSmokeTest"
+NAME = "network_3GSmokeTest.y3300"
 PURPOSE = "Verify 3G modem can connect to the network."
 CRITERIA = """
 This test will fail if one of the following conditions occur:
diff --git a/client/site_tests/network_3GSmokeTest/control.y3400 b/client/site_tests/network_3GSmokeTest/control.y3400
index 47c66a7..bfb4b06 100644
--- a/client/site_tests/network_3GSmokeTest/control.y3400
+++ b/client/site_tests/network_3GSmokeTest/control.y3400
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GSmokeTest"
+NAME = "network_3GSmokeTest.y3400"
 PURPOSE = "Verify 3G modem can connect to the network."
 CRITERIA = """
 This test will fail if one of the following conditions occur:
diff --git a/client/site_tests/network_3GStressEnable/control.alt3100 b/client/site_tests/network_3GStressEnable/control.alt3100
index 663f267..94bd050 100644
--- a/client/site_tests/network_3GStressEnable/control.alt3100
+++ b/client/site_tests/network_3GStressEnable/control.alt3100
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GStressEnable"
+NAME = "network_3GStressEnable.alt3100"
 PURPOSE = "Stress-test Connman enable/disable"
 CRITERIA = """
 This test fails if flimflam ever fails to respond to a DBus message or crashes.
diff --git a/client/site_tests/network_3GStressEnable/control.e362 b/client/site_tests/network_3GStressEnable/control.e362
index 48370c5..8b29500 100644
--- a/client/site_tests/network_3GStressEnable/control.e362
+++ b/client/site_tests/network_3GStressEnable/control.e362
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GStressEnable"
+NAME = "network_3GStressEnable.e362"
 PURPOSE = "Stress-test Connman enable/disable"
 CRITERIA = """
 This test fails if flimflam ever fails to respond to a DBus message or crashes.
diff --git a/client/site_tests/network_3GStressEnable/control.gobi2k b/client/site_tests/network_3GStressEnable/control.gobi2k
index 491651d..14cad8c 100644
--- a/client/site_tests/network_3GStressEnable/control.gobi2k
+++ b/client/site_tests/network_3GStressEnable/control.gobi2k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GStressEnable"
+NAME = "network_3GStressEnable.gobi2k"
 PURPOSE = "Stress-test Connman enable/disable"
 CRITERIA = """
 This test fails if flimflam ever fails to respond to a DBus message or crashes.
diff --git a/client/site_tests/network_3GStressEnable/control.gobi3k b/client/site_tests/network_3GStressEnable/control.gobi3k
index 1027fc2..147603e 100644
--- a/client/site_tests/network_3GStressEnable/control.gobi3k
+++ b/client/site_tests/network_3GStressEnable/control.gobi3k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GStressEnable"
+NAME = "network_3GStressEnable.gobi3k"
 PURPOSE = "Stress-test Connman enable/disable"
 CRITERIA = """
 This test fails if flimflam ever fails to respond to a DBus message or crashes.
diff --git a/client/site_tests/network_3GStressEnable/control.pseudomodem b/client/site_tests/network_3GStressEnable/control.pseudomodem
index 677386a..e5b1c0e 100644
--- a/client/site_tests/network_3GStressEnable/control.pseudomodem
+++ b/client/site_tests/network_3GStressEnable/control.pseudomodem
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GStressEnable"
+NAME = "network_3GStressEnable.pseudomodem"
 PURPOSE = "Stress-test Connman enable/disable"
 CRITERIA = """
 This test fails if flimflam ever fails to respond to a DBus message or crashes.
diff --git a/client/site_tests/network_3GStressEnable/control.y3300 b/client/site_tests/network_3GStressEnable/control.y3300
index f9869f5..0f1c7fe 100644
--- a/client/site_tests/network_3GStressEnable/control.y3300
+++ b/client/site_tests/network_3GStressEnable/control.y3300
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GStressEnable"
+NAME = "network_3GStressEnable.y3300"
 PURPOSE = "Stress-test Connman enable/disable"
 CRITERIA = """
 This test fails if flimflam ever fails to respond to a DBus message or crashes.
diff --git a/client/site_tests/network_3GStressEnable/control.y3400 b/client/site_tests/network_3GStressEnable/control.y3400
index 5f1527b..fd5cc3b 100644
--- a/client/site_tests/network_3GStressEnable/control.y3400
+++ b/client/site_tests/network_3GStressEnable/control.y3400
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_3GStressEnable"
+NAME = "network_3GStressEnable.y3400"
 PURPOSE = "Stress-test Connman enable/disable"
 CRITERIA = """
 This test fails if flimflam ever fails to respond to a DBus message or crashes.
diff --git a/client/site_tests/network_ConnmanPowerStateTracking/control.gobi2k b/client/site_tests/network_ConnmanPowerStateTracking/control.gobi2k
index 77e9366..f091dd5 100644
--- a/client/site_tests/network_ConnmanPowerStateTracking/control.gobi2k
+++ b/client/site_tests/network_ConnmanPowerStateTracking/control.gobi2k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_ConnmanPowerStateTracking"
+NAME = "network_ConnmanPowerStateTracking.gobi2k"
 PURPOSE = "Checks whether connman tracks device power state properly."
 CRITERIA = """
 This test fails if flimflam's state ever fails to match the modem's state.
diff --git a/client/site_tests/network_ConnmanPowerStateTracking/control.gobi3k b/client/site_tests/network_ConnmanPowerStateTracking/control.gobi3k
index 2aa0f82..88ede15 100644
--- a/client/site_tests/network_ConnmanPowerStateTracking/control.gobi3k
+++ b/client/site_tests/network_ConnmanPowerStateTracking/control.gobi3k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_ConnmanPowerStateTracking"
+NAME = "network_ConnmanPowerStateTracking.gobi3k"
 PURPOSE = "Checks whether connman tracks device power state properly."
 CRITERIA = """
 This test fails if flimflam's state ever fails to match the modem's state.
diff --git a/client/site_tests/network_GobiUncleanDisconnect/control.gobi2k b/client/site_tests/network_GobiUncleanDisconnect/control.gobi2k
index 5609a84..7c27cb8 100644
--- a/client/site_tests/network_GobiUncleanDisconnect/control.gobi2k
+++ b/client/site_tests/network_GobiUncleanDisconnect/control.gobi2k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_GobiUncleanDisconnect"
+NAME = "network_GobiUncleanDisconnect.gobi2k"
 PURPOSE = "Disconnects uncleanly from the Gobi a few times."
 CRITERIA = """
 This test will fail if any of its subtest programs fails to find or connect to
diff --git a/client/site_tests/network_GobiUncleanDisconnect/control.gobi3k b/client/site_tests/network_GobiUncleanDisconnect/control.gobi3k
index fbbbf32..847b71c 100644
--- a/client/site_tests/network_GobiUncleanDisconnect/control.gobi3k
+++ b/client/site_tests/network_GobiUncleanDisconnect/control.gobi3k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_GobiUncleanDisconnect"
+NAME = "network_GobiUncleanDisconnect.gobi3k"
 PURPOSE = "Disconnects uncleanly from the Gobi a few times."
 CRITERIA = """
 This test will fail if any of its subtest programs fails to find or connect to
diff --git a/client/site_tests/network_MobileSuspendResume/control.alt3100 b/client/site_tests/network_MobileSuspendResume/control.alt3100
index 4015207..aee9cfc 100644
--- a/client/site_tests/network_MobileSuspendResume/control.alt3100
+++ b/client/site_tests/network_MobileSuspendResume/control.alt3100
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_MobileSuspendResume"
+NAME = "network_MobileSuspendResume.alt3100"
 PURPOSE = "Test 3g modem state after suspend/resume"
 CRITERIA = """
     Check the 3g state of the device after suspend and resume.  Verify
diff --git a/client/site_tests/network_MobileSuspendResume/control.e362 b/client/site_tests/network_MobileSuspendResume/control.e362
index b22a524..1445479 100644
--- a/client/site_tests/network_MobileSuspendResume/control.e362
+++ b/client/site_tests/network_MobileSuspendResume/control.e362
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_MobileSuspendResume"
+NAME = "network_MobileSuspendResume.e362"
 PURPOSE = "Test 3g modem state after suspend/resume"
 CRITERIA = """
     Check the 3g state of the device after suspend and resume.  Verify
diff --git a/client/site_tests/network_MobileSuspendResume/control.gobi2k b/client/site_tests/network_MobileSuspendResume/control.gobi2k
index 1014d5d..f51257b 100644
--- a/client/site_tests/network_MobileSuspendResume/control.gobi2k
+++ b/client/site_tests/network_MobileSuspendResume/control.gobi2k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_MobileSuspendResume"
+NAME = "network_MobileSuspendResume.gobi2k"
 PURPOSE = "Test 3g modem state after suspend/resume"
 CRITERIA = """
     Check the 3g state of the device after suspend and resume.  Verify
diff --git a/client/site_tests/network_MobileSuspendResume/control.gobi3k b/client/site_tests/network_MobileSuspendResume/control.gobi3k
index 92b5d2b..ca50190 100644
--- a/client/site_tests/network_MobileSuspendResume/control.gobi3k
+++ b/client/site_tests/network_MobileSuspendResume/control.gobi3k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_MobileSuspendResume"
+NAME = "network_MobileSuspendResume.gobi3k"
 PURPOSE = "Test 3g modem state after suspend/resume"
 CRITERIA = """
     Check the 3g state of the device after suspend and resume.  Verify
diff --git a/client/site_tests/network_MobileSuspendResume/control.stress b/client/site_tests/network_MobileSuspendResume/control.stress
index 2cfcf3f..cb6dfa5 100644
--- a/client/site_tests/network_MobileSuspendResume/control.stress
+++ b/client/site_tests/network_MobileSuspendResume/control.stress
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_MobileSuspendResumeStress"
+NAME = "network_MobileSuspendResumeStress.stress"
 PURPOSE = "Test 3g modem state after suspend/resume over many iterations"
 CRITERIA = """
     Check the 3g state of the device after many iterations of suspend/resume.
diff --git a/client/site_tests/network_MobileSuspendResume/control.wimax b/client/site_tests/network_MobileSuspendResume/control.wimax
index 19b031d..10efe8c 100644
--- a/client/site_tests/network_MobileSuspendResume/control.wimax
+++ b/client/site_tests/network_MobileSuspendResume/control.wimax
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_MobileSuspendResume"
+NAME = "network_MobileSuspendResume.wimax"
 PURPOSE = "Test wimax device state after suspend/resume"
 CRITERIA = """
     Check the wimax state of the device after suspend and resume.  Verify
diff --git a/client/site_tests/network_MobileSuspendResume/control.wimax_stress_autoconnect_off b/client/site_tests/network_MobileSuspendResume/control.wimax_stress_autoconnect_off
index 7c39a68..0684e6f 100644
--- a/client/site_tests/network_MobileSuspendResume/control.wimax_stress_autoconnect_off
+++ b/client/site_tests/network_MobileSuspendResume/control.wimax_stress_autoconnect_off
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_MobileSuspendResumeStress"
+NAME = "network_MobileSuspendResumeStress.wimax_stress_autoconnect_off"
 PURPOSE = "Test wimax device state after suspend/resume over many iterations"
 CRITERIA = """
     Check the wimax state of the device after many iterations of suspend/resume.
diff --git a/client/site_tests/network_MobileSuspendResume/control.wimax_stress_autoconnect_on b/client/site_tests/network_MobileSuspendResume/control.wimax_stress_autoconnect_on
index f0b222a..237100b 100644
--- a/client/site_tests/network_MobileSuspendResume/control.wimax_stress_autoconnect_on
+++ b/client/site_tests/network_MobileSuspendResume/control.wimax_stress_autoconnect_on
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_MobileSuspendResumeStress"
+NAME = "network_MobileSuspendResumeStress.wimax_stress_autoconnect_on"
 PURPOSE = "Test wimax device state after suspend/resume over many iterations"
 CRITERIA = """
     Check the wimax state of the device after many iterations of suspend/resume.
diff --git a/client/site_tests/network_MobileSuspendResume/control.y3300 b/client/site_tests/network_MobileSuspendResume/control.y3300
index 0025c70..1e7caa2 100644
--- a/client/site_tests/network_MobileSuspendResume/control.y3300
+++ b/client/site_tests/network_MobileSuspendResume/control.y3300
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_MobileSuspendResume"
+NAME = "network_MobileSuspendResume.y3300"
 PURPOSE = "Test 3g modem state after suspend/resume"
 CRITERIA = """
     Check the 3g state of the device after suspend and resume.  Verify
diff --git a/client/site_tests/network_MobileSuspendResume/control.y3400 b/client/site_tests/network_MobileSuspendResume/control.y3400
index 68985db..bfa59bb 100644
--- a/client/site_tests/network_MobileSuspendResume/control.y3400
+++ b/client/site_tests/network_MobileSuspendResume/control.y3400
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "ChromeOS Team"
-NAME = "network_MobileSuspendResume"
+NAME = "network_MobileSuspendResume.y3400"
 PURPOSE = "Test 3g modem state after suspend/resume"
 CRITERIA = """
     Check the 3g state of the device after suspend and resume.  Verify
diff --git a/server/site_tests/network_3GLoadFirmware/control b/server/site_tests/network_3GLoadFirmware/control
index e7eda9b..77ae833 100644
--- a/server/site_tests/network_3GLoadFirmware/control
+++ b/server/site_tests/network_3GLoadFirmware/control
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "Chrome OS Team"
-NAME = "3GLoadFirmware"
+NAME = "network_3GLoadFirmware"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "network"
diff --git a/server/site_tests/network_3GLoadFirmware/control.gobi2k b/server/site_tests/network_3GLoadFirmware/control.gobi2k
index 41174d0..61a73fc 100644
--- a/server/site_tests/network_3GLoadFirmware/control.gobi2k
+++ b/server/site_tests/network_3GLoadFirmware/control.gobi2k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "Chrome OS Team"
-NAME = "3GLoadFirmware"
+NAME = "network_3GLoadFirmware.gobi2k"
 SUITE = "network3g"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
diff --git a/server/site_tests/network_3GLoadFirmware/control.gobi3k b/server/site_tests/network_3GLoadFirmware/control.gobi3k
index 88b86a1..199ce02 100644
--- a/server/site_tests/network_3GLoadFirmware/control.gobi3k
+++ b/server/site_tests/network_3GLoadFirmware/control.gobi3k
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "Chrome OS Team"
-NAME = "3GLoadFirmware"
+NAME = "network_3GLoadFirmware.gobi3k"
 SUITE = "network3g"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"