commit eeeb6a39a1b41719907011a1cff46020d4f80491
author Jesse McGuire <jessemcguire@google.com> Mon May 16 09:25:47 2022 -0700
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed May 18 06:29:07 2022 +0000
tree 756b72f50bc8dd3d8a000ed31c43b34b3f71c635
parent 77ca4ba85006dfb3cddc6c7cdd6fc854f6a6c1eb

autotest: 'Chrome OS' -> 'ChromeOS' control

Unify usage of 'Chrome OS' to 'ChromeOS' in autotest control files.

BUG=b:231760315
TEST=py_compile, CQ, unit tests

Change-Id: Iff5114dcf0cb07268dbf26ffe38aad77a9820bd8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3648577
Auto-Submit: Jesse McGuire <jessemcguire@google.com>
Reviewed-by: Jora Jacobi <jora@google.com>
Commit-Queue: Jora Jacobi <jora@google.com>
Tested-by: Jesse McGuire <jessemcguire@google.com>
Reviewed-by: Derek Beckett <dbeckett@chromium.org>

client/site_tests/camera_HAL3Perf/control

diff --git a/client/site_tests/camera_HAL3Perf/control b/client/site_tests/camera_HAL3Perf/control
index 2015656..03d921a 100644
--- a/client/site_tests/camera_HAL3Perf/control
+++ b/client/site_tests/camera_HAL3Perf/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team, chromeos-video@google.com"
+AUTHOR = "ChromeOS Team, chromeos-video@google.com"
 NAME = "camera_HAL3Perf"
 PURPOSE = "Monitor the performance of the camera HAL3."
 CRITERIA = """

client/site_tests/desktopui_ChromeCheck/control

diff --git a/client/site_tests/desktopui_ChromeCheck/control b/client/site_tests/desktopui_ChromeCheck/control
index b679dff..ecf9d00 100644
--- a/client/site_tests/desktopui_ChromeCheck/control
+++ b/client/site_tests/desktopui_ChromeCheck/control
@@ -33,7 +33,7 @@
 
 That's a fairly broad range of causes. They're all covered here with the intent
 of providing a single fast-running, minimally-flaky test that can be used to
-validate new versions of Chrome before integrating them into Chrome OS.
+validate new versions of Chrome before integrating them into ChromeOS.
 
 The info log provides high-level information about what the test is doing and
 can hopefully be used to narrow down the location of failure.

client/site_tests/desktopui_FontCache/control

diff --git a/client/site_tests/desktopui_FontCache/control b/client/site_tests/desktopui_FontCache/control
index fd34e8e..c511a48 100644
--- a/client/site_tests/desktopui_FontCache/control
+++ b/client/site_tests/desktopui_FontCache/control
@@ -7,7 +7,7 @@
 # To re-enable migrate to Python 3.
 # If the test is not migrated by 1/14/22 it will be deleted.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "desktopui_FontCache"
 PURPOSE = "Test font cache freshness."
 CRITERIA = """

client/site_tests/desktopui_ScreenLocker/control

diff --git a/client/site_tests/desktopui_ScreenLocker/control b/client/site_tests/desktopui_ScreenLocker/control
index 905f8cb..af9481e 100644
--- a/client/site_tests/desktopui_ScreenLocker/control
+++ b/client/site_tests/desktopui_ScreenLocker/control
@@ -7,7 +7,7 @@
 # To re-enable migrate to Python 3.
 # If the test is not migrated by 1/14/22 it will be deleted.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "desktopui_ScreenLocker"
 PURPOSE = "Verify screen locker is functional."
 CRITERIA = """
@@ -29,5 +29,3 @@
 """
 
 job.run_test('desktopui_ScreenLocker')
-
-

client/site_tests/detachablebase_TriggerHammerd/control

diff --git a/client/site_tests/detachablebase_TriggerHammerd/control b/client/site_tests/detachablebase_TriggerHammerd/control
index d71031a..5b519b8 100644
--- a/client/site_tests/detachablebase_TriggerHammerd/control
+++ b/client/site_tests/detachablebase_TriggerHammerd/control
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "detachablebase_TriggerHammerd"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 PURPOSE = "Check hammerd starts correctly on boot."
 CRITERIA = "This test will fail if hammerd returns non-zero value."
 TIME = "SHORT"

client/site_tests/dummy_Fail/control

diff --git a/client/site_tests/dummy_Fail/control b/client/site_tests/dummy_Fail/control
index 8d564ee..7cf3fda 100644
--- a/client/site_tests/dummy_Fail/control
+++ b/client/site_tests/dummy_Fail/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "dummy_Fail"
 PURPOSE = "Demonstrate failure methods of autotests."
 CRITERIA = "This test will never succeed."
@@ -26,4 +26,3 @@
 job.run_test('dummy_Fail', tag='Warn', to_throw='TestWarn')
 job.run_test('dummy_Fail', tag='NAError', to_throw='TestNAError')
 job.run_test('dummy_Fail', tag='Crash', to_throw=None)
-

client/site_tests/dummy_Fail/control.dependency

diff --git a/client/site_tests/dummy_Fail/control.dependency b/client/site_tests/dummy_Fail/control.dependency
index a956c7c..abb0e1f 100644
--- a/client/site_tests/dummy_Fail/control.dependency
+++ b/client/site_tests/dummy_Fail/control.dependency
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "dummy_Fail.dependency"
 PURPOSE = """
 Test if dependency is properly processed, the test should be shown as TEST_NA in

client/site_tests/hardware_GPS/control

diff --git a/client/site_tests/hardware_GPS/control b/client/site_tests/hardware_GPS/control
index 5525e64..07cb92f 100644
--- a/client/site_tests/hardware_GPS/control
+++ b/client/site_tests/hardware_GPS/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "hardware_GPS"
 PURPOSE = "Verify basic functionality of a GPS device."
 CRITERIA = """

client/site_tests/hardware_GobiGPS/control

diff --git a/client/site_tests/hardware_GobiGPS/control b/client/site_tests/hardware_GobiGPS/control
index 4fbc465..4dbaea2 100644
--- a/client/site_tests/hardware_GobiGPS/control
+++ b/client/site_tests/hardware_GobiGPS/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "hardware_GobiGPS"
 PURPOSE = "Verify basic functionality of a Gobi GPS device."
 CRITERIA = """

client/site_tests/hardware_Keyboard/control

diff --git a/client/site_tests/hardware_Keyboard/control b/client/site_tests/hardware_Keyboard/control
index 65ede2a..70579c4 100644
--- a/client/site_tests/hardware_Keyboard/control
+++ b/client/site_tests/hardware_Keyboard/control
@@ -11,7 +11,7 @@
 DOC = """
 This test uses a modified version of evtest to probe for and test the keyboard.
 The test finds the keyboard event in /dev/input/, and queries to ensure that
-the driver presents all of the expected Chrome OS keyboard keys.
+the driver presents all of the expected ChromeOS keyboard keys.
 """
 
 job.run_test('hardware_Keyboard')

client/site_tests/hardware_TPMCheck/control

diff --git a/client/site_tests/hardware_TPMCheck/control b/client/site_tests/hardware_TPMCheck/control
index 665a0d3..4f11050 100644
--- a/client/site_tests/hardware_TPMCheck/control
+++ b/client/site_tests/hardware_TPMCheck/control
@@ -6,7 +6,7 @@
 NAME = "hardware_TPMCheck"
 ATTRIBUTES = "suite:kernel_per-build_regression, suite:pvs-kernel"
 PURPOSE = "Basic check of the TPM state"
-CRITERIA = "Check that the TPM is in the expected state for use in Chrome OS."
+CRITERIA = "Check that the TPM is in the expected state for use in ChromeOS."
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "Hardware"

client/site_tests/infra_PythonVersion/control.3

diff --git a/client/site_tests/infra_PythonVersion/control.3 b/client/site_tests/infra_PythonVersion/control.3
index 3e00c91..8417d0f 100644
--- a/client/site_tests/infra_PythonVersion/control.3
+++ b/client/site_tests/infra_PythonVersion/control.3
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "infra_PythonVersion.3"
 PURPOSE = "Verify the python version running the test"
 TIME = "SHORT"

client/site_tests/logging_CrashServices/control

diff --git a/client/site_tests/logging_CrashServices/control b/client/site_tests/logging_CrashServices/control
index 453d057..89458bc 100644
--- a/client/site_tests/logging_CrashServices/control
+++ b/client/site_tests/logging_CrashServices/control
@@ -15,7 +15,7 @@
 PY_VERSION = 3
 
 DOC = """
-Crash all valid Chrome OS processes from an allowlist, and confirm
+Crash all valid ChromeOS processes from an allowlist, and confirm
 that *.dmp, *.meta, and *.core files are created.
 """
 

client/site_tests/logging_UserCrash/control

diff --git a/client/site_tests/logging_UserCrash/control b/client/site_tests/logging_UserCrash/control
index 97facd9..d9dbf48 100644
--- a/client/site_tests/logging_UserCrash/control
+++ b/client/site_tests/logging_UserCrash/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "logging_UserCrash"
 PURPOSE = "Verify user space crashes are handled appropriately."
 CRITERIA = """

client/site_tests/login_GaiaLogin/control.plt

diff --git a/client/site_tests/login_GaiaLogin/control.plt b/client/site_tests/login_GaiaLogin/control.plt
index cd11e55..12bf444 100644
--- a/client/site_tests/login_GaiaLogin/control.plt
+++ b/client/site_tests/login_GaiaLogin/control.plt
@@ -4,7 +4,7 @@
 
 from autotest_lib.client.common_lib.cros import power_load_util
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "login_GaiaLogin.plt"
 ATTRIBUTES = "suite:power_daily"
 TIME = "SHORT"

client/site_tests/platform_BootPerf/control

diff --git a/client/site_tests/platform_BootPerf/control b/client/site_tests/platform_BootPerf/control
index 077df9b..b784cd2 100644
--- a/client/site_tests/platform_BootPerf/control
+++ b/client/site_tests/platform_BootPerf/control
@@ -7,7 +7,7 @@
 # To re-enable migrate to Python 3.
 # If the test is not migrated by 1/14/22 it will be deleted.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "platform_BootPerf"
 PURPOSE = "Collect boot performance metrics from the last system reboot."
 CRITERIA = """

client/site_tests/platform_EncryptedStateful/control

diff --git a/client/site_tests/platform_EncryptedStateful/control b/client/site_tests/platform_EncryptedStateful/control
index d342756..5076f8b 100644
--- a/client/site_tests/platform_EncryptedStateful/control
+++ b/client/site_tests/platform_EncryptedStateful/control
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_EncryptedStateful"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 PURPOSE = "Verify mount-encrypted operates as expected"
 CRITERIA = """
 Fails if the mount-encrypted helper does not operated as expected

client/site_tests/platform_HighResTimers/control

diff --git a/client/site_tests/platform_HighResTimers/control b/client/site_tests/platform_HighResTimers/control
index 4704560..ad9714f 100644
--- a/client/site_tests/platform_HighResTimers/control
+++ b/client/site_tests/platform_HighResTimers/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "platform_HighResTimers"
 PURPOSE = "Ensure the high resolution timers are working."
 CRITERIA = "Fails if no timers have nanosecond resolution."

client/site_tests/platform_KernelVersion/control

diff --git a/client/site_tests/platform_KernelVersion/control b/client/site_tests/platform_KernelVersion/control
index df36657..b730a09 100644
--- a/client/site_tests/platform_KernelVersion/control
+++ b/client/site_tests/platform_KernelVersion/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "platform_KernelVersion"
 PURPOSE = "Ensure the running kernel is supported."
 CRITERIA = "Fails if the running kernel version is older than kernel_version."

client/site_tests/platform_ToolchainTests/control

diff --git a/client/site_tests/platform_ToolchainTests/control b/client/site_tests/platform_ToolchainTests/control
index e36d048..ef1880b 100644
--- a/client/site_tests/platform_ToolchainTests/control
+++ b/client/site_tests/platform_ToolchainTests/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "platform_ToolchainTests"
 
 PURPOSE = """

client/site_tests/power_BatteryCharge/control

diff --git a/client/site_tests/power_BatteryCharge/control b/client/site_tests/power_BatteryCharge/control
index abe6a35..9e579ab 100644
--- a/client/site_tests/power_BatteryCharge/control
+++ b/client/site_tests/power_BatteryCharge/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_BatteryCharge"
 PURPOSE = "Measure the time required to charge the battery."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_BatteryCharge/control.args

diff --git a/client/site_tests/power_BatteryCharge/control.args b/client/site_tests/power_BatteryCharge/control.args
index c3f0270..47b4faf 100644
--- a/client/site_tests/power_BatteryCharge/control.args
+++ b/client/site_tests/power_BatteryCharge/control.args
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_BatteryCharge.args"
 PURPOSE = "Measure the time required to charge the battery."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_BatteryDrain/control

diff --git a/client/site_tests/power_BatteryDrain/control b/client/site_tests/power_BatteryDrain/control
index 8c98bd0..3a2f974 100644
--- a/client/site_tests/power_BatteryDrain/control
+++ b/client/site_tests/power_BatteryDrain/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_BatteryDrain"
 PURPOSE = "Drain the battery quickly, as a utility for other tests."
 CRITERIA = """

client/site_tests/power_CPUFreq/control

diff --git a/client/site_tests/power_CPUFreq/control b/client/site_tests/power_CPUFreq/control
index a7eede6..23e99d9 100644
--- a/client/site_tests/power_CPUFreq/control
+++ b/client/site_tests/power_CPUFreq/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_CPUFreq"
 PURPOSE = "Verify that supported CPU frequencies can be set."
 CRITERIA = """

client/site_tests/power_CPUIdle/control

diff --git a/client/site_tests/power_CPUIdle/control b/client/site_tests/power_CPUIdle/control
index 0a098d4..663324e 100644
--- a/client/site_tests/power_CPUIdle/control
+++ b/client/site_tests/power_CPUIdle/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_CPUIdle"
 PURPOSE = "Ensure the processor drops into idle state when it is idle."
 CRITERIA = "Fails if the cpu did not have any idle cycles during this test."

client/site_tests/power_Display/control

diff --git a/client/site_tests/power_Display/control b/client/site_tests/power_Display/control
index 3b74998..b7572a8 100644
--- a/client/site_tests/power_Display/control
+++ b/client/site_tests/power_Display/control
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Display"
 PURPOSE = "Measure display power usage."
 

client/site_tests/power_Display/control.brightness

diff --git a/client/site_tests/power_Display/control.brightness b/client/site_tests/power_Display/control.brightness
index 84ec755..ac095f0 100644
--- a/client/site_tests/power_Display/control.brightness
+++ b/client/site_tests/power_Display/control.brightness
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Display.brightness"
 PURPOSE = "Measure display power usage at each brightness."
 
@@ -11,7 +11,7 @@
 
 DOC = """
 This test records power related statistics while displaying different static
-pages with each of Chrome OS's 16 brightness levels.
+pages with each of ChromeOS's 16 brightness levels.
 """
 
 BRIGHTNESS_PAGES = ['white', 'black', 'checker1']

client/site_tests/power_Display/control.cabc

diff --git a/client/site_tests/power_Display/control.cabc b/client/site_tests/power_Display/control.cabc
index ba0935a..1558403 100644
--- a/client/site_tests/power_Display/control.cabc
+++ b/client/site_tests/power_Display/control.cabc
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Display.cabc"
 PURPOSE = "Measure display power usage."
 

client/site_tests/power_Display/control.cabc_max_brightness

diff --git a/client/site_tests/power_Display/control.cabc_max_brightness b/client/site_tests/power_Display/control.cabc_max_brightness
index 4abd568..487c450 100644
--- a/client/site_tests/power_Display/control.cabc_max_brightness
+++ b/client/site_tests/power_Display/control.cabc_max_brightness
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Display.cabc_max_brightness"
 PURPOSE = "Measure display power usage."
 

client/site_tests/power_Display/control.fast

diff --git a/client/site_tests/power_Display/control.fast b/client/site_tests/power_Display/control.fast
index 761217e..adca0e6 100644
--- a/client/site_tests/power_Display/control.fast
+++ b/client/site_tests/power_Display/control.fast
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Display.fast"
 PURPOSE = "Measure display power usage."
 

client/site_tests/power_Display/control.max_brightness

diff --git a/client/site_tests/power_Display/control.max_brightness b/client/site_tests/power_Display/control.max_brightness
index 9423f37..7c18a21 100644
--- a/client/site_tests/power_Display/control.max_brightness
+++ b/client/site_tests/power_Display/control.max_brightness
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Display.max_brightness"
 PURPOSE = "Measure display power usage."
 

client/site_tests/power_Draw/control

diff --git a/client/site_tests/power_Draw/control b/client/site_tests/power_Draw/control
index 7f13b6e..aa0ad75 100644
--- a/client/site_tests/power_Draw/control
+++ b/client/site_tests/power_Draw/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Draw"
 PURPOSE = "Measure how much power is drawn over a given amount of time."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_Draw/control.aquarium

diff --git a/client/site_tests/power_Draw/control.aquarium b/client/site_tests/power_Draw/control.aquarium
index d243f4f..ef17840 100644
--- a/client/site_tests/power_Draw/control.aquarium
+++ b/client/site_tests/power_Draw/control.aquarium
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Draw.Aquarium"
 PURPOSE = "Stress system similar to Factory Run-in."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_Dummy/control

diff --git a/client/site_tests/power_Dummy/control b/client/site_tests/power_Dummy/control
index c5e8670..b59da29 100644
--- a/client/site_tests/power_Dummy/control
+++ b/client/site_tests/power_Dummy/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Dummy"
 PURPOSE = "Dummy client test for testing power autotest infrastructures."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_HotCPUSuspend/control

diff --git a/client/site_tests/power_HotCPUSuspend/control b/client/site_tests/power_HotCPUSuspend/control
index e06f4df..c661c1f 100644
--- a/client/site_tests/power_HotCPUSuspend/control
+++ b/client/site_tests/power_HotCPUSuspend/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_HotCPUSuspend"
 ATTRIBUTES = "suite:kernel_daily_regression"
 TIME = "SHORT"

client/site_tests/power_Idle/control

diff --git a/client/site_tests/power_Idle/control b/client/site_tests/power_Idle/control
index a3336e1..7e23dd1 100644
--- a/client/site_tests/power_Idle/control
+++ b/client/site_tests/power_Idle/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Idle"
 PURPOSE = "Measure power usage when system is idle."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_Idle/control.1sec

diff --git a/client/site_tests/power_Idle/control.1sec b/client/site_tests/power_Idle/control.1sec
index 45c053e..4b1eeb2 100644
--- a/client/site_tests/power_Idle/control.1sec
+++ b/client/site_tests/power_Idle/control.1sec
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Idle.1sec"
 PURPOSE = "Measure power usage when system is idle."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_Idle/control.fast

diff --git a/client/site_tests/power_Idle/control.fast b/client/site_tests/power_Idle/control.fast
index 5c21e4b..13c588b 100644
--- a/client/site_tests/power_Idle/control.fast
+++ b/client/site_tests/power_Idle/control.fast
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Idle.fast"
 PURPOSE = "Measure power usage when system is idle."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_Idle/control.perf

diff --git a/client/site_tests/power_Idle/control.perf b/client/site_tests/power_Idle/control.perf
index 7397409..d3e3c43 100644
--- a/client/site_tests/power_Idle/control.perf
+++ b/client/site_tests/power_Idle/control.perf
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Idle.perf"
 PURPOSE = "Measure power usage when system is idle with perf enabled."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_KernelSuspend/control

diff --git a/client/site_tests/power_KernelSuspend/control b/client/site_tests/power_KernelSuspend/control
index e865795..70ebd44 100644
--- a/client/site_tests/power_KernelSuspend/control
+++ b/client/site_tests/power_KernelSuspend/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.client.common_lib import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_KernelSuspend"
 ATTRIBUTES = "suite:jailed_build"
 TIME = "SHORT"

client/site_tests/power_LoadTest/control

diff --git a/client/site_tests/power_LoadTest/control b/client/site_tests/power_LoadTest/control
index 1d4929b..2c011a3 100755
--- a/client/site_tests/power_LoadTest/control
+++ b/client/site_tests/power_LoadTest/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest"
 PURPOSE = "Measure power draw when system is under load."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_LoadTest/control.1hour

diff --git a/client/site_tests/power_LoadTest/control.1hour b/client/site_tests/power_LoadTest/control.1hour
index ee2f3cb..6372fc6 100644
--- a/client/site_tests/power_LoadTest/control.1hour
+++ b/client/site_tests/power_LoadTest/control.1hour
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.1hour"
 PURPOSE = "Measure power draw when system is under load."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_LoadTest/control.1hour_cellular

diff --git a/client/site_tests/power_LoadTest/control.1hour_cellular b/client/site_tests/power_LoadTest/control.1hour_cellular
index ff04ef3..5236a34 100644
--- a/client/site_tests/power_LoadTest/control.1hour_cellular
+++ b/client/site_tests/power_LoadTest/control.1hour_cellular
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.1hour_cellular"
 PURPOSE = "Measure power draw when system is under load."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_LoadTest/control.FDO_eth_1hr

diff --git a/client/site_tests/power_LoadTest/control.FDO_eth_1hr b/client/site_tests/power_LoadTest/control.FDO_eth_1hr
index 56cce40..a2e56aa 100755
--- a/client/site_tests/power_LoadTest/control.FDO_eth_1hr
+++ b/client/site_tests/power_LoadTest/control.FDO_eth_1hr
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.FDO_eth_1hr"
 ATTRIBUTES = "suite:power_daily"
 PURPOSE = "Measure power draw when system is under load."

client/site_tests/power_LoadTest/control.FDO_eth_fast

diff --git a/client/site_tests/power_LoadTest/control.FDO_eth_fast b/client/site_tests/power_LoadTest/control.FDO_eth_fast
index d6c4826..968060d 100644
--- a/client/site_tests/power_LoadTest/control.FDO_eth_fast
+++ b/client/site_tests/power_LoadTest/control.FDO_eth_fast
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.FDO_eth_fast"
 PURPOSE = "Test health of power load test functionality."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_LoadTest/control.WIRED_10min_acok

diff --git a/client/site_tests/power_LoadTest/control.WIRED_10min_acok b/client/site_tests/power_LoadTest/control.WIRED_10min_acok
index a0d8cb5..77a0746 100644
--- a/client/site_tests/power_LoadTest/control.WIRED_10min_acok
+++ b/client/site_tests/power_LoadTest/control.WIRED_10min_acok
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.WIRED_10min_acok"
 ATTRIBUTES = "suite:power_daily"
 PURPOSE = "Measure power draw when system is under load."

client/site_tests/power_LoadTest/control.WIRED_1hr_acok

diff --git a/client/site_tests/power_LoadTest/control.WIRED_1hr_acok b/client/site_tests/power_LoadTest/control.WIRED_1hr_acok
index b5486fe..5347059 100644
--- a/client/site_tests/power_LoadTest/control.WIRED_1hr_acok
+++ b/client/site_tests/power_LoadTest/control.WIRED_1hr_acok
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.WIRED_1hr_acok"
 ATTRIBUTES = "suite:debug_kernel_testing"
 PURPOSE = "Measure power draw when system is under load."

client/site_tests/power_LoadTest/control.docs_1hour

diff --git a/client/site_tests/power_LoadTest/control.docs_1hour b/client/site_tests/power_LoadTest/control.docs_1hour
index 01815df..857129e 100644
--- a/client/site_tests/power_LoadTest/control.docs_1hour
+++ b/client/site_tests/power_LoadTest/control.docs_1hour
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.docs_1hour"
 PURPOSE = "Measure power draw when system is under load."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_LoadTest/control.email_1hour

diff --git a/client/site_tests/power_LoadTest/control.email_1hour b/client/site_tests/power_LoadTest/control.email_1hour
index a9d6413..b9db054 100644
--- a/client/site_tests/power_LoadTest/control.email_1hour
+++ b/client/site_tests/power_LoadTest/control.email_1hour
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.email_1hour"
 PURPOSE = "Measure power draw when system is under load."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_LoadTest/control.eth_1hour

diff --git a/client/site_tests/power_LoadTest/control.eth_1hour b/client/site_tests/power_LoadTest/control.eth_1hour
index 195123c..ec3d088 100644
--- a/client/site_tests/power_LoadTest/control.eth_1hour
+++ b/client/site_tests/power_LoadTest/control.eth_1hour
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.eth_1hour"
 ATTRIBUTES = ""
 PURPOSE = "Measure power draw when system is under load."

client/site_tests/power_LoadTest/control.fast

diff --git a/client/site_tests/power_LoadTest/control.fast b/client/site_tests/power_LoadTest/control.fast
index 39b1c9a..4826751 100644
--- a/client/site_tests/power_LoadTest/control.fast
+++ b/client/site_tests/power_LoadTest/control.fast
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.fast"
 PURPOSE = "Test health of power load test functionality."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_LoadTest/control.fast_gaia

diff --git a/client/site_tests/power_LoadTest/control.fast_gaia b/client/site_tests/power_LoadTest/control.fast_gaia
index 9bc926d..81dd703 100644
--- a/client/site_tests/power_LoadTest/control.fast_gaia
+++ b/client/site_tests/power_LoadTest/control.fast_gaia
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.fast_gaia"
 PURPOSE = "Test health of power load test functionality."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_LoadTest/control.force_discharge

diff --git a/client/site_tests/power_LoadTest/control.force_discharge b/client/site_tests/power_LoadTest/control.force_discharge
index c9788ec..ae2e08c 100755
--- a/client/site_tests/power_LoadTest/control.force_discharge
+++ b/client/site_tests/power_LoadTest/control.force_discharge
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.force_discharge"
 PURPOSE = "Measure power draw when system is under load."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_LoadTest/control.force_discharge_eth_1hr

diff --git a/client/site_tests/power_LoadTest/control.force_discharge_eth_1hr b/client/site_tests/power_LoadTest/control.force_discharge_eth_1hr
index 7644b90..4b28c9b 100755
--- a/client/site_tests/power_LoadTest/control.force_discharge_eth_1hr
+++ b/client/site_tests/power_LoadTest/control.force_discharge_eth_1hr
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.force_discharge_eth_1hr"
 PURPOSE = "Measure power draw when system is under load."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_LoadTest/control.single_page

diff --git a/client/site_tests/power_LoadTest/control.single_page b/client/site_tests/power_LoadTest/control.single_page
index d600310..85ac313 100644
--- a/client/site_tests/power_LoadTest/control.single_page
+++ b/client/site_tests/power_LoadTest/control.single_page
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.single_page"
 PURPOSE = "Measure power draw when system is under load."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_LoadTest/control.video_1hour

diff --git a/client/site_tests/power_LoadTest/control.video_1hour b/client/site_tests/power_LoadTest/control.video_1hour
index a8d8cec..8099ecd4 100644
--- a/client/site_tests/power_LoadTest/control.video_1hour
+++ b/client/site_tests/power_LoadTest/control.video_1hour
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.video_1hour"
 PURPOSE = "Measure power draw when system is under load."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_LoadTest/control.web_1hour

diff --git a/client/site_tests/power_LoadTest/control.web_1hour b/client/site_tests/power_LoadTest/control.web_1hour
index d821c5f..4d47d25 100644
--- a/client/site_tests/power_LoadTest/control.web_1hour
+++ b/client/site_tests/power_LoadTest/control.web_1hour
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_LoadTest.web_1hour"
 PURPOSE = "Measure power draw when system is under load."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_ProbeDriver/control.probe_ac

diff --git a/client/site_tests/power_ProbeDriver/control.probe_ac b/client/site_tests/power_ProbeDriver/control.probe_ac
index 79f1531..2b7889b 100644
--- a/client/site_tests/power_ProbeDriver/control.probe_ac
+++ b/client/site_tests/power_ProbeDriver/control.probe_ac
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_ProbeDriver.probe_ac"
 ATTRIBUTES = "suite:power_build"
 PURPOSE = "Confirm that AC driver is loaded and functioning."

client/site_tests/power_ProbeDriver/control.probe_bat

diff --git a/client/site_tests/power_ProbeDriver/control.probe_bat b/client/site_tests/power_ProbeDriver/control.probe_bat
index 6cfa5f4..28998be 100644
--- a/client/site_tests/power_ProbeDriver/control.probe_bat
+++ b/client/site_tests/power_ProbeDriver/control.probe_bat
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_ProbeDriver.probe_bat"
 PURPOSE = "Confirm that battery driver is loaded and functioning."
 CRITERIA = """\

client/site_tests/power_Resume/control

diff --git a/client/site_tests/power_Resume/control b/client/site_tests/power_Resume/control
index 696e67c..9d0d00e 100644
--- a/client/site_tests/power_Resume/control
+++ b/client/site_tests/power_Resume/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Resume"
 PURPOSE = "Measure the amount of time it takes to resume from suspend."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_Resume/control.iterations

diff --git a/client/site_tests/power_Resume/control.iterations b/client/site_tests/power_Resume/control.iterations
index 7031188..5fe9b7b 100644
--- a/client/site_tests/power_Resume/control.iterations
+++ b/client/site_tests/power_Resume/control.iterations
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Resume.iterations"
 PURPOSE = "Measure the amount of time it takes to resume from suspend."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_Resume/control.resume_constraint

diff --git a/client/site_tests/power_Resume/control.resume_constraint b/client/site_tests/power_Resume/control.resume_constraint
index ab5bc65..93af426 100644
--- a/client/site_tests/power_Resume/control.resume_constraint
+++ b/client/site_tests/power_Resume/control.resume_constraint
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Resume.resume_constraint"
 PURPOSE = "Measure the amount of time it takes to resume from suspend."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_Resume/control.resumewrapfreeze

diff --git a/client/site_tests/power_Resume/control.resumewrapfreeze b/client/site_tests/power_Resume/control.resumewrapfreeze
index edc54ca..722ad17 100644
--- a/client/site_tests/power_Resume/control.resumewrapfreeze
+++ b/client/site_tests/power_Resume/control.resumewrapfreeze
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_ResumeWrapFreeze"
 PURPOSE = "Measure the amount of time it takes to resume from suspend."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_Resume/control.resumewrapmem

diff --git a/client/site_tests/power_Resume/control.resumewrapmem b/client/site_tests/power_Resume/control.resumewrapmem
index dc2efbe..0b72bc2 100644
--- a/client/site_tests/power_Resume/control.resumewrapmem
+++ b/client/site_tests/power_Resume/control.resumewrapmem
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_ResumeWrapMem"
 PURPOSE = "Measure the amount of time it takes to resume from suspend."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_Standby/control

diff --git a/client/site_tests/power_Standby/control b/client/site_tests/power_Standby/control
index f6dd4e5..ab6e73b 100644
--- a/client/site_tests/power_Standby/control
+++ b/client/site_tests/power_Standby/control
@@ -4,7 +4,7 @@
 
 import re
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Standby"
 TIME = "LONG"
 TEST_CATEGORY = "Benchmark"

client/site_tests/power_Standby/control.1hour

diff --git a/client/site_tests/power_Standby/control.1hour b/client/site_tests/power_Standby/control.1hour
index 7ff9be7..6c65e69 100644
--- a/client/site_tests/power_Standby/control.1hour
+++ b/client/site_tests/power_Standby/control.1hour
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Standby.1hour"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Benchmark"

client/site_tests/power_Standby/control.36sec

diff --git a/client/site_tests/power_Standby/control.36sec b/client/site_tests/power_Standby/control.36sec
index b5cdfcd..9bf871b 100644
--- a/client/site_tests/power_Standby/control.36sec
+++ b/client/site_tests/power_Standby/control.36sec
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Standby.36sec"
 TIME = "SHORT"
 TEST_CATEGORY = "Benchmark"

client/site_tests/power_Standby/control.6min

diff --git a/client/site_tests/power_Standby/control.6min b/client/site_tests/power_Standby/control.6min
index d88e09e..b2aaa6e 100644
--- a/client/site_tests/power_Standby/control.6min
+++ b/client/site_tests/power_Standby/control.6min
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Standby.6min"
 TIME = "SHORT"
 TEST_CATEGORY = "Benchmark"

client/site_tests/power_Standby/control.fast

diff --git a/client/site_tests/power_Standby/control.fast b/client/site_tests/power_Standby/control.fast
index 96a94d0..21b668f 100644
--- a/client/site_tests/power_Standby/control.fast
+++ b/client/site_tests/power_Standby/control.fast
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Standby.fast"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Benchmark"

client/site_tests/power_Standby/control.fast_force_discharge

diff --git a/client/site_tests/power_Standby/control.fast_force_discharge b/client/site_tests/power_Standby/control.fast_force_discharge
index 8f88169..b80597f 100644
--- a/client/site_tests/power_Standby/control.fast_force_discharge
+++ b/client/site_tests/power_Standby/control.fast_force_discharge
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Standby.fast_force_discharge"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Benchmark"

client/site_tests/power_Standby/control.fast_suspend_to_idle

diff --git a/client/site_tests/power_Standby/control.fast_suspend_to_idle b/client/site_tests/power_Standby/control.fast_suspend_to_idle
index 600a7e2..931194f 100644
--- a/client/site_tests/power_Standby/control.fast_suspend_to_idle
+++ b/client/site_tests/power_Standby/control.fast_suspend_to_idle
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Standby.fast_suspend_to_idle"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Benchmark"

client/site_tests/power_Standby/control.fast_suspend_to_ram

diff --git a/client/site_tests/power_Standby/control.fast_suspend_to_ram b/client/site_tests/power_Standby/control.fast_suspend_to_ram
index 0c0a415..282e0f2 100644
--- a/client/site_tests/power_Standby/control.fast_suspend_to_ram
+++ b/client/site_tests/power_Standby/control.fast_suspend_to_ram
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_Standby.fast_suspend_to_ram"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Benchmark"

client/site_tests/power_StatsCPUFreq/control

diff --git a/client/site_tests/power_StatsCPUFreq/control b/client/site_tests/power_StatsCPUFreq/control
index 3cbee26..71681bd 100644
--- a/client/site_tests/power_StatsCPUFreq/control
+++ b/client/site_tests/power_StatsCPUFreq/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_StatsCPUFreq"
 ATTRIBUTES = "suite:power_build"
 PURPOSE = "Measure time spent at each CPU Frequency when system is idle."

client/site_tests/power_SuspendStress/control.4hours

diff --git a/client/site_tests/power_SuspendStress/control.4hours b/client/site_tests/power_SuspendStress/control.4hours
index d43bd5b..011e939 100644
--- a/client/site_tests/power_SuspendStress/control.4hours
+++ b/client/site_tests/power_SuspendStress/control.4hours
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_SuspendStress.4hours"
 ATTRIBUTES = "suite:jailed_build"
 PURPOSE = "Run repeated iterations of suspend/resume to find rare errors."

client/site_tests/power_SuspendToIdle/control

diff --git a/client/site_tests/power_SuspendToIdle/control b/client/site_tests/power_SuspendToIdle/control
index 75b20c0..a28c103 100644
--- a/client/site_tests/power_SuspendToIdle/control
+++ b/client/site_tests/power_SuspendToIdle/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_SuspendToIdle"
 PURPOSE = "Verify the suspend to idle is working."
 TIME = "SHORT"

client/site_tests/power_SuspendToIdle/control.force

diff --git a/client/site_tests/power_SuspendToIdle/control.force b/client/site_tests/power_SuspendToIdle/control.force
index a203c45..33f52e6 100644
--- a/client/site_tests/power_SuspendToIdle/control.force
+++ b/client/site_tests/power_SuspendToIdle/control.force
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_SuspendToIdle.force"
 PURPOSE = "Verify the suspend to idle is working."
 TIME = "SHORT"

client/site_tests/power_UiResume/control

diff --git a/client/site_tests/power_UiResume/control b/client/site_tests/power_UiResume/control
index 15098d2..c86fd44 100644
--- a/client/site_tests/power_UiResume/control
+++ b/client/site_tests/power_UiResume/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_UiResume"
 PURPOSE = "Measure the amount of time it takes to resume from suspend."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_UiResume/control.no_arc

diff --git a/client/site_tests/power_UiResume/control.no_arc b/client/site_tests/power_UiResume/control.no_arc
index 9070f6b..48bf18d 100644
--- a/client/site_tests/power_UiResume/control.no_arc
+++ b/client/site_tests/power_UiResume/control.no_arc
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_UiResume.no_arc"
 PURPOSE = "Measure the amount of time it takes to resume from suspend."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_UiResume/control.resume_constraint

diff --git a/client/site_tests/power_UiResume/control.resume_constraint b/client/site_tests/power_UiResume/control.resume_constraint
index 75ff7eb..96501b9 100644
--- a/client/site_tests/power_UiResume/control.resume_constraint
+++ b/client/site_tests/power_UiResume/control.resume_constraint
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_UiResume.resume_constraint"
 PURPOSE = "Measure the amount of time it takes to resume from suspend."
 CRITERIA = "This test is a benchmark."

client/site_tests/power_VideoPlayback/control

diff --git a/client/site_tests/power_VideoPlayback/control b/client/site_tests/power_VideoPlayback/control
index c7d8803..2fb1c14 100644
--- a/client/site_tests/power_VideoPlayback/control
+++ b/client/site_tests/power_VideoPlayback/control
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_VideoPlayback"
 PURPOSE = "Measure video playback power usage."
 

client/site_tests/power_VideoPlayback/control.FDO

diff --git a/client/site_tests/power_VideoPlayback/control.FDO b/client/site_tests/power_VideoPlayback/control.FDO
index 33cfc3e..a29f9bb 100644
--- a/client/site_tests/power_VideoPlayback/control.FDO
+++ b/client/site_tests/power_VideoPlayback/control.FDO
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_VideoPlayback.FDO"
 PURPOSE = "Measure video playback power usage."
 

client/site_tests/power_VideoPlayback/control.FDO_fast

diff --git a/client/site_tests/power_VideoPlayback/control.FDO_fast b/client/site_tests/power_VideoPlayback/control.FDO_fast
index 110babc..0cbc38e 100644
--- a/client/site_tests/power_VideoPlayback/control.FDO_fast
+++ b/client/site_tests/power_VideoPlayback/control.FDO_fast
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_VideoPlayback.FDO_fast"
 PURPOSE = "Measure video playback power usage."
 

client/site_tests/power_VideoPlayback/control.fast

diff --git a/client/site_tests/power_VideoPlayback/control.fast b/client/site_tests/power_VideoPlayback/control.fast
index 12f99ec..2408d93 100644
--- a/client/site_tests/power_VideoPlayback/control.fast
+++ b/client/site_tests/power_VideoPlayback/control.fast
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_VideoPlayback.fast"
 PURPOSE = "Measure video playback power usage."
 

client/site_tests/power_VideoPlayback/control.h264_1080_30fps

diff --git a/client/site_tests/power_VideoPlayback/control.h264_1080_30fps b/client/site_tests/power_VideoPlayback/control.h264_1080_30fps
index b94f84c..b6d8ca0 100644
--- a/client/site_tests/power_VideoPlayback/control.h264_1080_30fps
+++ b/client/site_tests/power_VideoPlayback/control.h264_1080_30fps
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_VideoPlayback.h264_1080_30fps"
 PURPOSE = "Measure video playback power usage."
 

client/site_tests/power_VideoPlayback/control.powerqual

diff --git a/client/site_tests/power_VideoPlayback/control.powerqual b/client/site_tests/power_VideoPlayback/control.powerqual
index 0f9d04f..5d06ce7 100644
--- a/client/site_tests/power_VideoPlayback/control.powerqual
+++ b/client/site_tests/power_VideoPlayback/control.powerqual
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_VideoPlayback.powerqual"
 PURPOSE = "Measure video playback power usage."
 

client/site_tests/power_VideoPlayback/control.sw_decoder

diff --git a/client/site_tests/power_VideoPlayback/control.sw_decoder b/client/site_tests/power_VideoPlayback/control.sw_decoder
index 280d43a..796fe5c 100644
--- a/client/site_tests/power_VideoPlayback/control.sw_decoder
+++ b/client/site_tests/power_VideoPlayback/control.sw_decoder
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_VideoPlayback.sw_decoder"
 PURPOSE = "Measure video playback power usage."
 

client/site_tests/power_VideoPlayback/control.sw_decoder_FDO

diff --git a/client/site_tests/power_VideoPlayback/control.sw_decoder_FDO b/client/site_tests/power_VideoPlayback/control.sw_decoder_FDO
index e2947fa..94e0b3e 100644
--- a/client/site_tests/power_VideoPlayback/control.sw_decoder_FDO
+++ b/client/site_tests/power_VideoPlayback/control.sw_decoder_FDO
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_VideoPlayback.sw_decoder_FDO"
 PURPOSE = "Measure video playback power usage."
 

client/site_tests/power_VideoPlayback/control.sw_decoder_fast

diff --git a/client/site_tests/power_VideoPlayback/control.sw_decoder_fast b/client/site_tests/power_VideoPlayback/control.sw_decoder_fast
index 27c9a4a..785d713 100644
--- a/client/site_tests/power_VideoPlayback/control.sw_decoder_fast
+++ b/client/site_tests/power_VideoPlayback/control.sw_decoder_fast
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_VideoPlayback.sw_decoder_fast"
 PURPOSE = "Measure video playback power usage."
 

client/site_tests/power_VideoPlayback/control.vp9_1080_30fps

diff --git a/client/site_tests/power_VideoPlayback/control.vp9_1080_30fps b/client/site_tests/power_VideoPlayback/control.vp9_1080_30fps
index 5e2565f..ff4a89b 100644
--- a/client/site_tests/power_VideoPlayback/control.vp9_1080_30fps
+++ b/client/site_tests/power_VideoPlayback/control.vp9_1080_30fps
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_VideoPlayback.vp9_1080_30fps"
 PURPOSE = "Measure video playback power usage."
 

client/site_tests/power_VideoSuspend/control

diff --git a/client/site_tests/power_VideoSuspend/control b/client/site_tests/power_VideoSuspend/control
index c166798..96bee12 100644
--- a/client/site_tests/power_VideoSuspend/control
+++ b/client/site_tests/power_VideoSuspend/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_VideoSuspend"
 ATTRIBUTES = "suite:kernel_daily_regression, suite:video"
 TIME = "SHORT"

client/site_tests/power_VideoSuspend/control.multiformat

diff --git a/client/site_tests/power_VideoSuspend/control.multiformat b/client/site_tests/power_VideoSuspend/control.multiformat
index 68ea447..78f8f44 100644
--- a/client/site_tests/power_VideoSuspend/control.multiformat
+++ b/client/site_tests/power_VideoSuspend/control.multiformat
@@ -7,7 +7,7 @@
 # To re-enable migrate to Python 3.
 # If the test is not migrated by 1/14/22 it will be deleted.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_VideoSuspend.multiformat"
 #TODO: move back to suite:kernel_daily_regression when test stable.
 ATTRIBUTES = "suite:experimental"

client/site_tests/power_WifiIdle/control

diff --git a/client/site_tests/power_WifiIdle/control b/client/site_tests/power_WifiIdle/control
index 1ab2ba8..e34b302 100644
--- a/client/site_tests/power_WifiIdle/control
+++ b/client/site_tests/power_WifiIdle/control
@@ -1,4 +1,4 @@
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_WifiIdle"
 PURPOSE = "Measure power usage with wifi on or off."
 

client/site_tests/stub_Pass/control

diff --git a/client/site_tests/stub_Pass/control b/client/site_tests/stub_Pass/control
index 5c4b0bc..fef509d 100644
--- a/client/site_tests/stub_Pass/control
+++ b/client/site_tests/stub_Pass/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "stub_Pass"
 PURPOSE = "Demonstrate success methods of autotests."
 CRITERIA = "This test will always succeed."

client/site_tests/stub_Pass/control.actionable

diff --git a/client/site_tests/stub_Pass/control.actionable b/client/site_tests/stub_Pass/control.actionable
index 447ea3d..f63ea3c 100644
--- a/client/site_tests/stub_Pass/control.actionable
+++ b/client/site_tests/stub_Pass/control.actionable
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "stub_Pass.actionable"
 PURPOSE = "Demonstrate success methods of autotests."
 CRITERIA = "This test will always succeed."

client/site_tests/stub_Pass/control.bluetooth

diff --git a/client/site_tests/stub_Pass/control.bluetooth b/client/site_tests/stub_Pass/control.bluetooth
index bfc9218..1b4d162 100755
--- a/client/site_tests/stub_Pass/control.bluetooth
+++ b/client/site_tests/stub_Pass/control.bluetooth
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "stub_Pass.bluetooth"
 PURPOSE = "Demonstrate DEPENDENCIES in autotests."
 CRITERIA = "This test will always succeed."

client/site_tests/stub_Pass/control.experimental

diff --git a/client/site_tests/stub_Pass/control.experimental b/client/site_tests/stub_Pass/control.experimental
index 881bf5d..855d458 100644
--- a/client/site_tests/stub_Pass/control.experimental
+++ b/client/site_tests/stub_Pass/control.experimental
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "stub_Pass.experimental"
 PURPOSE = "Demonstrate success methods of autotests."
 CRITERIA = "This test will always succeed."

client/site_tests/stub_Pass/control.wifichaos

diff --git a/client/site_tests/stub_Pass/control.wifichaos b/client/site_tests/stub_Pass/control.wifichaos
index 849462f..1bd8291 100644
--- a/client/site_tests/stub_Pass/control.wifichaos
+++ b/client/site_tests/stub_Pass/control.wifichaos
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "stub_Pass.wifichaos"
 PURPOSE = "To re-image chaos_dut machines nightly."
 CRITERIA = "This test will always succeed."

client/site_tests/suite_HWQual/control.auto

diff --git a/client/site_tests/suite_HWQual/control.auto b/client/site_tests/suite_HWQual/control.auto
index 04fdf5f..7bd7712 100644
--- a/client/site_tests/suite_HWQual/control.auto
+++ b/client/site_tests/suite_HWQual/control.auto
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "HWQualAuto"
 TIME = "LONG"
 TEST_CATEGORY = "Functional"

client/site_tests/suite_HWQual/control.battery_charge_time

diff --git a/client/site_tests/suite_HWQual/control.battery_charge_time b/client/site_tests/suite_HWQual/control.battery_charge_time
index f0c1e69..b788bd0 100644
--- a/client/site_tests/suite_HWQual/control.battery_charge_time
+++ b/client/site_tests/suite_HWQual/control.battery_charge_time
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "HWQualBatteryChargeTime"
 TIME = "LONG"
 TEST_CATEGORY = "Benchmark"

client/site_tests/suite_HWQual/control.battery_load

diff --git a/client/site_tests/suite_HWQual/control.battery_load b/client/site_tests/suite_HWQual/control.battery_load
index 5a92dda..2ff5e84 100644
--- a/client/site_tests/suite_HWQual/control.battery_load
+++ b/client/site_tests/suite_HWQual/control.battery_load
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "suite_HWQual.power_LoadTest"
 PURPOSE = "Measure power draw when system is under load."
 CRITERIA = "This test is a benchmark."

client/site_tests/suite_HWQual/control.keyboard

diff --git a/client/site_tests/suite_HWQual/control.keyboard b/client/site_tests/suite_HWQual/control.keyboard
index 2d86472..04b2d4f 100644
--- a/client/site_tests/suite_HWQual/control.keyboard
+++ b/client/site_tests/suite_HWQual/control.keyboard
@@ -11,7 +11,7 @@
 DOC = """
 This test uses a modified version of evtest to probe for and test the keyboard.
 The test finds the keyboard event in /dev/input/, and queries to ensure that
-the driver presents all of the expected Chrome OS keyboard keys.
+the driver presents all of the expected ChromeOS keyboard keys.
 """
 
 job.run_test('hardware_Keyboard')

client/site_tests/suite_HWQual/control.max_power_draw

diff --git a/client/site_tests/suite_HWQual/control.max_power_draw b/client/site_tests/suite_HWQual/control.max_power_draw
index 0cf86fa..d830f7a 100644
--- a/client/site_tests/suite_HWQual/control.max_power_draw
+++ b/client/site_tests/suite_HWQual/control.max_power_draw
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "suite_HWQual.power_Draw"
 PURPOSE = "Measure how much power is drawn over a given amount of time."
 CRITERIA = "This test is a benchmark."

client/site_tests/suite_HWQual/control.probe_ac

diff --git a/client/site_tests/suite_HWQual/control.probe_ac b/client/site_tests/suite_HWQual/control.probe_ac
index 55026ed..ce3cd65 100644
--- a/client/site_tests/suite_HWQual/control.probe_ac
+++ b/client/site_tests/suite_HWQual/control.probe_ac
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "suite_HWQual.probe_ac"
 ATTRIBUTES = "suite:power_build"
 PURPOSE = "Confirm that AC driver is loaded and functioning."

client/site_tests/suite_HWQual/control.probe_bat

diff --git a/client/site_tests/suite_HWQual/control.probe_bat b/client/site_tests/suite_HWQual/control.probe_bat
index 8a6862c..671a04f 100644
--- a/client/site_tests/suite_HWQual/control.probe_bat
+++ b/client/site_tests/suite_HWQual/control.probe_bat
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "suite_HWQual.probe_bat"
 PURPOSE = "Confirm that battery driver is loaded and functioning."
 CRITERIA = """\

client/site_tests/suite_TPM/control

diff --git a/client/site_tests/suite_TPM/control b/client/site_tests/suite_TPM/control
index 01340e9..293a98d 100644
--- a/client/site_tests/suite_TPM/control
+++ b/client/site_tests/suite_TPM/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "suite_TPM.TPMSmogcheck"
 PURPOSE = "Execute automated TPM functionality checks."
 TIME = "SHORT"  # <= 15 minutes in execution

client/site_tests/telemetry_Check/control

diff --git a/client/site_tests/telemetry_Check/control b/client/site_tests/telemetry_Check/control
index 932e6f7..e2836eb 100644
--- a/client/site_tests/telemetry_Check/control
+++ b/client/site_tests/telemetry_Check/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "telemetry_Check"
 PURPOSE = "Run telemetry_check.py."
 CRITERIA = """

server/site_tests/audio_AudioNodeSwitch/control

diff --git a/server/site_tests/audio_AudioNodeSwitch/control b/server/site_tests/audio_AudioNodeSwitch/control
index 2a10d48..55eb462 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control
+++ b/server/site_tests/audio_AudioNodeSwitch/control
@@ -6,7 +6,7 @@
 from autotest_lib.client.cros.chameleon import chameleon_audio_ids
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "audio_AudioNodeSwitch"
 PURPOSE = "Check if correct audio channel selected."
 CRITERIA = "This test will fail if expected audio channel is not selected."

server/site_tests/audio_AudioNodeSwitch/control.HDMI

diff --git a/server/site_tests/audio_AudioNodeSwitch/control.HDMI b/server/site_tests/audio_AudioNodeSwitch/control.HDMI
index 36fe818..743e69e 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control.HDMI
+++ b/server/site_tests/audio_AudioNodeSwitch/control.HDMI
@@ -6,7 +6,7 @@
 from autotest_lib.client.cros.chameleon import chameleon_audio_ids
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "audio_AudioNodeSwitch.HDMI"
 PURPOSE = "Check if correct audio channel selected."
 CRITERIA = "This test will fail if expected audio channel is not selected."

server/site_tests/audio_AudioNodeSwitch/control.HDMI_JACK_USB

diff --git a/server/site_tests/audio_AudioNodeSwitch/control.HDMI_JACK_USB b/server/site_tests/audio_AudioNodeSwitch/control.HDMI_JACK_USB
index 3d6a4cb..1d5a1c7 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control.HDMI_JACK_USB
+++ b/server/site_tests/audio_AudioNodeSwitch/control.HDMI_JACK_USB
@@ -6,7 +6,7 @@
 from autotest_lib.client.cros.chameleon import chameleon_audio_ids
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "audio_AudioNodeSwitch.HDMI_JACK_USB"
 PURPOSE = "Check if correct audio channel selected."
 CRITERIA = "This test will fail if expected audio channel is not selected."

server/site_tests/audio_AudioNodeSwitch/control.HDMI_USB

diff --git a/server/site_tests/audio_AudioNodeSwitch/control.HDMI_USB b/server/site_tests/audio_AudioNodeSwitch/control.HDMI_USB
index 1d0bdaa..a589f6b 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control.HDMI_USB
+++ b/server/site_tests/audio_AudioNodeSwitch/control.HDMI_USB
@@ -6,7 +6,7 @@
 from autotest_lib.client.cros.chameleon import chameleon_audio_ids
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "audio_AudioNodeSwitch.HDMI_USB"
 PURPOSE = "Check if correct audio channel selected."
 CRITERIA = "This test will fail if expected audio channel is not selected."

server/site_tests/audio_AudioNodeSwitch/control.JACK

diff --git a/server/site_tests/audio_AudioNodeSwitch/control.JACK b/server/site_tests/audio_AudioNodeSwitch/control.JACK
index 51577cc..5477b4e 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control.JACK
+++ b/server/site_tests/audio_AudioNodeSwitch/control.JACK
@@ -6,7 +6,7 @@
 from autotest_lib.client.cros.chameleon import chameleon_audio_ids
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "audio_AudioNodeSwitch.JACK"
 PURPOSE = "Check if correct audio channel selected."
 CRITERIA = "This test will fail if expected audio channel is not selected."

server/site_tests/audio_AudioNodeSwitch/control.JACK_HDMI

diff --git a/server/site_tests/audio_AudioNodeSwitch/control.JACK_HDMI b/server/site_tests/audio_AudioNodeSwitch/control.JACK_HDMI
index a617681..af6b534 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control.JACK_HDMI
+++ b/server/site_tests/audio_AudioNodeSwitch/control.JACK_HDMI
@@ -6,7 +6,7 @@
 from autotest_lib.client.cros.chameleon import chameleon_audio_ids
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "audio_AudioNodeSwitch.JACK_HDMI"
 PURPOSE = "Check if correct audio channel selected."
 CRITERIA = "This test will fail if expected audio channel is not selected."

server/site_tests/audio_AudioNodeSwitch/control.JACK_USB

diff --git a/server/site_tests/audio_AudioNodeSwitch/control.JACK_USB b/server/site_tests/audio_AudioNodeSwitch/control.JACK_USB
index 54f85d7..943e676 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control.JACK_USB
+++ b/server/site_tests/audio_AudioNodeSwitch/control.JACK_USB
@@ -6,7 +6,7 @@
 from autotest_lib.client.cros.chameleon import chameleon_audio_ids
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "audio_AudioNodeSwitch.JACK_USB"
 PURPOSE = "Check if correct audio channel selected."
 CRITERIA = "This test will fail if expected audio channel is not selected."

server/site_tests/audio_AudioNodeSwitch/control.USB

diff --git a/server/site_tests/audio_AudioNodeSwitch/control.USB b/server/site_tests/audio_AudioNodeSwitch/control.USB
index e9d11bc..296a640 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control.USB
+++ b/server/site_tests/audio_AudioNodeSwitch/control.USB
@@ -6,7 +6,7 @@
 from autotest_lib.client.cros.chameleon import chameleon_audio_ids
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "audio_AudioNodeSwitch.USB"
 PURPOSE = "Check if correct audio channel selected."
 CRITERIA = "This test will fail if expected audio channel is not selected."

server/site_tests/autoupdate_CatchBadSignatures/control

diff --git a/server/site_tests/autoupdate_CatchBadSignatures/control b/server/site_tests/autoupdate_CatchBadSignatures/control
index cccfc85..f8c7599 100644
--- a/server/site_tests/autoupdate_CatchBadSignatures/control
+++ b/server/site_tests/autoupdate_CatchBadSignatures/control
@@ -35,7 +35,7 @@
      $ ./build_packages --board=${BOARD}
      $ ./build_image --board=${BOARD} --noenable_rootfs_verification test
 
-     Alternatively, you can use any kind of Chrome OS image you already have or
+     Alternatively, you can use any kind of ChromeOS image you already have or
      downloaded.
 
   2. Reduce the size of Rootfs and Kernel partitions. This is done so these
@@ -53,7 +53,7 @@
      $ sudo mount /dev/loop1p3 rootfs
      $ sudo mount /dev/loop1p4 kernel
 
-     Now you need a lsb-release file copied from any Chrome OS.
+     Now you need a lsb-release file copied from any ChromeOS.
 
      $ mkdir rootfs/etc && touch cp <lsb-release> rootfs/etc
      $ touch kernel/fake-kernel.bin # Optional

server/site_tests/autoupdate_EndToEndTest/control

diff --git a/server/site_tests/autoupdate_EndToEndTest/control b/server/site_tests/autoupdate_EndToEndTest/control
index e1d71b5..152ee9c 100644
--- a/server/site_tests/autoupdate_EndToEndTest/control
+++ b/server/site_tests/autoupdate_EndToEndTest/control
@@ -20,8 +20,8 @@
 REQUIRE_SSP = False
 
 DOC = """
-This is an end-to-end update test of Chrome OS releases. Given a test
-configuration, it will perform an end-to-end test of a Chrome OS update
+This is an end-to-end update test of ChromeOS releases. Given a test
+configuration, it will perform an end-to-end test of a ChromeOS update
 payload. A test configuration can be given as command-line arguments (see
 below) or instantiated inline as local varibles.
 

server/site_tests/autoupdate_FromUI/control.full

diff --git a/server/site_tests/autoupdate_FromUI/control.full b/server/site_tests/autoupdate_FromUI/control.full
index 89d50fa..52cd8b2 100644
--- a/server/site_tests/autoupdate_FromUI/control.full
+++ b/server/site_tests/autoupdate_FromUI/control.full
@@ -13,7 +13,7 @@
 PY_VERSION = 3
 DOC = """
 This tests that an update can be triggered by clicking the 'Check for updates'
-button in the Chrome OS Settings app.
+button in the ChromeOS Settings app.
 
 test_that <hostname>.cros autoupdate_FromUI.full --args="job_repo_url='http://<IP>:<port>/static/<board>-release/RXX-XXXX.X.X/autotest/packages'"
 """

server/site_tests/autoupdate_Rollback/control

diff --git a/server/site_tests/autoupdate_Rollback/control b/server/site_tests/autoupdate_Rollback/control
index 5a01ec4..92ddbd2 100644
--- a/server/site_tests/autoupdate_Rollback/control
+++ b/server/site_tests/autoupdate_Rollback/control
@@ -14,7 +14,7 @@
 PY_VERSION = 3
 
 DOC = """
-This is a rollback test for Chrome OS releases. It first updates a machine and
+This is a rollback test for ChromeOS releases. It first updates a machine and
 then invokes rollback to boot from its previously booted partition. It tests
 rollback using the update_engine_client rather than manipulating the UI.
 

server/site_tests/autoupdate_Rollback/control.powerwash_before_rollback

diff --git a/server/site_tests/autoupdate_Rollback/control.powerwash_before_rollback b/server/site_tests/autoupdate_Rollback/control.powerwash_before_rollback
index c5b8e0b..34e7b04 100644
--- a/server/site_tests/autoupdate_Rollback/control.powerwash_before_rollback
+++ b/server/site_tests/autoupdate_Rollback/control.powerwash_before_rollback
@@ -14,7 +14,7 @@
 PY_VERSION = 3
 
 DOC = """
-This is a rollback test for Chrome OS releases. It first updates a machine and
+This is a rollback test for ChromeOS releases. It first updates a machine and
 then invokes rollback to boot from its previously booted partition.
 
 It then powerwashes the device.

server/site_tests/bluetooth_AdapterPowerMeasure/control.pw_measurement_suspension_test

diff --git a/server/site_tests/bluetooth_AdapterPowerMeasure/control.pw_measurement_suspension_test b/server/site_tests/bluetooth_AdapterPowerMeasure/control.pw_measurement_suspension_test
index 4303d7d..584ce11 100644
--- a/server/site_tests/bluetooth_AdapterPowerMeasure/control.pw_measurement_suspension_test
+++ b/server/site_tests/bluetooth_AdapterPowerMeasure/control.pw_measurement_suspension_test
@@ -6,7 +6,7 @@
 from autotest_lib.server.cros.bluetooth import advertisements_data
 
 
-AUTHOR = 'Chrome OS Team'
+AUTHOR = 'ChromeOS Team'
 NAME = 'bluetooth_AdapterPowerMeasure.pw_measurement_suspension_test'
 PURPOSE = 'Test power consumption of Bluetooth chip during system suspension.'
 CRITERIA = 'Bluetooth chip should consume power less than specified.'

server/site_tests/bluetooth_AdapterPowerMeasure/control.suspension_100

diff --git a/server/site_tests/bluetooth_AdapterPowerMeasure/control.suspension_100 b/server/site_tests/bluetooth_AdapterPowerMeasure/control.suspension_100
index e520722..d8ed3ac 100644
--- a/server/site_tests/bluetooth_AdapterPowerMeasure/control.suspension_100
+++ b/server/site_tests/bluetooth_AdapterPowerMeasure/control.suspension_100
@@ -6,7 +6,7 @@
 from autotest_lib.server.cros.bluetooth import advertisements_data
 
 
-AUTHOR = 'Chrome OS Team'
+AUTHOR = 'ChromeOS Team'
 NAME = 'bluetooth_AdapterPowerMeasure.suspension_100'
 PURPOSE = 'Test power consumption of Bluetooth chip during system suspension.'
 CRITERIA = 'Bluetooth chip should consume power less than specified.'

server/site_tests/firmware_BaseECKeyboard/control

diff --git a/server/site_tests/firmware_BaseECKeyboard/control b/server/site_tests/firmware_BaseECKeyboard/control
index a0a3fed..46fdba9 100644
--- a/server/site_tests/firmware_BaseECKeyboard/control
+++ b/server/site_tests/firmware_BaseECKeyboard/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_BaseECKeyboard"
 PURPOSE = "Servo-based BaseEC keyboard test"
 CRITERIA = "This test will fail if BaseEC keyboard misbehaved."

server/site_tests/firmware_CgptStress/control

diff --git a/server/site_tests/firmware_CgptStress/control b/server/site_tests/firmware_CgptStress/control
index c228ec9..0bc7736 100644
--- a/server/site_tests/firmware_CgptStress/control
+++ b/server/site_tests/firmware_CgptStress/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CgptStress"
 PURPOSE = "Servo based cgpt stress test"
 CRITERIA = "This test will fail if changing cgpt fails to switch kernel"

server/site_tests/firmware_CgptStress/control.dev

diff --git a/server/site_tests/firmware_CgptStress/control.dev b/server/site_tests/firmware_CgptStress/control.dev
index 17c7f37..7fec8d7 100644
--- a/server/site_tests/firmware_CgptStress/control.dev
+++ b/server/site_tests/firmware_CgptStress/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CgptStress.dev"
 PURPOSE = "Servo based cgpt stress test"
 CRITERIA = "This test will fail if changing cgpt fails to switch kernel"

server/site_tests/firmware_ChipFwUpdate/control

diff --git a/server/site_tests/firmware_ChipFwUpdate/control b/server/site_tests/firmware_ChipFwUpdate/control
index e599c27..756ea52 100644
--- a/server/site_tests/firmware_ChipFwUpdate/control
+++ b/server/site_tests/firmware_ChipFwUpdate/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ChipFwUpdate"
 PURPOSE = "TCPC firmware update test."
 CRITERIA = "This test will pass if the updated bios.bin booted successfully."

server/site_tests/firmware_CompareChipFwToShellBall/control

diff --git a/server/site_tests/firmware_CompareChipFwToShellBall/control b/server/site_tests/firmware_CompareChipFwToShellBall/control
index bffcac6..d6cb4c0 100644
--- a/server/site_tests/firmware_CompareChipFwToShellBall/control
+++ b/server/site_tests/firmware_CompareChipFwToShellBall/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CompareChipFwToShellBall"
 PURPOSE = "Compare the chip firmware versions to those in the shellball"
 CRITERIA = "This test will pass if installed and available firmware match."

server/site_tests/firmware_ConsecutiveBoot/control

diff --git a/server/site_tests/firmware_ConsecutiveBoot/control b/server/site_tests/firmware_ConsecutiveBoot/control
index 9a43b9d..fff5b74 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control
+++ b/server/site_tests/firmware_ConsecutiveBoot/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveBoot"
 PURPOSE = "Servo based consecutive boot test"
 CRITERIA = "This test will fail if DUT fails to boot from power-off"
@@ -19,7 +19,7 @@
 
 DOC = """
 This test is intended to be run with many iterations to ensure that the DUT
-does boot into Chrome OS and then does power off later.
+does boot into ChromeOS and then does power off later.
 
 The iteration should be specified by the parameter -a "faft_iterations=10".
 """

server/site_tests/firmware_ConsecutiveBoot/control.100

diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.100 b/server/site_tests/firmware_ConsecutiveBoot/control.100
index 2591c79..93dd0f5 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.100
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.100
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveBoot.100"
 PURPOSE = "Servo based consecutive boot test (100 iterations)"
 CRITERIA = "This test will fail if DUT fails to boot from power-off"
@@ -18,7 +18,7 @@
 
 DOC = """
 This test is intended to be run with many iterations to ensure that the DUT
-does boot into Chrome OS and then does power off later.
+does boot into ChromeOS and then does power off later.
 
 Runs 100 boot iterations.
 """

server/site_tests/firmware_ConsecutiveBoot/control.1000

diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.1000 b/server/site_tests/firmware_ConsecutiveBoot/control.1000
index 1737e00..5850e12 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.1000
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.1000
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveBoot.1000"
 PURPOSE = "Servo based consecutive boot test (1000 iterations)"
 CRITERIA = "This test will fail if DUT fails to boot from power-off"
@@ -18,7 +18,7 @@
 
 DOC = """
 This test is intended to be run with many iterations to ensure that the DUT
-does boot into Chrome OS and then does power off later.
+does boot into ChromeOS and then does power off later.
 
 Runs 1000 iterations.
 """

server/site_tests/firmware_ConsecutiveBoot/control.2500

diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.2500 b/server/site_tests/firmware_ConsecutiveBoot/control.2500
index 2cc03e2..b877ef1 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.2500
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.2500
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveBoot.2500"
 PURPOSE = "Servo based consecutive boot test (2500 iterations)"
 CRITERIA = "This test will fail if DUT fails to boot from power-off"
@@ -18,7 +18,7 @@
 
 DOC = """
 This test is intended to be run with many iterations to ensure that the DUT
-does boot into Chrome OS and then does power off later.
+does boot into ChromeOS and then does power off later.
 
 Runs 2500 iterations.
 """

server/site_tests/firmware_ConsecutiveBoot/control.500

diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.500 b/server/site_tests/firmware_ConsecutiveBoot/control.500
index 90ebe9f..b5f2d03 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.500
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.500
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveBoot.500"
 PURPOSE = "Servo based consecutive boot test (500 iterations)"
 CRITERIA = "This test will fail if DUT fails to boot from power-off"
@@ -18,7 +18,7 @@
 
 DOC = """
 This test is intended to be run with many iterations to ensure that the DUT
-does boot into Chrome OS and then does power off later.
+does boot into ChromeOS and then does power off later.
 
 Runs 500 iterations.
 """

server/site_tests/firmware_ConsecutiveBoot/control.5000

diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.5000 b/server/site_tests/firmware_ConsecutiveBoot/control.5000
index 4b4568c..1150bd6 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.5000
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.5000
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveBoot.5000"
 PURPOSE = "Servo based consecutive boot test (5000 iterations)"
 CRITERIA = "This test will fail if DUT fails to boot from power-off"
@@ -18,7 +18,7 @@
 
 DOC = """
 This test is intended to be run with many iterations to ensure that the DUT
-does boot into Chrome OS and then does power off later.
+does boot into ChromeOS and then does power off later.
 
 Runs 5000 iterations.
 """

server/site_tests/firmware_ConsecutiveBoot/control.dev

diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.dev b/server/site_tests/firmware_ConsecutiveBoot/control.dev
index eb5230c..5e84771 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.dev
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveBoot.dev"
 PURPOSE = "Servo based consecutive boot test"
 CRITERIA = "This test will fail if DUT fails to boot from power-off"
@@ -18,7 +18,7 @@
 
 DOC = """
 This test is intended to be run with many iterations to ensure that the DUT
-does boot into Chrome OS and then does power off later in developer mode.
+does boot into ChromeOS and then does power off later in developer mode.
 
 The iteration should be specified by the parameter -a "faft_iterations=10".
 """

server/site_tests/firmware_ConsecutiveBoot/control.dev.100

diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.dev.100 b/server/site_tests/firmware_ConsecutiveBoot/control.dev.100
index 335b50b..9914e01 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.dev.100
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.dev.100
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveBoot.dev.100"
 PURPOSE = "Servo based consecutive boot test (100 iterations)"
 CRITERIA = "This test will fail if DUT fails to boot from power-off"
@@ -18,7 +18,7 @@
 
 DOC = """
 This test is intended to be run with many iterations to ensure that the DUT
-does boot into Chrome OS and then does power off later in developer mode.
+does boot into ChromeOS and then does power off later in developer mode.
 
 Runs 100 boot iterations.
 """

server/site_tests/firmware_ConsecutiveBoot/control.dev.1000

diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.dev.1000 b/server/site_tests/firmware_ConsecutiveBoot/control.dev.1000
index 4611875..f5b1554 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.dev.1000
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.dev.1000
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveBoot.dev.1000"
 PURPOSE = "Servo based consecutive boot test"
 CRITERIA = "This test will fail if DUT fails to boot from power-off"
@@ -18,7 +18,7 @@
 
 DOC = """
 This test is intended to be run with many iterations to ensure that the DUT
-does boot into Chrome OS and then does power off later in developer mode.
+does boot into ChromeOS and then does power off later in developer mode.
 
 Runs 1000 iterations in dev mode.
 """

server/site_tests/firmware_ConsecutiveBoot/control.dev.500

diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.dev.500 b/server/site_tests/firmware_ConsecutiveBoot/control.dev.500
index f54131d..d649047 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.dev.500
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.dev.500
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveBoot.dev.500"
 PURPOSE = "Servo based consecutive boot test"
 CRITERIA = "This test will fail if DUT fails to boot from power-off"
@@ -18,7 +18,7 @@
 
 DOC = """
 This test is intended to be run with many iterations to ensure that the DUT
-does boot into Chrome OS and then does power off later in developer mode.
+does boot into ChromeOS and then does power off later in developer mode.
 
 Runs 500 iterations in dev mode.
 """

server/site_tests/firmware_ConsecutiveBootPowerButton/control

diff --git a/server/site_tests/firmware_ConsecutiveBootPowerButton/control b/server/site_tests/firmware_ConsecutiveBootPowerButton/control
index 78567e2..350faf4 100644
--- a/server/site_tests/firmware_ConsecutiveBootPowerButton/control
+++ b/server/site_tests/firmware_ConsecutiveBootPowerButton/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveBootPowerButton"
 PURPOSE = "Servo based consecutive boot test"
 CRITERIA = "This test will fail if DUT fails to boot from power-off"
@@ -19,7 +19,7 @@
 
 DOC = """
 This test is intended to be run with many iterations to ensure that the DUT
-does boot into Chrome OS and then does power off later.
+does boot into ChromeOS and then does power off later.
 
 The iteration should be specified by the parameter -a "faft_iterations=10".
 """

server/site_tests/firmware_ConsecutiveBootPowerButton/control.100

diff --git a/server/site_tests/firmware_ConsecutiveBootPowerButton/control.100 b/server/site_tests/firmware_ConsecutiveBootPowerButton/control.100
index 43c797a..2e801d1 100644
--- a/server/site_tests/firmware_ConsecutiveBootPowerButton/control.100
+++ b/server/site_tests/firmware_ConsecutiveBootPowerButton/control.100
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveBootPowerButton.100"
 PURPOSE = "Servo based consecutive boot test (100 iterations)"
 CRITERIA = "This test will fail if DUT fails to boot from power-off"
@@ -18,7 +18,7 @@
 
 DOC = """
 This test is intended to be run with many iterations to ensure that the DUT
-does boot into Chrome OS and then does power off later.
+does boot into ChromeOS and then does power off later.
 
 Runs 100 boot iterations.
 """

server/site_tests/firmware_ConsecutiveBootPowerButton/control.dev

diff --git a/server/site_tests/firmware_ConsecutiveBootPowerButton/control.dev b/server/site_tests/firmware_ConsecutiveBootPowerButton/control.dev
index 55a0e83..fe3485a 100644
--- a/server/site_tests/firmware_ConsecutiveBootPowerButton/control.dev
+++ b/server/site_tests/firmware_ConsecutiveBootPowerButton/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveBootPowerButton.dev"
 PURPOSE = "Servo based consecutive boot test"
 CRITERIA = "This test will fail if DUT fails to boot from power-off"
@@ -18,7 +18,7 @@
 
 DOC = """
 This test is intended to be run with many iterations to ensure that the DUT
-does boot into Chrome OS and then does power off later in developer mode.
+does boot into ChromeOS and then does power off later in developer mode.
 
 The iteration should be specified by the parameter -a "faft_iterations=10".
 """

server/site_tests/firmware_ConsecutiveBootPowerButton/control.dev.100

diff --git a/server/site_tests/firmware_ConsecutiveBootPowerButton/control.dev.100 b/server/site_tests/firmware_ConsecutiveBootPowerButton/control.dev.100
index c8da16e..bbad912 100644
--- a/server/site_tests/firmware_ConsecutiveBootPowerButton/control.dev.100
+++ b/server/site_tests/firmware_ConsecutiveBootPowerButton/control.dev.100
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveBootPowerButton.dev.100"
 PURPOSE = "Servo based consecutive boot test"
 CRITERIA = "This test will fail if DUT fails to boot from power-off"
@@ -18,7 +18,7 @@
 
 DOC = """
 This test is intended to be run with many iterations to ensure that the DUT
-does boot into Chrome OS and then does power off later.
+does boot into ChromeOS and then does power off later.
 
 The iteration should be specified by the parameter -a "faft_iterations=10".
 """

server/site_tests/firmware_ConsecutiveLidSwitch/control

diff --git a/server/site_tests/firmware_ConsecutiveLidSwitch/control b/server/site_tests/firmware_ConsecutiveLidSwitch/control
index 982774b..9b814dc 100644
--- a/server/site_tests/firmware_ConsecutiveLidSwitch/control
+++ b/server/site_tests/firmware_ConsecutiveLidSwitch/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveLidSwitch"
 PURPOSE = "Servo based consecutive lid switch test"
 CRITERIA = "This test will fail if DUT fails to suspend/resume"

server/site_tests/firmware_ConsecutiveLidSwitch/control.100

diff --git a/server/site_tests/firmware_ConsecutiveLidSwitch/control.100 b/server/site_tests/firmware_ConsecutiveLidSwitch/control.100
index b733a55..5175e96 100644
--- a/server/site_tests/firmware_ConsecutiveLidSwitch/control.100
+++ b/server/site_tests/firmware_ConsecutiveLidSwitch/control.100
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ConsecutiveLidSwitch.100"
 PURPOSE = "Servo based consecutive lid switch test"
 CRITERIA = "This test will fail if DUT fails to suspend/resume"

server/site_tests/firmware_CorruptBothFwBodyAB/control

diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control b/server/site_tests/firmware_CorruptBothFwBodyAB/control
index 9792711..8b00195 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 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"
@@ -26,7 +26,7 @@
 not load and verify the RW firmware body. In the case USE_RO_NORMAL OFF,
 the firmware verification fails on loading RW firmware and enters recovery
 mode. In this case, it requires a USB disk plugged-in, which contains a
-Chrome OS test image (built by "build_image --test").
+ChromeOS test image (built by "build_image --test").
 """
 
 args_dict = utils.args_to_dict(args)

server/site_tests/firmware_CorruptBothFwBodyAB/control.dev

diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
index b5267d8..deaa6f7 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptBothFwBodyAB.dev"
 PURPOSE = "Servo based both firmware body A and B corruption test"
 CRITERIA = "This test will fail if firmware does not enter recovery mode"
@@ -25,7 +25,7 @@
 not load and verify the RW firmware body. In the case USE_RO_NORMAL OFF,
 the firmware verification fails on loading RW firmware and enters recovery
 mode. In this case, it requires a USB disk plugged-in, which contains a
-Chrome OS test image (built by "build_image --test").
+ChromeOS test image (built by "build_image --test").
 """
 
 args_dict = utils.args_to_dict(args)

server/site_tests/firmware_CorruptBothFwSigAB/control

diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control b/server/site_tests/firmware_CorruptBothFwSigAB/control
index bb236d2..d7539d8 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 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"
@@ -18,7 +18,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image --test"). On runtime, this test corrupts
 both firmware signature A and B. On next reboot, the firmware verification
 fails and enters recovery mode. This test then checks the success of the

server/site_tests/firmware_CorruptBothFwSigAB/control.dev

diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
index 0a81921..46b06db 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptBothFwSigAB.dev"
 PURPOSE = "Servo based both firmware signature A and B corruption test"
 CRITERIA = "This test will fail if firmware does not enter recovery mode"
@@ -17,7 +17,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image --test"). On runtime, this test corrupts
 both firmware signature A and B. On next reboot, the firmware verification
 fails and enters recovery mode. This test then checks the success of the

server/site_tests/firmware_CorruptBothKernelAB/control

diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control b/server/site_tests/firmware_CorruptBothKernelAB/control
index 3312fe0..d6b1614 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 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"
@@ -20,7 +20,7 @@
 DOC = """
 This test corrupts both kernel A and B and and checks for recovery boot.
 
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image --test"). On runtime, this test corrupts
 both kernel A and B. On next reboot, the kernel verification fails
 and enters recovery mode. This test then checks the success of the

server/site_tests/firmware_CorruptBothMiniosAB/control

diff --git a/server/site_tests/firmware_CorruptBothMiniosAB/control b/server/site_tests/firmware_CorruptBothMiniosAB/control
index 066f8de..b07f7a5 100644
--- a/server/site_tests/firmware_CorruptBothMiniosAB/control
+++ b/server/site_tests/firmware_CorruptBothMiniosAB/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptBothMiniosAB"
 PURPOSE = "Corrupt both MiniOS kernels, and ensure that we can not boot MiniOS"
 CRITERIA = "This test will fail if the device boots to MiniOS when both MiniOS kernels are corrupted"

server/site_tests/firmware_CorruptFwBodyA/control

diff --git a/server/site_tests/firmware_CorruptFwBodyA/control b/server/site_tests/firmware_CorruptFwBodyA/control
index 3ad805c..d5ff4b3 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control
+++ b/server/site_tests/firmware_CorruptFwBodyA/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptFwBodyA"
 PURPOSE = "Servo based firmware A body corruption test"
 CRITERIA = "This test will fail if firmware verification mis-behaved"

server/site_tests/firmware_CorruptFwBodyA/control.dev

diff --git a/server/site_tests/firmware_CorruptFwBodyA/control.dev b/server/site_tests/firmware_CorruptFwBodyA/control.dev
index 31da4fb..e0ebc65 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyA/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptFwBodyA.dev"
 PURPOSE = "Servo based firmware A body corruption test"
 CRITERIA = "This test will fail if firmware verification mis-behaved"

server/site_tests/firmware_CorruptFwBodyB/control

diff --git a/server/site_tests/firmware_CorruptFwBodyB/control b/server/site_tests/firmware_CorruptFwBodyB/control
index 60b17f2..3e9a0f1 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control
+++ b/server/site_tests/firmware_CorruptFwBodyB/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptFwBodyB"
 PURPOSE = "Servo based firmware B body corruption test"
 CRITERIA = "This test will fail if firmware verification mis-behaved"

server/site_tests/firmware_CorruptFwBodyB/control.dev

diff --git a/server/site_tests/firmware_CorruptFwBodyB/control.dev b/server/site_tests/firmware_CorruptFwBodyB/control.dev
index ac112a8..38279ad 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyB/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptFwBodyB.dev"
 PURPOSE = "Servo based firmware B body corruption test"
 CRITERIA = "This test will fail if firmware verification mis-behaved"

server/site_tests/firmware_CorruptFwSigA/control

diff --git a/server/site_tests/firmware_CorruptFwSigA/control b/server/site_tests/firmware_CorruptFwSigA/control
index a9183b1..dccfffd 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control
+++ b/server/site_tests/firmware_CorruptFwSigA/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptFwSigA"
 PURPOSE = "Servo based firmware A signature corruption test"
 CRITERIA = "This test will fail if firmware verification mis-behaved"

server/site_tests/firmware_CorruptFwSigA/control.dev

diff --git a/server/site_tests/firmware_CorruptFwSigA/control.dev b/server/site_tests/firmware_CorruptFwSigA/control.dev
index c430423..9d9f441 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigA/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptFwSigA.dev"
 PURPOSE = "Servo based firmware A signature corruption test"
 CRITERIA = "This test will fail if firmware verification mis-behaved"

server/site_tests/firmware_CorruptFwSigB/control

diff --git a/server/site_tests/firmware_CorruptFwSigB/control b/server/site_tests/firmware_CorruptFwSigB/control
index 02eecc9..a2ede48 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control
+++ b/server/site_tests/firmware_CorruptFwSigB/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptFwSigB"
 PURPOSE = "Servo based firmware signature B corruption test"
 CRITERIA = "This test will fail if firmware verification mis-behaved"

server/site_tests/firmware_CorruptFwSigB/control.dev

diff --git a/server/site_tests/firmware_CorruptFwSigB/control.dev b/server/site_tests/firmware_CorruptFwSigB/control.dev
index ff535dd..a0d2eca 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigB/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptFwSigB.dev"
 PURPOSE = "Servo based firmware signature B corruption test"
 CRITERIA = "This test will fail if firmware verification mis-behaved"

server/site_tests/firmware_CorruptKernelA/control

diff --git a/server/site_tests/firmware_CorruptKernelA/control b/server/site_tests/firmware_CorruptKernelA/control
index fd36931..3a7969f 100644
--- a/server/site_tests/firmware_CorruptKernelA/control
+++ b/server/site_tests/firmware_CorruptKernelA/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptKernelA"
 PURPOSE = "Servo based kernel A corruption test"
 CRITERIA = "This test will fail if kernel verification mis-behaved"

server/site_tests/firmware_CorruptKernelA/control.dev

diff --git a/server/site_tests/firmware_CorruptKernelA/control.dev b/server/site_tests/firmware_CorruptKernelA/control.dev
index 41ea550..fe7e527 100644
--- a/server/site_tests/firmware_CorruptKernelA/control.dev
+++ b/server/site_tests/firmware_CorruptKernelA/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptKernelA.dev"
 PURPOSE = "Servo based kernel A corruption test"
 CRITERIA = "This test will fail if kernel verification mis-behaved"

server/site_tests/firmware_CorruptKernelB/control

diff --git a/server/site_tests/firmware_CorruptKernelB/control b/server/site_tests/firmware_CorruptKernelB/control
index 74e21af..d1a33af 100644
--- a/server/site_tests/firmware_CorruptKernelB/control
+++ b/server/site_tests/firmware_CorruptKernelB/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptKernelB"
 PURPOSE = "Servo based kernel B corruption test"
 CRITERIA = "This test will fail if kernel verification mis-behaved"

server/site_tests/firmware_CorruptKernelB/control.dev

diff --git a/server/site_tests/firmware_CorruptKernelB/control.dev b/server/site_tests/firmware_CorruptKernelB/control.dev
index 84aebad..7b42583 100644
--- a/server/site_tests/firmware_CorruptKernelB/control.dev
+++ b/server/site_tests/firmware_CorruptKernelB/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptKernelB.dev"
 PURPOSE = "Servo based kernel B corruption test"
 CRITERIA = "This test will fail if kernel verification mis-behaved"

server/site_tests/firmware_CorruptMinios/control.minios_a

diff --git a/server/site_tests/firmware_CorruptMinios/control.minios_a b/server/site_tests/firmware_CorruptMinios/control.minios_a
index 1634559..52bfe4e 100644
--- a/server/site_tests/firmware_CorruptMinios/control.minios_a
+++ b/server/site_tests/firmware_CorruptMinios/control.minios_a
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptMinios.minios_a"
 PURPOSE = "Corrupt one MiniOS kernel, set the priority to that, and ensure that both priority can boot"
 CRITERIA = "This test will fail if the device fail to boot to MiniOS when one MiniOS kernel is corrupted"

server/site_tests/firmware_CorruptMinios/control.minios_b

diff --git a/server/site_tests/firmware_CorruptMinios/control.minios_b b/server/site_tests/firmware_CorruptMinios/control.minios_b
index 22342f0..20d4f37 100644
--- a/server/site_tests/firmware_CorruptMinios/control.minios_b
+++ b/server/site_tests/firmware_CorruptMinios/control.minios_b
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptMinios.minios_b"
 PURPOSE = "Corrupt one MiniOS kernel, set the priority to that, and ensure that both priority can boot"
 CRITERIA = "This test will fail if the device fail to boot to MiniOS when one MiniOS kernel is corrupted"

server/site_tests/firmware_CorruptRecoveryCache/control

diff --git a/server/site_tests/firmware_CorruptRecoveryCache/control b/server/site_tests/firmware_CorruptRecoveryCache/control
index 47f3aeb..6ba11c8 100644
--- a/server/site_tests/firmware_CorruptRecoveryCache/control
+++ b/server/site_tests/firmware_CorruptRecoveryCache/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptRecoveryCache"
 PURPOSE = "Servo based RECOVERY_MRC_CACHE corruption test"
 CRITERIA = "This test will fail if the cache doesn't retrain and boot into recovery"

server/site_tests/firmware_CorruptRecoveryCache/control.dev

diff --git a/server/site_tests/firmware_CorruptRecoveryCache/control.dev b/server/site_tests/firmware_CorruptRecoveryCache/control.dev
index e821b7f..1c830ad 100644
--- a/server/site_tests/firmware_CorruptRecoveryCache/control.dev
+++ b/server/site_tests/firmware_CorruptRecoveryCache/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_CorruptRecoveryCache.dev"
 PURPOSE = "Servo based RECOVERY_MRC_CACHE corruption test"
 CRITERIA = "This test will fail if the cache doesn't retrain and boot into recovery"

server/site_tests/firmware_Cr50DeferredECReset/control

diff --git a/server/site_tests/firmware_Cr50DeferredECReset/control b/server/site_tests/firmware_Cr50DeferredECReset/control
index 34ca0f0..e8b06c3 100644
--- a/server/site_tests/firmware_Cr50DeferredECReset/control
+++ b/server/site_tests/firmware_Cr50DeferredECReset/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Cr50DeferredECReset"
 PURPOSE = "Verify Deferred EC Reset."
 # TODO(b/139537748): should verify this test running on varius platforms

server/site_tests/firmware_Cr50DeferredECReset/control.faft_cr50_tot

diff --git a/server/site_tests/firmware_Cr50DeferredECReset/control.faft_cr50_tot b/server/site_tests/firmware_Cr50DeferredECReset/control.faft_cr50_tot
index 5cdb23f..d180cd2 100644
--- a/server/site_tests/firmware_Cr50DeferredECReset/control.faft_cr50_tot
+++ b/server/site_tests/firmware_Cr50DeferredECReset/control.faft_cr50_tot
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Cr50DeferredECReset.faft_cr50_tot"
 PURPOSE = "Verify Deferred EC Reset."
 # TODO(b/139537748): should verify this test running on varius platforms

server/site_tests/firmware_CsmeFwUpdate/control

diff --git a/server/site_tests/firmware_CsmeFwUpdate/control b/server/site_tests/firmware_CsmeFwUpdate/control
index 44c1648..26a3a29 100644
--- a/server/site_tests/firmware_CsmeFwUpdate/control
+++ b/server/site_tests/firmware_CsmeFwUpdate/control
@@ -4,7 +4,7 @@
 from autotest_lib.server import utils
 
 NAME = "firmware_CsmeFwUpdate"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 ATTRIBUTES = "suite:faft_bios"
 DEPENDENCIES = "servo_state:WORKING"
 TIME = "SHORT"

server/site_tests/firmware_CsmeFwUpdate/control.dev

diff --git a/server/site_tests/firmware_CsmeFwUpdate/control.dev b/server/site_tests/firmware_CsmeFwUpdate/control.dev
index bcbe053..27fbc29 100644
--- a/server/site_tests/firmware_CsmeFwUpdate/control.dev
+++ b/server/site_tests/firmware_CsmeFwUpdate/control.dev
@@ -4,7 +4,7 @@
 from autotest_lib.server import utils
 
 NAME = "firmware_CsmeFwUpdate.dev"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 ATTRIBUTES = "suite:faft_bios"
 DEPENDENCIES = "servo_state:WORKING"
 TIME = "SHORT"

server/site_tests/firmware_DevBootUSB/control

diff --git a/server/site_tests/firmware_DevBootUSB/control b/server/site_tests/firmware_DevBootUSB/control
index 0b5bad8..40cdcea 100644
--- a/server/site_tests/firmware_DevBootUSB/control
+++ b/server/site_tests/firmware_DevBootUSB/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_DevBootUSB"
 PURPOSE = "Press Ctrl-U on developer screen to boot USB disk"
 CRITERIA = "This test will fail if firmware does not boot USB disk"
@@ -18,7 +18,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image test"). On runtime, this test first switches
 DUT to developer mode. When dev_boot_usb=0, pressing Ctrl-U on developer
 screen should not boot the USB disk. When dev_boot_usb=1, pressing Ctrl-U

server/site_tests/firmware_DevDefaultBoot/control

diff --git a/server/site_tests/firmware_DevDefaultBoot/control b/server/site_tests/firmware_DevDefaultBoot/control
index 2b65a41..fafde3e 100644
--- a/server/site_tests/firmware_DevDefaultBoot/control
+++ b/server/site_tests/firmware_DevDefaultBoot/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_DevDefaultBoot"
 PURPOSE = "Ensure that dev_default_boot=usb actually boots usb by default"
 CRITERIA = "This test will fail if firmware does not boot USB disk by default"
@@ -18,7 +18,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged in, containing a Chrome OS test image.
+This test requires a USB disk plugged in, containing a ChromeOS test image.
 On runtime, this test first switches DUT to developer mode, and modifies
 the dev_default_boot crossystem value.
 After waiting at the dev warning, or pressing enter in the detachable UI dev

server/site_tests/firmware_DevMode/control

diff --git a/server/site_tests/firmware_DevMode/control b/server/site_tests/firmware_DevMode/control
index 33de6d8..a7610d4 100644
--- a/server/site_tests/firmware_DevMode/control
+++ b/server/site_tests/firmware_DevMode/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_DevMode"
 PURPOSE = "Servo based developer firmware boot test"
 CRITERIA = "This test will fail if firmware does not switch to developer mode"

server/site_tests/firmware_DevModeStress/control

diff --git a/server/site_tests/firmware_DevModeStress/control b/server/site_tests/firmware_DevModeStress/control
index fb84c64..d2dde34 100644
--- a/server/site_tests/firmware_DevModeStress/control
+++ b/server/site_tests/firmware_DevModeStress/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_DevModeStress"
 PURPOSE = "Servo based developer firmware boot test"
 CRITERIA = "This test will fail if firmware does not remain in developer mode"

server/site_tests/firmware_DevScreenTimeout/control

diff --git a/server/site_tests/firmware_DevScreenTimeout/control b/server/site_tests/firmware_DevScreenTimeout/control
index 992df3d..1c6856f 100644
--- a/server/site_tests/firmware_DevScreenTimeout/control
+++ b/server/site_tests/firmware_DevScreenTimeout/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_DevScreenTimeout"
 PURPOSE = "Servo based developer firmware screen timeout test"
 CRITERIA = "This test will fail if the timeout period does not match our spec."

server/site_tests/firmware_ECAdc/control

diff --git a/server/site_tests/firmware_ECAdc/control b/server/site_tests/firmware_ECAdc/control
index 7b7fe5b..033c3c2 100644
--- a/server/site_tests/firmware_ECAdc/control
+++ b/server/site_tests/firmware_ECAdc/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECAdc"
 PURPOSE = "Servo based EC ADC test"
 CRITERIA = "This test will fail if EC ADC misbehalved."

server/site_tests/firmware_ECBattery/control

diff --git a/server/site_tests/firmware_ECBattery/control b/server/site_tests/firmware_ECBattery/control
index 99acdb0..dbf7dbf 100644
--- a/server/site_tests/firmware_ECBattery/control
+++ b/server/site_tests/firmware_ECBattery/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECBattery"
 PURPOSE = "Servo based EC battery status report test"
 CRITERIA = "This test will fail if EC battery status report misbehalved."

server/site_tests/firmware_ECCbiEeprom/control

diff --git a/server/site_tests/firmware_ECCbiEeprom/control b/server/site_tests/firmware_ECCbiEeprom/control
index 19f953d..f079019 100644
--- a/server/site_tests/firmware_ECCbiEeprom/control
+++ b/server/site_tests/firmware_ECCbiEeprom/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECCbiEeprom"
 PURPOSE = "Servo-based CBI EEPRROM functionality test"
 CRITERIA = "Tests minimum requirements of CBI EEPROM, e.g. write protect."

server/site_tests/firmware_ECCharging/control

diff --git a/server/site_tests/firmware_ECCharging/control b/server/site_tests/firmware_ECCharging/control
index 46c1a19..b84f945a 100644
--- a/server/site_tests/firmware_ECCharging/control
+++ b/server/site_tests/firmware_ECCharging/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECCharging"
 PURPOSE = "Servo based EC charging control test"
 CRITERIA = "This test will fail if EC charging control misbehaved."

server/site_tests/firmware_ECHash/control

diff --git a/server/site_tests/firmware_ECHash/control b/server/site_tests/firmware_ECHash/control
index 0b8f3af..796b65d 100644
--- a/server/site_tests/firmware_ECHash/control
+++ b/server/site_tests/firmware_ECHash/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECHash"
 PURPOSE = "Servo based EC hash recompute test"
 CRITERIA = "This test will fail if EC failed to recompute its hash."

server/site_tests/firmware_ECKeyboard/control

diff --git a/server/site_tests/firmware_ECKeyboard/control b/server/site_tests/firmware_ECKeyboard/control
index 4dd5d22..80909cf 100644
--- a/server/site_tests/firmware_ECKeyboard/control
+++ b/server/site_tests/firmware_ECKeyboard/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECKeyboard"
 PURPOSE = "Servo based EC keyboard test"
 CRITERIA = "This test will fail if EC keyboard misbehalved."

server/site_tests/firmware_ECKeyboardReboot/control

diff --git a/server/site_tests/firmware_ECKeyboardReboot/control b/server/site_tests/firmware_ECKeyboardReboot/control
index 81ef88e..66bc7c6 100644
--- a/server/site_tests/firmware_ECKeyboardReboot/control
+++ b/server/site_tests/firmware_ECKeyboardReboot/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECKeyboardReboot"
 PURPOSE = "Servo based EC reboot test"
 CRITERIA = "This test will fail if failed to reboot via dut-control ec_uart_cmd:reboot."

server/site_tests/firmware_ECLidShutdown/control

diff --git a/server/site_tests/firmware_ECLidShutdown/control b/server/site_tests/firmware_ECLidShutdown/control
index e6bb341..9c1e982 100644
--- a/server/site_tests/firmware_ECLidShutdown/control
+++ b/server/site_tests/firmware_ECLidShutdown/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECLidShutdown"
 PURPOSE = "Verify functionality of DUT with GBB_FLAG_DISABLE_LID_SHUTDOWN"
 CRITERIA = "This test will ensure disable lid shutdown GBB flag working"

server/site_tests/firmware_ECLidSwitch/control

diff --git a/server/site_tests/firmware_ECLidSwitch/control b/server/site_tests/firmware_ECLidSwitch/control
index 1d86ea3..3f8f711 100644
--- a/server/site_tests/firmware_ECLidSwitch/control
+++ b/server/site_tests/firmware_ECLidSwitch/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECLidSwitch"
 PURPOSE = "Servo based EC lid switch functional test"
 CRITERIA = "This test will fail if EC lid switch misbehalved."

server/site_tests/firmware_ECPowerButton/control

diff --git a/server/site_tests/firmware_ECPowerButton/control b/server/site_tests/firmware_ECPowerButton/control
index 987b502..5ec4aa1 100644
--- a/server/site_tests/firmware_ECPowerButton/control
+++ b/server/site_tests/firmware_ECPowerButton/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECPowerButton"
 PURPOSE = "Servo based EC power button functional test"
 CRITERIA = "This test will fail if EC power button misbehalved."

server/site_tests/firmware_ECPowerG3/control

diff --git a/server/site_tests/firmware_ECPowerG3/control b/server/site_tests/firmware_ECPowerG3/control
index c2e948a..492ce77 100644
--- a/server/site_tests/firmware_ECPowerG3/control
+++ b/server/site_tests/firmware_ECPowerG3/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECPowerG3"
 PURPOSE = "Servo based EC X86 power G3 drop test"
 CRITERIA = "This test will fail if EC fails to drop to G3 correctly."

server/site_tests/firmware_ECRestoreFW/control

diff --git a/server/site_tests/firmware_ECRestoreFW/control b/server/site_tests/firmware_ECRestoreFW/control
index 26b9a51..0b10e3c 100644
--- a/server/site_tests/firmware_ECRestoreFW/control
+++ b/server/site_tests/firmware_ECRestoreFW/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECRestoreFW"
 PURPOSE = "Verify the FW restoration capability even from a bad state."
 ATTRIBUTES = ""

server/site_tests/firmware_ECSharedMem/control

diff --git a/server/site_tests/firmware_ECSharedMem/control b/server/site_tests/firmware_ECSharedMem/control
index 3c4b40c..e04bb33 100644
--- a/server/site_tests/firmware_ECSharedMem/control
+++ b/server/site_tests/firmware_ECSharedMem/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECSharedMem"
 PURPOSE = "Servo based EC shared memory test"
 CRITERIA = "This test will fail if EC shared memory misbehaved."

server/site_tests/firmware_ECSystemLocked/control

diff --git a/server/site_tests/firmware_ECSystemLocked/control b/server/site_tests/firmware_ECSystemLocked/control
index b0d74a3..18c7184 100644
--- a/server/site_tests/firmware_ECSystemLocked/control
+++ b/server/site_tests/firmware_ECSystemLocked/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECSystemLocked"
 PURPOSE = "Ensure that CONFIG_SYSTEM_UNLOCKED is unset."
 CRITERIA = "This test will fail if CONFIG_SYSTEM_UNLOCKED is set."

server/site_tests/firmware_ECThermal/control

diff --git a/server/site_tests/firmware_ECThermal/control b/server/site_tests/firmware_ECThermal/control
index 7bc4691..9bda43f 100644
--- a/server/site_tests/firmware_ECThermal/control
+++ b/server/site_tests/firmware_ECThermal/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECThermal"
 PURPOSE = "Servo based EC thermal engine test"
 CRITERIA = "This test will fail if EC thermal engine misbehalved."

server/site_tests/firmware_ECUpdateId/control

diff --git a/server/site_tests/firmware_ECUpdateId/control b/server/site_tests/firmware_ECUpdateId/control
index 93f53df..e438b77 100644
--- a/server/site_tests/firmware_ECUpdateId/control
+++ b/server/site_tests/firmware_ECUpdateId/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECUpdateId"
 PURPOSE = "Servo based EC test for updating EC ID for verifying EC EFS"
 CRITERIA = "This test will fail if EC EFS misbehaves"

server/site_tests/firmware_ECUpdateId/control.dev

diff --git a/server/site_tests/firmware_ECUpdateId/control.dev b/server/site_tests/firmware_ECUpdateId/control.dev
index f8ef312..b758abf 100644
--- a/server/site_tests/firmware_ECUpdateId/control.dev
+++ b/server/site_tests/firmware_ECUpdateId/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECUpdateId.dev"
 PURPOSE = "Servo based EC test for updating EC ID for verifying EC EFS"
 CRITERIA = "This test will fail if EC EFS misbehaves"

server/site_tests/firmware_ECUsbPorts/control

diff --git a/server/site_tests/firmware_ECUsbPorts/control b/server/site_tests/firmware_ECUsbPorts/control
index 6d60860..3eee7df 100644
--- a/server/site_tests/firmware_ECUsbPorts/control
+++ b/server/site_tests/firmware_ECUsbPorts/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECUsbPorts"
 PURPOSE = "Servo based EC USB ports test"
 CRITERIA = "This test will fail if EC USB port control misbehalved."

server/site_tests/firmware_ECWakeFromULP/control

diff --git a/server/site_tests/firmware_ECWakeFromULP/control b/server/site_tests/firmware_ECWakeFromULP/control
index 4a396a6..6c39bac 100644
--- a/server/site_tests/firmware_ECWakeFromULP/control
+++ b/server/site_tests/firmware_ECWakeFromULP/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECWakeFromULP"
 PURPOSE = "Servo based EC wake from ULP test"
 CRITERIA = "This test will fail if EC wake source misbehaved."

server/site_tests/firmware_ECWakeSource/control

diff --git a/server/site_tests/firmware_ECWakeSource/control b/server/site_tests/firmware_ECWakeSource/control
index d25d825..8ea83c4 100644
--- a/server/site_tests/firmware_ECWakeSource/control
+++ b/server/site_tests/firmware_ECWakeSource/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECWakeSource"
 PURPOSE = "Servo based EC wake source test"
 CRITERIA = "This test will fail if EC wake source misbehalved."

server/site_tests/firmware_ECWatchdog/control

diff --git a/server/site_tests/firmware_ECWatchdog/control b/server/site_tests/firmware_ECWatchdog/control
index cda3c06..d0fea30 100644
--- a/server/site_tests/firmware_ECWatchdog/control
+++ b/server/site_tests/firmware_ECWatchdog/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_ECWatchdog"
 PURPOSE = "Servo based EC watchdog test"
 CRITERIA = "This test will fail if EC watchdog misbehalved."

server/site_tests/firmware_FAFTSetup/control

diff --git a/server/site_tests/firmware_FAFTSetup/control b/server/site_tests/firmware_FAFTSetup/control
index f6facf5..23a3a6f 100644
--- a/server/site_tests/firmware_FAFTSetup/control
+++ b/server/site_tests/firmware_FAFTSetup/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FAFTSetup"
 PURPOSE = "Servo based diagnose of FAFT hardware setup"
 CRITERIA = "This test will fail if FAFT hardware is not set up correctly."

server/site_tests/firmware_FMap/control

diff --git a/server/site_tests/firmware_FMap/control b/server/site_tests/firmware_FMap/control
index 7db7ef5..4199b95 100644
--- a/server/site_tests/firmware_FMap/control
+++ b/server/site_tests/firmware_FMap/control
@@ -4,7 +4,7 @@
 
 #from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FMap"
 PURPOSE = "Check the existence of BIOS and EC FMap and the required FMap areas"
 CRITERIA = "This test will fail if the required FMap areas not existed"

server/site_tests/firmware_FMap/control.dev

diff --git a/server/site_tests/firmware_FMap/control.dev b/server/site_tests/firmware_FMap/control.dev
index 257c69e..5d7990d 100644
--- a/server/site_tests/firmware_FMap/control.dev
+++ b/server/site_tests/firmware_FMap/control.dev
@@ -4,7 +4,7 @@
 
 #from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FMap.dev"
 PURPOSE = "Check the existence of BIOS and EC FMap and the required FMap areas"
 CRITERIA = "This test will fail if the required FMap areas not existed"

server/site_tests/firmware_FWupdate/control

diff --git a/server/site_tests/firmware_FWupdate/control b/server/site_tests/firmware_FWupdate/control
index cf8d9a1c..b651e63 100644
--- a/server/site_tests/firmware_FWupdate/control
+++ b/server/site_tests/firmware_FWupdate/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FWupdate"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Functional"

server/site_tests/firmware_FWupdate/control.downgrade_rw

diff --git a/server/site_tests/firmware_FWupdate/control.downgrade_rw b/server/site_tests/firmware_FWupdate/control.downgrade_rw
index a97065f..0ea7a8f 100644
--- a/server/site_tests/firmware_FWupdate/control.downgrade_rw
+++ b/server/site_tests/firmware_FWupdate/control.downgrade_rw
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FWupdate.downgrade_rw"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Functional"

server/site_tests/firmware_FWupdate/control.new

diff --git a/server/site_tests/firmware_FWupdate/control.new b/server/site_tests/firmware_FWupdate/control.new
index 1d9695c..5f118ce 100644
--- a/server/site_tests/firmware_FWupdate/control.new
+++ b/server/site_tests/firmware_FWupdate/control.new
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FWupdate.new"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Functional"

server/site_tests/firmware_FWupdate/control.old

diff --git a/server/site_tests/firmware_FWupdate/control.old b/server/site_tests/firmware_FWupdate/control.old
index f121650..120e1c3 100644
--- a/server/site_tests/firmware_FWupdate/control.old
+++ b/server/site_tests/firmware_FWupdate/control.old
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FWupdate.old"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Functional"

server/site_tests/firmware_FWupdate/control.upgrade_rw

diff --git a/server/site_tests/firmware_FWupdate/control.upgrade_rw b/server/site_tests/firmware_FWupdate/control.upgrade_rw
index bcbe323..3eb133a 100644
--- a/server/site_tests/firmware_FWupdate/control.upgrade_rw
+++ b/server/site_tests/firmware_FWupdate/control.upgrade_rw
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FWupdate.upgrade_rw"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Functional"

server/site_tests/firmware_FWupdateThenSleep/control

diff --git a/server/site_tests/firmware_FWupdateThenSleep/control b/server/site_tests/firmware_FWupdateThenSleep/control
index 7cfe512..83cbb51 100644
--- a/server/site_tests/firmware_FWupdateThenSleep/control
+++ b/server/site_tests/firmware_FWupdateThenSleep/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FWupdateThenSleep"
 ATTRIBUTES = "suite:faft_bios_ro_qual, suite:faft_bios_rw_qual"
 DEPENDENCIES = "servo_state:WORKING"

server/site_tests/firmware_FWupdateThenSleep/control.batteryonly

diff --git a/server/site_tests/firmware_FWupdateThenSleep/control.batteryonly b/server/site_tests/firmware_FWupdateThenSleep/control.batteryonly
index 781b823..3e35419 100644
--- a/server/site_tests/firmware_FWupdateThenSleep/control.batteryonly
+++ b/server/site_tests/firmware_FWupdateThenSleep/control.batteryonly
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FWupdateThenSleep.batteryonly"
 ATTRIBUTES = "suite:faft_bios_ro_qual, suite:faft_bios_rw_qual"
 DEPENDENCIES = "servo_state:WORKING"

server/site_tests/firmware_FWupdateThenSleep/control.wp

diff --git a/server/site_tests/firmware_FWupdateThenSleep/control.wp b/server/site_tests/firmware_FWupdateThenSleep/control.wp
index e8974f1..93524a7 100644
--- a/server/site_tests/firmware_FWupdateThenSleep/control.wp
+++ b/server/site_tests/firmware_FWupdateThenSleep/control.wp
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FWupdateThenSleep.wp"
 ATTRIBUTES = "suite:faft_bios_ro_qual, suite:faft_bios_rw_qual"
 DEPENDENCIES = "servo_state:WORKING"

server/site_tests/firmware_FWupdateWP/control

diff --git a/server/site_tests/firmware_FWupdateWP/control b/server/site_tests/firmware_FWupdateWP/control
index 89436e4..5012e64 100644
--- a/server/site_tests/firmware_FWupdateWP/control
+++ b/server/site_tests/firmware_FWupdateWP/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FWupdateWP"
 DEPENDENCIES = "servo_state:WORKING"
 TIME = "MEDIUM"

server/site_tests/firmware_Fingerprint/control.add_entropy

diff --git a/server/site_tests/firmware_Fingerprint/control.add_entropy b/server/site_tests/firmware_Fingerprint/control.add_entropy
index 6bcb4d7..a2ee9d5 100644
--- a/server/site_tests/firmware_Fingerprint/control.add_entropy
+++ b/server/site_tests/firmware_Fingerprint/control.add_entropy
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Fingerprint.AddEntropy"
 PURPOSE = """
 Verify that the add_entropy behavior works correctly.

server/site_tests/firmware_Fingerprint/control.obeys_rollback

diff --git a/server/site_tests/firmware_Fingerprint/control.obeys_rollback b/server/site_tests/firmware_Fingerprint/control.obeys_rollback
index 6c04fa4..b1eeeb9 100644
--- a/server/site_tests/firmware_Fingerprint/control.obeys_rollback
+++ b/server/site_tests/firmware_Fingerprint/control.obeys_rollback
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Fingerprint.ObeysRollback"
 PURPOSE = """
 Verify that fingerprint firmware rollback functions correctly.

server/site_tests/firmware_Fingerprint/control.rdp0

diff --git a/server/site_tests/firmware_Fingerprint/control.rdp0 b/server/site_tests/firmware_Fingerprint/control.rdp0
index 587f6bf..a311453 100644
--- a/server/site_tests/firmware_Fingerprint/control.rdp0
+++ b/server/site_tests/firmware_Fingerprint/control.rdp0
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Fingerprint.RDP0"
 PURPOSE = """
 Verify that we can read flash when RDP (readout protection) is set to level 0.

server/site_tests/firmware_Fingerprint/control.rdp1

diff --git a/server/site_tests/firmware_Fingerprint/control.rdp1 b/server/site_tests/firmware_Fingerprint/control.rdp1
index 9ddf860..4fbeb88 100644
--- a/server/site_tests/firmware_Fingerprint/control.rdp1
+++ b/server/site_tests/firmware_Fingerprint/control.rdp1
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Fingerprint.RDP1"
 PURPOSE = """
 Verify that when RDP (readout protection) is set to level 1 and then changed to

server/site_tests/firmware_Fingerprint/control.read_flash

diff --git a/server/site_tests/firmware_Fingerprint/control.read_flash b/server/site_tests/firmware_Fingerprint/control.read_flash
index cc31512..090c336 100644
--- a/server/site_tests/firmware_Fingerprint/control.read_flash
+++ b/server/site_tests/firmware_Fingerprint/control.read_flash
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Fingerprint.ReadFlash"
 PURPOSE = """
 Verify that fingerprint flash cannot be read.

server/site_tests/firmware_Fingerprint/control.reboot_to_ro

diff --git a/server/site_tests/firmware_Fingerprint/control.reboot_to_ro b/server/site_tests/firmware_Fingerprint/control.reboot_to_ro
index c5538e6..1507ca6 100644
--- a/server/site_tests/firmware_Fingerprint/control.reboot_to_ro
+++ b/server/site_tests/firmware_Fingerprint/control.reboot_to_ro
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Fingerprint.RebootToRO"
 PURPOSE = """
 Validates that booting into RO fingerprint firmware succeeds.

server/site_tests/firmware_Fingerprint/control.ro_can_update_rw

diff --git a/server/site_tests/firmware_Fingerprint/control.ro_can_update_rw b/server/site_tests/firmware_Fingerprint/control.ro_can_update_rw
index b2d7502..079db18 100644
--- a/server/site_tests/firmware_Fingerprint/control.ro_can_update_rw
+++ b/server/site_tests/firmware_Fingerprint/control.ro_can_update_rw
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Fingerprint.ROCanUpdateRW"
 PURPOSE = """
 Validates that the RO fingerprint firmware can update the RW firmware.

server/site_tests/firmware_Fingerprint/control.ro_only_boots_valid_rw

diff --git a/server/site_tests/firmware_Fingerprint/control.ro_only_boots_valid_rw b/server/site_tests/firmware_Fingerprint/control.ro_only_boots_valid_rw
index 6dab6d7..df4de13 100644
--- a/server/site_tests/firmware_Fingerprint/control.ro_only_boots_valid_rw
+++ b/server/site_tests/firmware_Fingerprint/control.ro_only_boots_valid_rw
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Fingerprint.ROOnlyBootsValidRW"
 PURPOSE = """
 Verify the RO fingerprint firmware only boots valid RW firmware.

server/site_tests/firmware_Fingerprint/control.rw_no_update_ro

diff --git a/server/site_tests/firmware_Fingerprint/control.rw_no_update_ro b/server/site_tests/firmware_Fingerprint/control.rw_no_update_ro
index 9c44088..46ba34c 100644
--- a/server/site_tests/firmware_Fingerprint/control.rw_no_update_ro
+++ b/server/site_tests/firmware_Fingerprint/control.rw_no_update_ro
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Fingerprint.RWNoUpdateRO"
 PURPOSE = """
 Verify HW write protect prevents RO fingerprint firmware modification.

server/site_tests/firmware_Fingerprint/control.sw_write_protect

diff --git a/server/site_tests/firmware_Fingerprint/control.sw_write_protect b/server/site_tests/firmware_Fingerprint/control.sw_write_protect
index fe1a0d4..45e40fc 100644
--- a/server/site_tests/firmware_Fingerprint/control.sw_write_protect
+++ b/server/site_tests/firmware_Fingerprint/control.sw_write_protect
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Fingerprint.SoftwareWriteProtect"
 PURPOSE = """
 Verify that software write protect cannot be disabled when hardware write

server/site_tests/firmware_Fingerprint/control.system_is_locked

diff --git a/server/site_tests/firmware_Fingerprint/control.system_is_locked b/server/site_tests/firmware_Fingerprint/control.system_is_locked
index d4379f0..0dc6db4 100644
--- a/server/site_tests/firmware_Fingerprint/control.system_is_locked
+++ b/server/site_tests/firmware_Fingerprint/control.system_is_locked
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Fingerprint.SystemIsLocked"
 PURPOSE = """
 Verify that system_is_locked() is true in the firmware (i.e.,

server/site_tests/firmware_FingerprintCrosConfig/control.cros_config

diff --git a/server/site_tests/firmware_FingerprintCrosConfig/control.cros_config b/server/site_tests/firmware_FingerprintCrosConfig/control.cros_config
index d732aae..7485b98 100644
--- a/server/site_tests/firmware_FingerprintCrosConfig/control.cros_config
+++ b/server/site_tests/firmware_FingerprintCrosConfig/control.cros_config
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Fingerprint.CrosConfig"
 PURPOSE = """
 Debug cros_config failures. See http://b/160271883.

server/site_tests/firmware_FingerprintSigner/control

diff --git a/server/site_tests/firmware_FingerprintSigner/control b/server/site_tests/firmware_FingerprintSigner/control
index cbea4a8..8f3516e 100644
--- a/server/site_tests/firmware_FingerprintSigner/control
+++ b/server/site_tests/firmware_FingerprintSigner/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FingerprintSigner"
 PURPOSE = """
 Verify that the signer ID is correct

server/site_tests/firmware_FingerprintSigner/control.fsi

diff --git a/server/site_tests/firmware_FingerprintSigner/control.fsi b/server/site_tests/firmware_FingerprintSigner/control.fsi
index fe5496fd..0f5ab7c 100644
--- a/server/site_tests/firmware_FingerprintSigner/control.fsi
+++ b/server/site_tests/firmware_FingerprintSigner/control.fsi
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FingerprintSigner.fsi"
 PURPOSE = """
 Verify that the signer ID is correct

server/site_tests/firmware_FlashServoKeyboardMap/control

diff --git a/server/site_tests/firmware_FlashServoKeyboardMap/control b/server/site_tests/firmware_FlashServoKeyboardMap/control
index 192666c..c70c6ee 100644
--- a/server/site_tests/firmware_FlashServoKeyboardMap/control
+++ b/server/site_tests/firmware_FlashServoKeyboardMap/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FlashServoKeyboardMap"
 PURPOSE = "Flash the servo v3 keyboard map"
 CRITERIA = "This test will fail if the servo keyboard map can't be updated"

server/site_tests/firmware_FwScreenCloseLid/control

diff --git a/server/site_tests/firmware_FwScreenCloseLid/control b/server/site_tests/firmware_FwScreenCloseLid/control
index e3cce8e..780d1a7 100644
--- a/server/site_tests/firmware_FwScreenCloseLid/control
+++ b/server/site_tests/firmware_FwScreenCloseLid/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FwScreenCloseLid"
 PURPOSE = "Servo based lid close triggered shutdown during firmware screens."
 CRITERIA = "This test will fail if DUT doesn't shutdown"
@@ -18,7 +18,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image --test"). On runtime, this test triggers
 firmware screens (developer, remove, insert, yuck, to_norm screens),
 and then closes the lid in order to power the machine down.

server/site_tests/firmware_FwScreenPressPower/control

diff --git a/server/site_tests/firmware_FwScreenPressPower/control b/server/site_tests/firmware_FwScreenPressPower/control
index 9357c31..8f64f4d 100644
--- a/server/site_tests/firmware_FwScreenPressPower/control
+++ b/server/site_tests/firmware_FwScreenPressPower/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_FwScreenPressPower"
 PURPOSE = "Servo based power button triggered shutdown during firmware screens."
 CRITERIA = "This test will fail if DUT doesn't shutdown"
@@ -18,7 +18,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image --test"). On runtime, this test triggers
 firmware screens (developer, remove, insert, yuck, and to_norm screens),
 and then presses the power button in order to power the machine down.

server/site_tests/firmware_InvalidUSB/control

diff --git a/server/site_tests/firmware_InvalidUSB/control b/server/site_tests/firmware_InvalidUSB/control
index 08b080a..5d7fef6 100644
--- a/server/site_tests/firmware_InvalidUSB/control
+++ b/server/site_tests/firmware_InvalidUSB/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_InvalidUSB"
 PURPOSE = "Servo based booting an invalid USB image test"
 CRITERIA = "This test will fail if the invalid USB boots successfully"
@@ -18,7 +18,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image --test"). On runtime, this test corrupts the
 USB image and tries to boot into it. A failure is expected. It then
 restores the USB image and boots into it again.

server/site_tests/firmware_LegacyRecovery/control

diff --git a/server/site_tests/firmware_LegacyRecovery/control b/server/site_tests/firmware_LegacyRecovery/control
index c07c129..78c8336 100644
--- a/server/site_tests/firmware_LegacyRecovery/control
+++ b/server/site_tests/firmware_LegacyRecovery/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_LegacyRecovery"
 PURPOSE = "Servo based test to Verify recovery request at Remove Screen."
 CRITERIA = "This test will fail if the recovery at Remove screen is success."
@@ -18,7 +18,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test image
+This test requires a USB disk plugged-in, which contains a ChromeOS test image
 (built by "build_image --test"). It recovery boots to the USB image and sets
 recovery_request=1 and do a reboot. A failure is expected.
 """

server/site_tests/firmware_MenuDevBootUSB/control

diff --git a/server/site_tests/firmware_MenuDevBootUSB/control b/server/site_tests/firmware_MenuDevBootUSB/control
index e5644ce..4b280f2 100644
--- a/server/site_tests/firmware_MenuDevBootUSB/control
+++ b/server/site_tests/firmware_MenuDevBootUSB/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_MenuDevBootUSB"
 PURPOSE = "Select external boot menu item on developer screen"
 CRITERIA = "This test will fail the external boot menu item doesn't have any effect"

server/site_tests/firmware_MenuModeTransition/control

diff --git a/server/site_tests/firmware_MenuModeTransition/control b/server/site_tests/firmware_MenuModeTransition/control
index 8557f15..2a2d08c 100644
--- a/server/site_tests/firmware_MenuModeTransition/control
+++ b/server/site_tests/firmware_MenuModeTransition/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_MenuModeTransition"
 PURPOSE = "Perform mode transitions through menu navigation"
 CRITERIA = "This test will fail if mode transition does not work"

server/site_tests/firmware_MenuPowerOff/control

diff --git a/server/site_tests/firmware_MenuPowerOff/control b/server/site_tests/firmware_MenuPowerOff/control
index 254c017..bae6623 100644
--- a/server/site_tests/firmware_MenuPowerOff/control
+++ b/server/site_tests/firmware_MenuPowerOff/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_MenuPowerOff"
 PURPOSE = "Select power off menu item on firmware screens"
 CRITERIA = "This test will fail the power off menu item doesn't have any effect"

server/site_tests/firmware_MiniDiag/control

diff --git a/server/site_tests/firmware_MiniDiag/control b/server/site_tests/firmware_MiniDiag/control
index 2e85471..6062af9 100644
--- a/server/site_tests/firmware_MiniDiag/control
+++ b/server/site_tests/firmware_MiniDiag/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_MiniDiag"
 PURPOSE = "Servo based MiniDiag firmware boot test"
 CRITERIA = "This test will fail if MiniDiag does not work"

server/site_tests/firmware_MiniosMenu/control

diff --git a/server/site_tests/firmware_MiniosMenu/control b/server/site_tests/firmware_MiniosMenu/control
index 8da2635..81442b6 100644
--- a/server/site_tests/firmware_MiniosMenu/control
+++ b/server/site_tests/firmware_MiniosMenu/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_MiniosMenu"
 PURPOSE = "Navigate to the MiniOS by menu navigation"
 CRITERIA = "This test will fail if the device fail to boot to MiniOS"

server/site_tests/firmware_MiniosMenu/control.old

diff --git a/server/site_tests/firmware_MiniosMenu/control.old b/server/site_tests/firmware_MiniosMenu/control.old
index fa4ef0e..931cff3 100644
--- a/server/site_tests/firmware_MiniosMenu/control.old
+++ b/server/site_tests/firmware_MiniosMenu/control.old
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_MiniosMenu.old"
 PURPOSE = "Navigate to the MiniOS by menu navigation (older version)"
 CRITERIA = "This test will fail if the device fail to boot to MiniOS"

server/site_tests/firmware_MiniosPriority/control.minios_a

diff --git a/server/site_tests/firmware_MiniosPriority/control.minios_a b/server/site_tests/firmware_MiniosPriority/control.minios_a
index ef35577..fb91dd6 100644
--- a/server/site_tests/firmware_MiniosPriority/control.minios_a
+++ b/server/site_tests/firmware_MiniosPriority/control.minios_a
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_MiniosPriority.minios_a"
 PURPOSE = "Set the MiniOS priority and verify the device can boot to MiniOS in any priority setting"
 CRITERIA = "This test will fail if the device fail to boot to MiniOS or boot to the wrong partition"

server/site_tests/firmware_MiniosPriority/control.minios_b

diff --git a/server/site_tests/firmware_MiniosPriority/control.minios_b b/server/site_tests/firmware_MiniosPriority/control.minios_b
index b94e2bc..ca677bb 100644
--- a/server/site_tests/firmware_MiniosPriority/control.minios_b
+++ b/server/site_tests/firmware_MiniosPriority/control.minios_b
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_MiniosPriority.minios_b"
 PURPOSE = "Set the MiniOS priority and verify the device can boot to MiniOS in any priority setting"
 CRITERIA = "This test will fail if the device fail to boot to MiniOS or boot to the wrong partition"

server/site_tests/firmware_Mosys/control

diff --git a/server/site_tests/firmware_Mosys/control b/server/site_tests/firmware_Mosys/control
index f114786..e01b69c 100644
--- a/server/site_tests/firmware_Mosys/control
+++ b/server/site_tests/firmware_Mosys/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_Mosys"
 PURPOSE = "Execute firmware Mosys commands and check return value."
 CRITERIA = """

server/site_tests/firmware_PDConnect/control

diff --git a/server/site_tests/firmware_PDConnect/control b/server/site_tests/firmware_PDConnect/control
index d776aa7..12c2f26 100644
--- a/server/site_tests/firmware_PDConnect/control
+++ b/server/site_tests/firmware_PDConnect/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDConnect"
 PURPOSE = "Servo based PD Connect/Disconnect test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDConnect/control.dts

diff --git a/server/site_tests/firmware_PDConnect/control.dts b/server/site_tests/firmware_PDConnect/control.dts
index f75871c..1279def 100644
--- a/server/site_tests/firmware_PDConnect/control.dts
+++ b/server/site_tests/firmware_PDConnect/control.dts
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDConnect.dts"
 PURPOSE = "Servo based PD Connect/Disconnect test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDConnect/control.dts_flip

diff --git a/server/site_tests/firmware_PDConnect/control.dts_flip b/server/site_tests/firmware_PDConnect/control.dts_flip
index ed584a8..f5c5e8a 100644
--- a/server/site_tests/firmware_PDConnect/control.dts_flip
+++ b/server/site_tests/firmware_PDConnect/control.dts_flip
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDConnect.dts_flip"
 PURPOSE = "Servo based PD Connect/Disconnect test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDConnect/control.flip

diff --git a/server/site_tests/firmware_PDConnect/control.flip b/server/site_tests/firmware_PDConnect/control.flip
index 127eca4..8dbe61d 100644
--- a/server/site_tests/firmware_PDConnect/control.flip
+++ b/server/site_tests/firmware_PDConnect/control.flip
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDConnect.flip"
 PURPOSE = "Servo based PD Connect/Disconnect test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDDataSwap/control

diff --git a/server/site_tests/firmware_PDDataSwap/control b/server/site_tests/firmware_PDDataSwap/control
index bdc9702..3422177 100644
--- a/server/site_tests/firmware_PDDataSwap/control
+++ b/server/site_tests/firmware_PDDataSwap/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDDataSwap"
 PURPOSE = "Servo based PD data role swap test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDDataSwap/control.dts

diff --git a/server/site_tests/firmware_PDDataSwap/control.dts b/server/site_tests/firmware_PDDataSwap/control.dts
index 0cad634..3b6fb64 100644
--- a/server/site_tests/firmware_PDDataSwap/control.dts
+++ b/server/site_tests/firmware_PDDataSwap/control.dts
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDDataSwap.dts"
 PURPOSE = "Servo based PD data role swap test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDDataSwap/control.dts_flip

diff --git a/server/site_tests/firmware_PDDataSwap/control.dts_flip b/server/site_tests/firmware_PDDataSwap/control.dts_flip
index ebf906c..1055f5e 100644
--- a/server/site_tests/firmware_PDDataSwap/control.dts_flip
+++ b/server/site_tests/firmware_PDDataSwap/control.dts_flip
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDDataSwap.dts_flip"
 PURPOSE = "Servo based PD data role swap test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDDataSwap/control.flip

diff --git a/server/site_tests/firmware_PDDataSwap/control.flip b/server/site_tests/firmware_PDDataSwap/control.flip
index 0eb34af..56cd282 100644
--- a/server/site_tests/firmware_PDDataSwap/control.flip
+++ b/server/site_tests/firmware_PDDataSwap/control.flip
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDDataSwap.flip"
 PURPOSE = "Servo based PD data role swap test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDDataSwap/control.shutdown

diff --git a/server/site_tests/firmware_PDDataSwap/control.shutdown b/server/site_tests/firmware_PDDataSwap/control.shutdown
index 37b52f3..42282b5 100644
--- a/server/site_tests/firmware_PDDataSwap/control.shutdown
+++ b/server/site_tests/firmware_PDDataSwap/control.shutdown
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDDataSwap.shutdown"
 PURPOSE = "Servo based PD data role swap test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDPowerSwap/control

diff --git a/server/site_tests/firmware_PDPowerSwap/control b/server/site_tests/firmware_PDPowerSwap/control
index a81874c..03bdf66 100644
--- a/server/site_tests/firmware_PDPowerSwap/control
+++ b/server/site_tests/firmware_PDPowerSwap/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDPowerSwap"
 PURPOSE = "Servo based PD power role swap test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDPowerSwap/control.dts

diff --git a/server/site_tests/firmware_PDPowerSwap/control.dts b/server/site_tests/firmware_PDPowerSwap/control.dts
index 2300b81..1f227c9 100644
--- a/server/site_tests/firmware_PDPowerSwap/control.dts
+++ b/server/site_tests/firmware_PDPowerSwap/control.dts
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDPowerSwap.dts"
 PURPOSE = "Servo based PD power role swap test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDPowerSwap/control.dts_flip

diff --git a/server/site_tests/firmware_PDPowerSwap/control.dts_flip b/server/site_tests/firmware_PDPowerSwap/control.dts_flip
index de894aa..b86739b 100644
--- a/server/site_tests/firmware_PDPowerSwap/control.dts_flip
+++ b/server/site_tests/firmware_PDPowerSwap/control.dts_flip
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDPowerSwap.dts_flip"
 PURPOSE = "Servo based PD power role swap test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDPowerSwap/control.flip

diff --git a/server/site_tests/firmware_PDPowerSwap/control.flip b/server/site_tests/firmware_PDPowerSwap/control.flip
index b687fa8..813da66 100644
--- a/server/site_tests/firmware_PDPowerSwap/control.flip
+++ b/server/site_tests/firmware_PDPowerSwap/control.flip
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDPowerSwap.flip"
 PURPOSE = "Servo based PD power role swap test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDPowerSwap/control.shutdown

diff --git a/server/site_tests/firmware_PDPowerSwap/control.shutdown b/server/site_tests/firmware_PDPowerSwap/control.shutdown
index caa95b6..33612fe 100644
--- a/server/site_tests/firmware_PDPowerSwap/control.shutdown
+++ b/server/site_tests/firmware_PDPowerSwap/control.shutdown
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDPowerSwap.shutdown"
 PURPOSE = "Servo based PD power role swap test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDPowerSwap/control.suspend

diff --git a/server/site_tests/firmware_PDPowerSwap/control.suspend b/server/site_tests/firmware_PDPowerSwap/control.suspend
index af4b56d..51d0de9 100644
--- a/server/site_tests/firmware_PDPowerSwap/control.suspend
+++ b/server/site_tests/firmware_PDPowerSwap/control.suspend
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDPowerSwap.suspend"
 PURPOSE = "Servo based PD power role swap test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDProtocol/control

diff --git a/server/site_tests/firmware_PDProtocol/control b/server/site_tests/firmware_PDProtocol/control
index 2e1d0a0..2b2d68c 100644
--- a/server/site_tests/firmware_PDProtocol/control
+++ b/server/site_tests/firmware_PDProtocol/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDProtocol"
 PURPOSE = "Verify PD protocol negotiation."
 CRITERIA = "This test will fail if PD is negotiated when running from USB image."

server/site_tests/firmware_PDProtocol/control.ec_wp

diff --git a/server/site_tests/firmware_PDProtocol/control.ec_wp b/server/site_tests/firmware_PDProtocol/control.ec_wp
index 74583d0..dec7336 100644
--- a/server/site_tests/firmware_PDProtocol/control.ec_wp
+++ b/server/site_tests/firmware_PDProtocol/control.ec_wp
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDProtocol.ec_wp"
 PURPOSE = "Verify PD protocol negotiation."
 CRITERIA = "This test will fail if PD is negotiated when running from USB image."

server/site_tests/firmware_PDResetHard/control

diff --git a/server/site_tests/firmware_PDResetHard/control b/server/site_tests/firmware_PDResetHard/control
index 714f762..0005899 100644
--- a/server/site_tests/firmware_PDResetHard/control
+++ b/server/site_tests/firmware_PDResetHard/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDResetHard"
 PURPOSE = "Servo based PD hard reset test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDResetHard/control.dts

diff --git a/server/site_tests/firmware_PDResetHard/control.dts b/server/site_tests/firmware_PDResetHard/control.dts
index dfd959a..d90685f 100644
--- a/server/site_tests/firmware_PDResetHard/control.dts
+++ b/server/site_tests/firmware_PDResetHard/control.dts
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDResetHard.dts"
 PURPOSE = "Servo based PD hard reset test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDResetHard/control.dts_flip

diff --git a/server/site_tests/firmware_PDResetHard/control.dts_flip b/server/site_tests/firmware_PDResetHard/control.dts_flip
index 508b2ed..ada3f85 100644
--- a/server/site_tests/firmware_PDResetHard/control.dts_flip
+++ b/server/site_tests/firmware_PDResetHard/control.dts_flip
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDResetHard.dts_flip"
 PURPOSE = "Servo based PD hard reset test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDResetHard/control.flip

diff --git a/server/site_tests/firmware_PDResetHard/control.flip b/server/site_tests/firmware_PDResetHard/control.flip
index e8dac5c..4dde1ca 100644
--- a/server/site_tests/firmware_PDResetHard/control.flip
+++ b/server/site_tests/firmware_PDResetHard/control.flip
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDResetHard.flip"
 PURPOSE = "Servo based PD hard reset test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDResetHard/control.shutdown

diff --git a/server/site_tests/firmware_PDResetHard/control.shutdown b/server/site_tests/firmware_PDResetHard/control.shutdown
index a901dac..dc75737 100644
--- a/server/site_tests/firmware_PDResetHard/control.shutdown
+++ b/server/site_tests/firmware_PDResetHard/control.shutdown
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDResetHard.shutdown"
 PURPOSE = "Servo based PD hard reset test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDResetSoft/control

diff --git a/server/site_tests/firmware_PDResetSoft/control b/server/site_tests/firmware_PDResetSoft/control
index 61e048a..811af4c 100644
--- a/server/site_tests/firmware_PDResetSoft/control
+++ b/server/site_tests/firmware_PDResetSoft/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDResetSoft"
 PURPOSE = "Servo based PD soft reset test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDResetSoft/control.dts

diff --git a/server/site_tests/firmware_PDResetSoft/control.dts b/server/site_tests/firmware_PDResetSoft/control.dts
index cbd8b88..2ae5c3c 100644
--- a/server/site_tests/firmware_PDResetSoft/control.dts
+++ b/server/site_tests/firmware_PDResetSoft/control.dts
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDResetSoft.dts"
 PURPOSE = "Servo based PD soft reset test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDResetSoft/control.dts_flip

diff --git a/server/site_tests/firmware_PDResetSoft/control.dts_flip b/server/site_tests/firmware_PDResetSoft/control.dts_flip
index 069751b..4987763 100644
--- a/server/site_tests/firmware_PDResetSoft/control.dts_flip
+++ b/server/site_tests/firmware_PDResetSoft/control.dts_flip
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDResetSoft.dts_flip"
 PURPOSE = "Servo based PD soft reset test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDResetSoft/control.flip

diff --git a/server/site_tests/firmware_PDResetSoft/control.flip b/server/site_tests/firmware_PDResetSoft/control.flip
index 24d283d..f2df5f1 100644
--- a/server/site_tests/firmware_PDResetSoft/control.flip
+++ b/server/site_tests/firmware_PDResetSoft/control.flip
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDResetSoft.flip"
 PURPOSE = "Servo based PD soft reset test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDResetSoft/control.shutdown

diff --git a/server/site_tests/firmware_PDResetSoft/control.shutdown b/server/site_tests/firmware_PDResetSoft/control.shutdown
index f24cc0c..85742ff 100644
--- a/server/site_tests/firmware_PDResetSoft/control.shutdown
+++ b/server/site_tests/firmware_PDResetSoft/control.shutdown
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDResetSoft.shutdown"
 PURPOSE = "Servo based PD soft reset test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDTrySrc/control

diff --git a/server/site_tests/firmware_PDTrySrc/control b/server/site_tests/firmware_PDTrySrc/control
index 5b6c258..485f281 100644
--- a/server/site_tests/firmware_PDTrySrc/control
+++ b/server/site_tests/firmware_PDTrySrc/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDTrySrc"
 PURPOSE = "Servo based PD Try.SRC protocol test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDTrySrc/control.flip

diff --git a/server/site_tests/firmware_PDTrySrc/control.flip b/server/site_tests/firmware_PDTrySrc/control.flip
index 6c6bb04..9595d08 100644
--- a/server/site_tests/firmware_PDTrySrc/control.flip
+++ b/server/site_tests/firmware_PDTrySrc/control.flip
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDTrySrc.flip"
 PURPOSE = "Servo based PD Try.SRC protocol test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDVbusRequest/control

diff --git a/server/site_tests/firmware_PDVbusRequest/control b/server/site_tests/firmware_PDVbusRequest/control
index ce3ce9d..d53d3ec 100644
--- a/server/site_tests/firmware_PDVbusRequest/control
+++ b/server/site_tests/firmware_PDVbusRequest/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDVbusRequest"
 PURPOSE = "Servo based PD VBUS voltage level test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDVbusRequest/control.dts

diff --git a/server/site_tests/firmware_PDVbusRequest/control.dts b/server/site_tests/firmware_PDVbusRequest/control.dts
index 47d3082..2779629 100644
--- a/server/site_tests/firmware_PDVbusRequest/control.dts
+++ b/server/site_tests/firmware_PDVbusRequest/control.dts
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDVbusRequest.dts"
 PURPOSE = "Servo based PD VBUS voltage level test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDVbusRequest/control.dts_flip

diff --git a/server/site_tests/firmware_PDVbusRequest/control.dts_flip b/server/site_tests/firmware_PDVbusRequest/control.dts_flip
index c765c71..7a38cdf 100644
--- a/server/site_tests/firmware_PDVbusRequest/control.dts_flip
+++ b/server/site_tests/firmware_PDVbusRequest/control.dts_flip
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDVbusRequest.dts_flip"
 PURPOSE = "Servo based PD VBUS voltage level test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDVbusRequest/control.flip

diff --git a/server/site_tests/firmware_PDVbusRequest/control.flip b/server/site_tests/firmware_PDVbusRequest/control.flip
index 4dda57d..db537fe9 100644
--- a/server/site_tests/firmware_PDVbusRequest/control.flip
+++ b/server/site_tests/firmware_PDVbusRequest/control.flip
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDVbusRequest.flip"
 PURPOSE = "Servo based PD VBUS voltage level test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDVbusRequest/control.shutdown

diff --git a/server/site_tests/firmware_PDVbusRequest/control.shutdown b/server/site_tests/firmware_PDVbusRequest/control.shutdown
index 5a1dfb5..7f22a5d 100644
--- a/server/site_tests/firmware_PDVbusRequest/control.shutdown
+++ b/server/site_tests/firmware_PDVbusRequest/control.shutdown
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDVbusRequest.shutdown"
 PURPOSE = "Servo based PD VBUS voltage level test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_PDVbusRequest/control.suspend

diff --git a/server/site_tests/firmware_PDVbusRequest/control.suspend b/server/site_tests/firmware_PDVbusRequest/control.suspend
index 1cd1fce..48e3cb3 100644
--- a/server/site_tests/firmware_PDVbusRequest/control.suspend
+++ b/server/site_tests/firmware_PDVbusRequest/control.suspend
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_PDVbusRequest.suspend"
 PURPOSE = "Servo based PD VBUS voltage level test"
 ATTRIBUTES = "suite:faft_pd"

server/site_tests/firmware_RecoveryButton/control

diff --git a/server/site_tests/firmware_RecoveryButton/control b/server/site_tests/firmware_RecoveryButton/control
index 23760cf..c4dd63e 100644
--- a/server/site_tests/firmware_RecoveryButton/control
+++ b/server/site_tests/firmware_RecoveryButton/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_RecoveryButton"
 PURPOSE = "Press recovery button and check for recovery boot"
 CRITERIA = "This test will fail if firmware does not enter recovery mode"
@@ -18,7 +18,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image --test"). On runtime, this test emulates
 recovery button pressed and reboots. It then triggers recovery mode by
 unplugging and plugging in the USB disk and checks success of it.

server/site_tests/firmware_RecoveryButton/control.dev

diff --git a/server/site_tests/firmware_RecoveryButton/control.dev b/server/site_tests/firmware_RecoveryButton/control.dev
index c4f17b8..2a4e199 100644
--- a/server/site_tests/firmware_RecoveryButton/control.dev
+++ b/server/site_tests/firmware_RecoveryButton/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_RecoveryButton.dev"
 PURPOSE = "Press recovery button and check for recovery boot"
 CRITERIA = "This test will fail if firmware does not enter recovery mode"
@@ -17,7 +17,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image --test"). On runtime, this test emulates
 recovery button pressed and reboots. It then triggers recovery mode by
 unplugging and plugging in the USB disk and checks success of it.

server/site_tests/firmware_RecoveryCacheBootKeys/control

diff --git a/server/site_tests/firmware_RecoveryCacheBootKeys/control b/server/site_tests/firmware_RecoveryCacheBootKeys/control
index 3d19044..93b4450 100644
--- a/server/site_tests/firmware_RecoveryCacheBootKeys/control
+++ b/server/site_tests/firmware_RecoveryCacheBootKeys/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_RecoveryCacheBootKeys"
 PURPOSE = "Servo based RECOVERY_MRC_CACHE boot tests"
 CRITERIA = "This test will fail if the DUT doesn't use the cache during recovery boot."

server/site_tests/firmware_RecoveryCacheBootKeys/control.dev

diff --git a/server/site_tests/firmware_RecoveryCacheBootKeys/control.dev b/server/site_tests/firmware_RecoveryCacheBootKeys/control.dev
index 0f94faf..01f4aa9 100644
--- a/server/site_tests/firmware_RecoveryCacheBootKeys/control.dev
+++ b/server/site_tests/firmware_RecoveryCacheBootKeys/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_RecoveryCacheBootKeys.dev"
 PURPOSE = "Servo based RECOVERY_MRC_CACHE boot tests"
 CRITERIA = "This test will fail if the DUT doesn't use the cache during recovery boot."

server/site_tests/firmware_RollbackFirmware/control

diff --git a/server/site_tests/firmware_RollbackFirmware/control b/server/site_tests/firmware_RollbackFirmware/control
index fb9db54..b546f14 100644
--- a/server/site_tests/firmware_RollbackFirmware/control
+++ b/server/site_tests/firmware_RollbackFirmware/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_RollbackFirmware"
 PURPOSE = "Servo based firmware rollback test."
 CRITERIA = "This test will fail if firmware rollback doesn't fail verification."
@@ -18,7 +18,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image --test"). On runtime, this test rollbacks
 firmware A and results firmware B boot. It then rollbacks firmware B and
 results recovery boot.

server/site_tests/firmware_RollbackFirmware/control.dev

diff --git a/server/site_tests/firmware_RollbackFirmware/control.dev b/server/site_tests/firmware_RollbackFirmware/control.dev
index 14fa104..cefe2de 100644
--- a/server/site_tests/firmware_RollbackFirmware/control.dev
+++ b/server/site_tests/firmware_RollbackFirmware/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_RollbackFirmware.dev"
 PURPOSE = "Servo based firmware rollback test."
 CRITERIA = "This test will fail if firmware rollback doesn't fail verification."
@@ -17,7 +17,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image --test"). On runtime, this test rollbacks
 firmware A and results firmware B boot. It then rollbacks firmware B and
 results recovery boot.

server/site_tests/firmware_RollbackKernel/control

diff --git a/server/site_tests/firmware_RollbackKernel/control b/server/site_tests/firmware_RollbackKernel/control
index 673094a..d19e1d6 100644
--- a/server/site_tests/firmware_RollbackKernel/control
+++ b/server/site_tests/firmware_RollbackKernel/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_RollbackKernel"
 PURPOSE = "Servo based kernel rollback test."
 CRITERIA = "This test will fail if kernel rollback doesn't fail verification."
@@ -18,7 +18,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image --test"). In normal mode, this test rollbacks
 kernel A and results kernel B boot. It then rollbacks kernel B and
 results recovery boot. In developer mode, the firmware ignores kernel

server/site_tests/firmware_RollbackKernel/control.dev

diff --git a/server/site_tests/firmware_RollbackKernel/control.dev b/server/site_tests/firmware_RollbackKernel/control.dev
index 1105903..d03b698 100644
--- a/server/site_tests/firmware_RollbackKernel/control.dev
+++ b/server/site_tests/firmware_RollbackKernel/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_RollbackKernel.dev"
 PURPOSE = "Servo based kernel rollback test."
 CRITERIA = "This test will fail if kernel rollback doesn't fail verification."
@@ -17,7 +17,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image --test"). In normal mode, this test rollbacks
 kernel A and results kernel B boot. It then rollbacks kernel B and
 results recovery boot. In developer mode, the firmware ignores kernel

server/site_tests/firmware_SelfSignedBoot/control

diff --git a/server/site_tests/firmware_SelfSignedBoot/control b/server/site_tests/firmware_SelfSignedBoot/control
index 01a1253..977de3c 100644
--- a/server/site_tests/firmware_SelfSignedBoot/control
+++ b/server/site_tests/firmware_SelfSignedBoot/control
@@ -4,14 +4,14 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_SelfSignedBoot"
 PURPOSE = "Servo based developer mode boot only test to Self signed Kernels."
 CRITERIA = """
 Prerequirement is as follow:
 1. This test should run in Dev mode.
 2. Enable dev_boot_usb and dev_boot_signed_only.
-3. A USB disk should be plugged-in, which contains a Chrome OS Test Image.
+3. A USB disk should be plugged-in, which contains a ChromeOS test image.
 
 This test will fail if one of the following conditions is met:
 1. Ctrl-U boots to USB image with recovery keys.
@@ -28,7 +28,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image test"). On runtime, this test first switches
 DUT to developer mode. When dev_boot_signed_only=1 and dev_boot_usb=1 and,
 pressing Ctrl-U on developer screen should not boot the USB disk. On resigning

server/site_tests/firmware_SetSerialNumber/control

diff --git a/server/site_tests/firmware_SetSerialNumber/control b/server/site_tests/firmware_SetSerialNumber/control
index 044adc5..2e61a9e 100644
--- a/server/site_tests/firmware_SetSerialNumber/control
+++ b/server/site_tests/firmware_SetSerialNumber/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_SetSerialNumber"
 PURPOSE = "Servo based test to set serial number in firmware."
 CRITERIA = """

server/site_tests/firmware_SoftwareSync/control

diff --git a/server/site_tests/firmware_SoftwareSync/control b/server/site_tests/firmware_SoftwareSync/control
index f4ab291..40450f8 100644
--- a/server/site_tests/firmware_SoftwareSync/control
+++ b/server/site_tests/firmware_SoftwareSync/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_SoftwareSync"
 PURPOSE = "Servo based EC software sync test"
 CRITERIA = "This test will fail if EC software sync misbehalved"

server/site_tests/firmware_SoftwareSync/control.dev

diff --git a/server/site_tests/firmware_SoftwareSync/control.dev b/server/site_tests/firmware_SoftwareSync/control.dev
index ef391d8..9fcd7a1 100644
--- a/server/site_tests/firmware_SoftwareSync/control.dev
+++ b/server/site_tests/firmware_SoftwareSync/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_SoftwareSync.dev"
 PURPOSE = "Servo based EC software sync test"
 CRITERIA = "This test will fail if EC software sync misbehalved"

server/site_tests/firmware_StandbyPowerConsumption/control.30min

diff --git a/server/site_tests/firmware_StandbyPowerConsumption/control.30min b/server/site_tests/firmware_StandbyPowerConsumption/control.30min
index e713098..cf268ae 100644
--- a/server/site_tests/firmware_StandbyPowerConsumption/control.30min
+++ b/server/site_tests/firmware_StandbyPowerConsumption/control.30min
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_StandbyPowerConsumption.30min"
 PURPOSE = "Collect power consumption during hibernate."
 TIME = "LONG"

server/site_tests/firmware_StandbyPowerConsumption/control.4hr

diff --git a/server/site_tests/firmware_StandbyPowerConsumption/control.4hr b/server/site_tests/firmware_StandbyPowerConsumption/control.4hr
index 5a32291..c6d7aab 100644
--- a/server/site_tests/firmware_StandbyPowerConsumption/control.4hr
+++ b/server/site_tests/firmware_StandbyPowerConsumption/control.4hr
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_StandbyPowerConsumption.4hr"
 PURPOSE = "Collect power consumption during hibernate."
 TIME = "LONG"

server/site_tests/firmware_SysfsVPD/control

diff --git a/server/site_tests/firmware_SysfsVPD/control b/server/site_tests/firmware_SysfsVPD/control
index e31caf4..d50b7cb 100644
--- a/server/site_tests/firmware_SysfsVPD/control
+++ b/server/site_tests/firmware_SysfsVPD/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_SysfsVPD"
 PURPOSE = "Servo based test for reading VPD data through sysfs"
 CRITERIA = "This test will fail if the VPD test string is not read back correctly"

server/site_tests/firmware_TPMKernelVersion/control

diff --git a/server/site_tests/firmware_TPMKernelVersion/control b/server/site_tests/firmware_TPMKernelVersion/control
index 5071d68..739b071 100644
--- a/server/site_tests/firmware_TPMKernelVersion/control
+++ b/server/site_tests/firmware_TPMKernelVersion/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_TPMKernelVersion"
 PURPOSE = "Check kernel version in TPM is not corrupted."
 CRITERIA = "This test will fail if kernel version in TPM is corrupted."

server/site_tests/firmware_TPMNotCorruptedDevMode/control

diff --git a/server/site_tests/firmware_TPMNotCorruptedDevMode/control b/server/site_tests/firmware_TPMNotCorruptedDevMode/control
index 2a78f04..1966bdd 100644
--- a/server/site_tests/firmware_TPMNotCorruptedDevMode/control
+++ b/server/site_tests/firmware_TPMNotCorruptedDevMode/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_TPMNotCorruptedDevMode"
 PURPOSE = "Ensure kernel and fw version in TPM isn't corrupted in dev mode."
 CRITERIA = "This test will fail if dev mode corrupts the kernel or fw version."
@@ -18,7 +18,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image test"). On runtime, this test first switches
 DUT to developer mode. It then checks the kernel and firmware version stored in
 the TPM. It then boots into normal mode and checks the kernel and firmware

server/site_tests/firmware_TPMVersionCheck/control

diff --git a/server/site_tests/firmware_TPMVersionCheck/control b/server/site_tests/firmware_TPMVersionCheck/control
index af28cdc..d662c5e 100644
--- a/server/site_tests/firmware_TPMVersionCheck/control
+++ b/server/site_tests/firmware_TPMVersionCheck/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_TPMVersionCheck"
 PURPOSE = "Crossystem reports tpm versions correctly"
 CRITERIA = "This test will fail if crossystem does not report correctly."

server/site_tests/firmware_TPMVersionCheck/control.dev

diff --git a/server/site_tests/firmware_TPMVersionCheck/control.dev b/server/site_tests/firmware_TPMVersionCheck/control.dev
index 65ed917..8764914 100644
--- a/server/site_tests/firmware_TPMVersionCheck/control.dev
+++ b/server/site_tests/firmware_TPMVersionCheck/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_TPMVersionCheck.dev"
 PURPOSE = "Crossystem reports the tpm versions correctly"
 CRITERIA = "This test will fail if crossystem reports tpm version incorrectly"

server/site_tests/firmware_TryFwB/control

diff --git a/server/site_tests/firmware_TryFwB/control b/server/site_tests/firmware_TryFwB/control
index 734f78a..2ac0cc7 100644
--- a/server/site_tests/firmware_TryFwB/control
+++ b/server/site_tests/firmware_TryFwB/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_TryFwB"
 PURPOSE = "Servo based RW firmware B boot test"
 CRITERIA = "This test will fail if firmware does not switch to firmware B"

server/site_tests/firmware_TryFwB/control.dev

diff --git a/server/site_tests/firmware_TryFwB/control.dev b/server/site_tests/firmware_TryFwB/control.dev
index 9f93d2a..f76b862 100644
--- a/server/site_tests/firmware_TryFwB/control.dev
+++ b/server/site_tests/firmware_TryFwB/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_TryFwB.dev"
 PURPOSE = "Servo based RW firmware B boot test"
 CRITERIA = "This test will fail if firmware does not switch to firmware B"

server/site_tests/firmware_TypeCCharging/control

diff --git a/server/site_tests/firmware_TypeCCharging/control b/server/site_tests/firmware_TypeCCharging/control
index e633fac..5995627 100644
--- a/server/site_tests/firmware_TypeCCharging/control
+++ b/server/site_tests/firmware_TypeCCharging/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_TypeCCharging"
 PURPOSE = "Remotely controlled USB type C charging test."
 CRITERIA = "This test will fail if Plankton type C VBUS voltage not in range."

server/site_tests/firmware_TypeCProbeUSB3/control

diff --git a/server/site_tests/firmware_TypeCProbeUSB3/control b/server/site_tests/firmware_TypeCProbeUSB3/control
index 548b905..ed7eb86 100644
--- a/server/site_tests/firmware_TypeCProbeUSB3/control
+++ b/server/site_tests/firmware_TypeCProbeUSB3/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_TypeCProbeUSB3"
 PURPOSE = "Remotely controlled USB type C super speed device probing test."
 CRITERIA = "This test will fail if DUT can't probe USB3 device on type C port."

server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control

diff --git a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
index 633f3f9..aaa42dd 100644
--- a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_UpdateFirmwareDataKeyVersion"
 PURPOSE = """
 Servo based firmware update test which check firmware datakey version.
@@ -13,7 +13,7 @@
 Prerequirement is as follow:
 1.The fwid should matches shellball's (/usr/sbin/chromeos-firmwareupdate) fwid,
   unless this test use a given shellball.
-2. A USB disk should be plugged-in, which contains a Chrome OS test image.
+2. A USB disk should be plugged-in, which contains a ChromeOS test image.
 
 This test will fail if following requrements are met:
 1. fwid does not match shellball's (/usr/sbin/chromeos-firmwareupdate) fwid

server/site_tests/firmware_UpdateFirmwareVersion/control

diff --git a/server/site_tests/firmware_UpdateFirmwareVersion/control b/server/site_tests/firmware_UpdateFirmwareVersion/control
index a24c0d3..0782072 100644
--- a/server/site_tests/firmware_UpdateFirmwareVersion/control
+++ b/server/site_tests/firmware_UpdateFirmwareVersion/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_UpdateFirmwareVersion"
 PURPOSE = "Servo based firmware update test which checks the firmware version."
 CRITERIA = """
@@ -12,7 +12,7 @@
 1. This test should run in normal mode.
 2. Fwid should match shellball's (/usr/sbin/chromeos-firmwareupdate) fwid,
    unless this test use a given shellball.
-3. A USB disk should be plugged-in, which contains a Chrome OS test image.
+3. A USB disk should be plugged-in, which contains a ChromeOS test image.
 
 This test will fail if one of the following conditions is met:
 1. Firmware update fails.

server/site_tests/firmware_UpdateKernelDataKeyVersion/control

diff --git a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
index 72bbcb4..e00b86a 100644
--- a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_UpdateKernelDataKeyVersion"
 PURPOSE = """
 Servo based kernel update test which checks the kernel data key version.

server/site_tests/firmware_UpdateKernelSubkeyVersion/control

diff --git a/server/site_tests/firmware_UpdateKernelSubkeyVersion/control b/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
index dd10220..4c7b3e3 100644
--- a/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_UpdateKernelSubkeyVersion"
 PURPOSE = """
 Servo based firmware update test, and check kernel subkey version.

server/site_tests/firmware_UpdateKernelVersion/control

diff --git a/server/site_tests/firmware_UpdateKernelVersion/control b/server/site_tests/firmware_UpdateKernelVersion/control
index 21a8861..3135c10 100644
--- a/server/site_tests/firmware_UpdateKernelVersion/control
+++ b/server/site_tests/firmware_UpdateKernelVersion/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_UpdateKernelVersion"
 PURPOSE = "Servo based kernel update test which checks the kernel version."
 CRITERIA = """

server/site_tests/firmware_UpdaterModes/control

diff --git a/server/site_tests/firmware_UpdaterModes/control b/server/site_tests/firmware_UpdaterModes/control
index 43a2cfa..c9574e4 100644
--- a/server/site_tests/firmware_UpdaterModes/control
+++ b/server/site_tests/firmware_UpdaterModes/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_UpdaterModes"
 ATTRIBUTES = "suite:faft_bios, suite:faft_bios_ro_qual, suite:faft_bios_rw_qual, suite:faft_lv5, suite:faft_bios_tot, suite:distributed_lab_qual_faft"
 DEPENDENCIES = "servo_state:WORKING"

server/site_tests/firmware_UserRequestRecovery/control

diff --git a/server/site_tests/firmware_UserRequestRecovery/control b/server/site_tests/firmware_UserRequestRecovery/control
index 668fa48..1bdf2a7 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control
+++ b/server/site_tests/firmware_UserRequestRecovery/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_UserRequestRecovery"
 PURPOSE = "Request recovery mode and check it next reboot."
 CRITERIA = "This test will fail if firmware does not enter recovery mode"
@@ -18,7 +18,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image --test"). On runtime, this test first requests
 a recovery mode on next boot by setting the crossystem recovery_request
 flag. It then triggers recovery mode by unplugging and plugging in the USB

server/site_tests/firmware_UserRequestRecovery/control.dev

diff --git a/server/site_tests/firmware_UserRequestRecovery/control.dev b/server/site_tests/firmware_UserRequestRecovery/control.dev
index 4aa348d..705a988 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.dev
+++ b/server/site_tests/firmware_UserRequestRecovery/control.dev
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "firmware_UserRequestRecovery.dev"
 PURPOSE = "Request recovery mode and check it next reboot."
 CRITERIA = "This test will fail if firmware does not enter recovery mode"
@@ -17,7 +17,7 @@
 PY_VERSION = 3
 
 DOC = """
-This test requires a USB disk plugged-in, which contains a Chrome OS test
+This test requires a USB disk plugged-in, which contains a ChromeOS test
 image (built by "build_image --test"). On runtime, this test first requests
 a recovery mode on next boot by setting the crossystem recovery_request
 flag. It then triggers recovery mode by unplugging and plugging in the USB

server/site_tests/graphics_PowerConsumption/control

diff --git a/server/site_tests/graphics_PowerConsumption/control b/server/site_tests/graphics_PowerConsumption/control
index b78d636..1e3ad27 100644
--- a/server/site_tests/graphics_PowerConsumption/control
+++ b/server/site_tests/graphics_PowerConsumption/control
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 PY_VERSION = 3
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "graphics_PowerConsumption"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Performance"

server/site_tests/graphics_TraceReplayExtended/control.glxgears_1minute

diff --git a/server/site_tests/graphics_TraceReplayExtended/control.glxgears_1minute b/server/site_tests/graphics_TraceReplayExtended/control.glxgears_1minute
index 98c2ba9..c4a4c6c 100644
--- a/server/site_tests/graphics_TraceReplayExtended/control.glxgears_1minute
+++ b/server/site_tests/graphics_TraceReplayExtended/control.glxgears_1minute
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 PY_VERSION = 3
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "graphics_TraceReplayExtended.glxgears_1minute"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Performance"

server/site_tests/hardware_StorageQualCheckSetup/control

diff --git a/server/site_tests/hardware_StorageQualCheckSetup/control b/server/site_tests/hardware_StorageQualCheckSetup/control
index 862bff3..428a9fc 100644
--- a/server/site_tests/hardware_StorageQualCheckSetup/control
+++ b/server/site_tests/hardware_StorageQualCheckSetup/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "hardware_StorageQualCheckSetup"
 PURPOSE = "Test that the moblab has the correct setup for storage_qual suite"
 ATTRIBUTES = "suite:check_setup_storage_qual"

server/site_tests/infra_FirmwareAutoupdate/control

diff --git a/server/site_tests/infra_FirmwareAutoupdate/control b/server/site_tests/infra_FirmwareAutoupdate/control
index bea5f54..60c7820 100644
--- a/server/site_tests/infra_FirmwareAutoupdate/control
+++ b/server/site_tests/infra_FirmwareAutoupdate/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "infra_FirmwareAutoupdate"
 TIME = "SHORT"
 TEST_TYPE = "server"

server/site_tests/platform_BootDevice/control

diff --git a/server/site_tests/platform_BootDevice/control b/server/site_tests/platform_BootDevice/control
index 6566c8a..64fcc31 100644
--- a/server/site_tests/platform_BootDevice/control
+++ b/server/site_tests/platform_BootDevice/control
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_BootDevice.BootDevice"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 ATTRIBUTES = "suite:kernel_daily_regression"
 TIME = "LONG"
 TEST_CATEGORY = "Stress"

server/site_tests/platform_BootDevice/control.100

diff --git a/server/site_tests/platform_BootDevice/control.100 b/server/site_tests/platform_BootDevice/control.100
index 25be8dc..501d597 100644
--- a/server/site_tests/platform_BootDevice/control.100
+++ b/server/site_tests/platform_BootDevice/control.100
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_BootDevice.BootDevice100"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 ATTRIBUTES = "suite:stress"
 TIME = "LONG"
 TEST_CATEGORY = "Stress"

server/site_tests/platform_ExternalUsbPeripherals/control

diff --git a/server/site_tests/platform_ExternalUsbPeripherals/control b/server/site_tests/platform_ExternalUsbPeripherals/control
index cde6b07..819f9e7 100644
--- a/server/site_tests/platform_ExternalUsbPeripherals/control
+++ b/server/site_tests/platform_ExternalUsbPeripherals/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "platform_ExternalUsbPeripherals"
 PURPOSE = "Servo based USB boot stress test"
 CRITERIA = "This test will fail if any of the actions or checks fail."

server/site_tests/platform_ExternalUsbPeripherals/control.detect.crash_check_short

diff --git a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.crash_check_short b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.crash_check_short
index 8391605..8c8686c 100644
--- a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.crash_check_short
+++ b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.crash_check_short
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "platform_ExternalUsbPeripherals.detect.crash_check_short"
 PURPOSE = "Servo based USB boot stress test"
 CRITERIA = "This test will fail if any of the actions or checks fail."

server/site_tests/platform_ExternalUsbPeripherals/control.detect.lid_close_open_short

diff --git a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.lid_close_open_short b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.lid_close_open_short
index 64cc9d1..9a277d8 100644
--- a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.lid_close_open_short
+++ b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.lid_close_open_short
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "platform_ExternalUsbPeripherals.detect.lid_close_open"
 PURPOSE = "Servo based USB boot stress test"
 CRITERIA = "This test will fail if any of the actions or checks fail."

server/site_tests/platform_ExternalUsbPeripherals/control.detect.long_cycle

diff --git a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.long_cycle b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.long_cycle
index 4f49458..45c68b7 100644
--- a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.long_cycle
+++ b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.long_cycle
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "platform_ExternalUsbPeripherals.detect.long_cycle"
 PURPOSE = "Servo based USB peripheral detection test"
 CRITERIA = "This test will fail if any of the actions or checks fail."

server/site_tests/platform_FlashErasers/control

diff --git a/server/site_tests/platform_FlashErasers/control b/server/site_tests/platform_FlashErasers/control
index 44fe859..ab67893 100644
--- a/server/site_tests/platform_FlashErasers/control
+++ b/server/site_tests/platform_FlashErasers/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "platform_FlashErasers"
 PURPOSE = "Test flashrom erasing blocks of various sizes."
 ATTRIBUTES = "suite:faft_flashrom"

server/site_tests/platform_Flashrom/control

diff --git a/server/site_tests/platform_Flashrom/control b/server/site_tests/platform_Flashrom/control
index b1cc6b4..ba99afa 100644
--- a/server/site_tests/platform_Flashrom/control
+++ b/server/site_tests/platform_Flashrom/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "platform_Flashrom"
 PURPOSE = "Test flashrom in chromeos-firmwareupdate."
 ATTRIBUTES = "suite:faft_flashrom"

server/site_tests/platform_HWwatchdog/control

diff --git a/server/site_tests/platform_HWwatchdog/control b/server/site_tests/platform_HWwatchdog/control
index 3961b3d..55e3b14 100644
--- a/server/site_tests/platform_HWwatchdog/control
+++ b/server/site_tests/platform_HWwatchdog/control
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_HWwatchdog"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 ATTRIBUTES = "suite:kernel_per-build_regression, suite:pvs-kernel"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

server/site_tests/platform_KernelErrorPaths/control.ALL

diff --git a/server/site_tests/platform_KernelErrorPaths/control.ALL b/server/site_tests/platform_KernelErrorPaths/control.ALL
index d52fd68..0f6ef1c 100644
--- a/server/site_tests/platform_KernelErrorPaths/control.ALL
+++ b/server/site_tests/platform_KernelErrorPaths/control.ALL
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_KernelErrorPaths.ALL"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"

server/site_tests/platform_KernelErrorPaths/control.BUG

diff --git a/server/site_tests/platform_KernelErrorPaths/control.BUG b/server/site_tests/platform_KernelErrorPaths/control.BUG
index cfd4475..d9a8623 100644
--- a/server/site_tests/platform_KernelErrorPaths/control.BUG
+++ b/server/site_tests/platform_KernelErrorPaths/control.BUG
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_KernelErrorPaths.BUG"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 ATTRIBUTES = "suite:kernel_per-build_regression, suite:pvs-kernel"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

server/site_tests/platform_KernelErrorPaths/control.CORRUPT_STACK

diff --git a/server/site_tests/platform_KernelErrorPaths/control.CORRUPT_STACK b/server/site_tests/platform_KernelErrorPaths/control.CORRUPT_STACK
index e28a165..f2ed949 100644
--- a/server/site_tests/platform_KernelErrorPaths/control.CORRUPT_STACK
+++ b/server/site_tests/platform_KernelErrorPaths/control.CORRUPT_STACK
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_KernelErrorPaths.CORRUPT_STACK"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 ATTRIBUTES = "suite:kernel_per-build_regression, suite:pvs-kernel, suite:partners"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

server/site_tests/platform_KernelErrorPaths/control.EXCEPTION

diff --git a/server/site_tests/platform_KernelErrorPaths/control.EXCEPTION b/server/site_tests/platform_KernelErrorPaths/control.EXCEPTION
index 922bce8..41fd54b 100644
--- a/server/site_tests/platform_KernelErrorPaths/control.EXCEPTION
+++ b/server/site_tests/platform_KernelErrorPaths/control.EXCEPTION
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_KernelErrorPaths.EXCEPTION"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 ATTRIBUTES = "suite:kernel_per-build_regression, suite:pvs-kernel, suite:partners"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

server/site_tests/platform_KernelErrorPaths/control.HARDLOCKUP

diff --git a/server/site_tests/platform_KernelErrorPaths/control.HARDLOCKUP b/server/site_tests/platform_KernelErrorPaths/control.HARDLOCKUP
index 7298d68..c7eaea7 100644
--- a/server/site_tests/platform_KernelErrorPaths/control.HARDLOCKUP
+++ b/server/site_tests/platform_KernelErrorPaths/control.HARDLOCKUP
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_KernelErrorPaths.HARDLOCKUP"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 ATTRIBUTES = "suite:kernel_per-build_regression, suite:pvs-kernel, suite:partners"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

server/site_tests/platform_KernelErrorPaths/control.HUNG_TASK

diff --git a/server/site_tests/platform_KernelErrorPaths/control.HUNG_TASK b/server/site_tests/platform_KernelErrorPaths/control.HUNG_TASK
index 000c6ff..8e019c1 100644
--- a/server/site_tests/platform_KernelErrorPaths/control.HUNG_TASK
+++ b/server/site_tests/platform_KernelErrorPaths/control.HUNG_TASK
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_KernelErrorPaths.HUNG_TASK"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 ATTRIBUTES = "suite:kernel_per-build_regression, suite:pvs-kernel, suite:partners"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

server/site_tests/platform_KernelErrorPaths/control.PANIC

diff --git a/server/site_tests/platform_KernelErrorPaths/control.PANIC b/server/site_tests/platform_KernelErrorPaths/control.PANIC
index 767fed0..a97ab39 100644
--- a/server/site_tests/platform_KernelErrorPaths/control.PANIC
+++ b/server/site_tests/platform_KernelErrorPaths/control.PANIC
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_KernelErrorPaths.PANIC"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 ATTRIBUTES = "suite:kernel_per-build_regression, suite:pvs-kernel, suite:partners"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

server/site_tests/platform_KernelErrorPaths/control.SOFTLOCKUP

diff --git a/server/site_tests/platform_KernelErrorPaths/control.SOFTLOCKUP b/server/site_tests/platform_KernelErrorPaths/control.SOFTLOCKUP
index ee8b6a9..ddc52fe 100644
--- a/server/site_tests/platform_KernelErrorPaths/control.SOFTLOCKUP
+++ b/server/site_tests/platform_KernelErrorPaths/control.SOFTLOCKUP
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_KernelErrorPaths.SOFTLOCKUP"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 ATTRIBUTES = "suite:kernel_per-build_regression, suite:pvs-kernel, suite:partners"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

server/site_tests/platform_KernelErrorPaths/control.SPINLOCKUP

diff --git a/server/site_tests/platform_KernelErrorPaths/control.SPINLOCKUP b/server/site_tests/platform_KernelErrorPaths/control.SPINLOCKUP
index bd119d9..1269e2a 100644
--- a/server/site_tests/platform_KernelErrorPaths/control.SPINLOCKUP
+++ b/server/site_tests/platform_KernelErrorPaths/control.SPINLOCKUP
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_KernelErrorPaths.SPINLOCKUP"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 ATTRIBUTES = "suite:kernel_per-build_regression, suite:pvs-kernel, suite:partners"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

server/site_tests/platform_KernelErrorPaths/control.SYSRQ_X

diff --git a/server/site_tests/platform_KernelErrorPaths/control.SYSRQ_X b/server/site_tests/platform_KernelErrorPaths/control.SYSRQ_X
index 04aac16..60bbf5f 100644
--- a/server/site_tests/platform_KernelErrorPaths/control.SYSRQ_X
+++ b/server/site_tests/platform_KernelErrorPaths/control.SYSRQ_X
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_KernelErrorPaths.SYSRQ_X"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 ATTRIBUTES = "suite:kernel_per-build_regression, suite:pvs-kernel, suite:partners"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

server/site_tests/platform_ServoPowerStateController/control.nousb

diff --git a/server/site_tests/platform_ServoPowerStateController/control.nousb b/server/site_tests/platform_ServoPowerStateController/control.nousb
index d999511..08f75fb 100644
--- a/server/site_tests/platform_ServoPowerStateController/control.nousb
+++ b/server/site_tests/platform_ServoPowerStateController/control.nousb
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "platform_ServoPowerStateController.USBUnplugged"
 PURPOSE = "Verify servo PowerStateController functions."
 CRITERIA = "This test will fail if servo does not work as expected."

server/site_tests/platform_ServoPowerStateController/control.usb

diff --git a/server/site_tests/platform_ServoPowerStateController/control.usb b/server/site_tests/platform_ServoPowerStateController/control.usb
index 550d8dc..675f2c4 100644
--- a/server/site_tests/platform_ServoPowerStateController/control.usb
+++ b/server/site_tests/platform_ServoPowerStateController/control.usb
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "platform_ServoPowerStateController.USBPluggedin"
 PURPOSE = "Verify servo PowerStateController functions."
 CRITERIA = "This test will fail if servo does not work as expected."

server/site_tests/platform_StageAndRecover/control

diff --git a/server/site_tests/platform_StageAndRecover/control b/server/site_tests/platform_StageAndRecover/control
index 7ff862d..eba45d8 100644
--- a/server/site_tests/platform_StageAndRecover/control
+++ b/server/site_tests/platform_StageAndRecover/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.client.common_lib import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "platform_StageAndRecover"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Install"

server/site_tests/platform_UReadAheadServer/control

diff --git a/server/site_tests/platform_UReadAheadServer/control b/server/site_tests/platform_UReadAheadServer/control
index 7878b75..04868e9 100644
--- a/server/site_tests/platform_UReadAheadServer/control
+++ b/server/site_tests/platform_UReadAheadServer/control
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 NAME = "platform_UReadAheadServer"
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 TIME = "SHORT"
 TEST_CLASS = "platform"
 TEST_TYPE = "server"

server/site_tests/power_BatteryChargeControl/control.args

diff --git a/server/site_tests/power_BatteryChargeControl/control.args b/server/site_tests/power_BatteryChargeControl/control.args
index 11a3af1..2a12226 100644
--- a/server/site_tests/power_BatteryChargeControl/control.args
+++ b/server/site_tests/power_BatteryChargeControl/control.args
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_BatteryChargeControl.args"
 PURPOSE = "Use Servo v4 to charge the DUT"
 CRITERIA = ""

server/site_tests/power_BatteryChargeControl/control.charge70

diff --git a/server/site_tests/power_BatteryChargeControl/control.charge70 b/server/site_tests/power_BatteryChargeControl/control.charge70
index 094dfe0..74f7116 100644
--- a/server/site_tests/power_BatteryChargeControl/control.charge70
+++ b/server/site_tests/power_BatteryChargeControl/control.charge70
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_BatteryChargeControl.charge70"
 PURPOSE = "Use Servo v4 to charge the DUT"
 CRITERIA = ""

server/site_tests/power_BatteryChargeControl/control.charge95

diff --git a/server/site_tests/power_BatteryChargeControl/control.charge95 b/server/site_tests/power_BatteryChargeControl/control.charge95
index ed8cc52..4293a19 100644
--- a/server/site_tests/power_BatteryChargeControl/control.charge95
+++ b/server/site_tests/power_BatteryChargeControl/control.charge95
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_BatteryChargeControl.charge95"
 PURPOSE = "Use Servo v4 to charge the DUT"
 CRITERIA = ""

server/site_tests/power_BrightnessResetAfterReboot/control

diff --git a/server/site_tests/power_BrightnessResetAfterReboot/control b/server/site_tests/power_BrightnessResetAfterReboot/control
index e8e523e..441018c 100644
--- a/server/site_tests/power_BrightnessResetAfterReboot/control
+++ b/server/site_tests/power_BrightnessResetAfterReboot/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_BrightnessResetAfterReboot"
 PURPOSE = "default brightness test."
 CRITERIA = "This test will fail if unable to set the default brightness after reboot."

server/site_tests/power_QualTestWrapper/control.FastLoadTest

diff --git a/server/site_tests/power_QualTestWrapper/control.FastLoadTest b/server/site_tests/power_QualTestWrapper/control.FastLoadTest
index 6318eca..dcea28c 100644
--- a/server/site_tests/power_QualTestWrapper/control.FastLoadTest
+++ b/server/site_tests/power_QualTestWrapper/control.FastLoadTest
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS PVS Team"
+AUTHOR = "ChromeOS PVS Team"
 NAME = "power_FastLoadTest"
 PURPOSE = "power_Dummy orchestrated with wrappers for qualification"
 CRITERIA = "This test is a benchmark."

server/site_tests/pvs_Sequence/control.ExampleSequence

diff --git a/server/site_tests/pvs_Sequence/control.ExampleSequence b/server/site_tests/pvs_Sequence/control.ExampleSequence
index 6560040..b035d33 100644
--- a/server/site_tests/pvs_Sequence/control.ExampleSequence
+++ b/server/site_tests/pvs_Sequence/control.ExampleSequence
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS PVS Team"
+AUTHOR = "ChromeOS PVS Team"
 NAME = "pvs_Sequence.ExampleSequence"
 PURPOSE = "stub_Pass and PassServer, instrumented as a basic sequence example"
 CRITERIA = "This test is a benchmark."

server/site_tests/sequences/control.power

diff --git a/server/site_tests/sequences/control.power b/server/site_tests/sequences/control.power
index 352e8e7..43ca49a 100644
--- a/server/site_tests/sequences/control.power
+++ b/server/site_tests/sequences/control.power
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "Power"
 TIME = "LONG"
 TEST_CATEGORY = "Functional"

server/site_tests/sequences/control.power_build

diff --git a/server/site_tests/sequences/control.power_build b/server/site_tests/sequences/control.power_build
index 21d2ad4..a64802c 100644
--- a/server/site_tests/sequences/control.power_build
+++ b/server/site_tests/sequences/control.power_build
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "Power per-build tests"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Functional"

server/site_tests/sequences/control.power_daily

diff --git a/server/site_tests/sequences/control.power_daily b/server/site_tests/sequences/control.power_daily
index 90e90d2..6793402 100644
--- a/server/site_tests/sequences/control.power_daily
+++ b/server/site_tests/sequences/control.power_daily
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "Power daily tests"
 ATTRIBUTES = "suite:power_daily"
 TIME = "LONG"

server/site_tests/sequences/control.power_weekly

diff --git a/server/site_tests/sequences/control.power_weekly b/server/site_tests/sequences/control.power_weekly
index 5e3cbf4..2d7c905 100644
--- a/server/site_tests/sequences/control.power_weekly
+++ b/server/site_tests/sequences/control.power_weekly
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "Power Requirements tests"
 ATTRIBUTES = "suite:power_requirements"
 TIME = "LONG"

server/site_tests/servo_LabstationVerification/control

diff --git a/server/site_tests/servo_LabstationVerification/control b/server/site_tests/servo_LabstationVerification/control
index 0c10458..3659c0a 100644
--- a/server/site_tests/servo_LabstationVerification/control
+++ b/server/site_tests/servo_LabstationVerification/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "servo_LabstationVerification"
 PURPOSE = "Ensure labstation images can provide basic lab functionality."
 ATTRIBUTES = "suite:labstation_verification"

server/site_tests/servo_LabstationVerification/control.local

diff --git a/server/site_tests/servo_LabstationVerification/control.local b/server/site_tests/servo_LabstationVerification/control.local
index c1bb3fb..5969df8 100644
--- a/server/site_tests/servo_LabstationVerification/control.local
+++ b/server/site_tests/servo_LabstationVerification/control.local
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "servo_LabstationVerification.local"
 PURPOSE = "Ensure labstation images can provide basic lab functionality."
 TIME = "MEDIUM"

server/site_tests/servo_USBInstall/control

diff --git a/server/site_tests/servo_USBInstall/control b/server/site_tests/servo_USBInstall/control
index 7e54d90..695ffa6 100644
--- a/server/site_tests/servo_USBInstall/control
+++ b/server/site_tests/servo_USBInstall/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "servo_USBInstall"
 PURPOSE = "Force reinstall cros to a dut from the servo."
 TIME = "MEDIUM"

server/site_tests/servo_Verification/control

diff --git a/server/site_tests/servo_Verification/control b/server/site_tests/servo_Verification/control
index 5bb3122..3c85a2c 100644
--- a/server/site_tests/servo_Verification/control
+++ b/server/site_tests/servo_Verification/control
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "servo_Verification"
 PURPOSE = "Ensure a dut/servo pair provide required lab functionality."
 ATTRIBUTES = "suite:servo_verification"

server/site_tests/servo_Verification/control.local

diff --git a/server/site_tests/servo_Verification/control.local b/server/site_tests/servo_Verification/control.local
index 6feae9a..efde06d 100644
--- a/server/site_tests/servo_Verification/control.local
+++ b/server/site_tests/servo_Verification/control.local
@@ -4,7 +4,7 @@
 
 from autotest_lib.server import utils
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "servo_Verification.local"
 PURPOSE = "Ensure a dut/servo pair provide required lab functionality."
 ATTRIBUTES = "suite:servo_verification"

server/site_tests/stub_PassServer/control

diff --git a/server/site_tests/stub_PassServer/control b/server/site_tests/stub_PassServer/control
index 5ed613b..255f480 100644
--- a/server/site_tests/stub_PassServer/control
+++ b/server/site_tests/stub_PassServer/control
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "stub_PassServer"
 PURPOSE = "Demonstrate success methods of autotests."
 CRITERIA = "This test will always succeed."

server/site_tests/stub_PassServer/control.nossp

diff --git a/server/site_tests/stub_PassServer/control.nossp b/server/site_tests/stub_PassServer/control.nossp
index 2463d89..65ac682 100644
--- a/server/site_tests/stub_PassServer/control.nossp
+++ b/server/site_tests/stub_PassServer/control.nossp
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "stub_PassServer_nossp"
 PURPOSE = "Demonstrate success methods of autotests."
 CRITERIA = "This test will always succeed."

server/site_tests/stub_PassServer/control.ssp

diff --git a/server/site_tests/stub_PassServer/control.ssp b/server/site_tests/stub_PassServer/control.ssp
index b53138e..2a8c2c3 100644
--- a/server/site_tests/stub_PassServer/control.ssp
+++ b/server/site_tests/stub_PassServer/control.ssp
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "stub_PassServer.ssp"
 PURPOSE = "Demonstrate success methods of autotests."
 CRITERIA = "This test will always succeed when running in a container."

server/site_tests/tast/control.pvs-audio

diff --git a/server/site_tests/tast/control.pvs-audio b/server/site_tests/tast/control.pvs-audio
index 17c7cdc..a49f62f 100644
--- a/server/site_tests/tast/control.pvs-audio
+++ b/server/site_tests/tast/control.pvs-audio
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = 'Chrome OS Team'
+AUTHOR = 'ChromeOS Team'
 NAME = 'tast.pvs-audio'
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'

server/site_tests/tast/control.pvs-display

diff --git a/server/site_tests/tast/control.pvs-display b/server/site_tests/tast/control.pvs-display
index 70f14a2..289c14e 100644
--- a/server/site_tests/tast/control.pvs-display
+++ b/server/site_tests/tast/control.pvs-display
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = 'Chrome OS Team'
+AUTHOR = 'ChromeOS Team'
 NAME = 'tast.pvs-display'
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'

server/site_tests/tast/control.pvs-graphics

diff --git a/server/site_tests/tast/control.pvs-graphics b/server/site_tests/tast/control.pvs-graphics
index 9b4568a..df5ee95 100644
--- a/server/site_tests/tast/control.pvs-graphics
+++ b/server/site_tests/tast/control.pvs-graphics
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = 'Chrome OS Team'
+AUTHOR = 'ChromeOS Team'
 NAME = 'tast.pvs-graphics'
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'

server/site_tests/tast/control.pvs-staging

diff --git a/server/site_tests/tast/control.pvs-staging b/server/site_tests/tast/control.pvs-staging
index eda7e8a..8e12323 100644
--- a/server/site_tests/tast/control.pvs-staging
+++ b/server/site_tests/tast/control.pvs-staging
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = 'mwiitala, Chrome OS Kernel Team'
+AUTHOR = 'mwiitala, ChromeOS Kernel Team'
 NAME = 'tast.pvs-staging'
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'

server/site_tests/tast/control.pvs-tast-cq

diff --git a/server/site_tests/tast/control.pvs-tast-cq b/server/site_tests/tast/control.pvs-tast-cq
index e4dd33e..55a3094 100644
--- a/server/site_tests/tast/control.pvs-tast-cq
+++ b/server/site_tests/tast/control.pvs-tast-cq
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = 'Chrome OS Team'
+AUTHOR = 'ChromeOS Team'
 NAME = 'tast.pvs-tast-cq'
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'

server/site_tests/tast/control.pvs-video

diff --git a/server/site_tests/tast/control.pvs-video b/server/site_tests/tast/control.pvs-video
index 951778d..69add89 100644
--- a/server/site_tests/tast/control.pvs-video
+++ b/server/site_tests/tast/control.pvs-video
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = 'Chrome OS Team'
+AUTHOR = 'ChromeOS Team'
 NAME = 'tast.pvs-video'
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'

server/site_tests/tast/control.syzcorpus

diff --git a/server/site_tests/tast/control.syzcorpus b/server/site_tests/tast/control.syzcorpus
index b129b3d..07c39f7 100644
--- a/server/site_tests/tast/control.syzcorpus
+++ b/server/site_tests/tast/control.syzcorpus
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = 'zsm, Chrome OS Kernel Team'
+AUTHOR = 'zsm, ChromeOS Kernel Team'
 NAME = 'tast.syzcorpus'
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'
@@ -14,7 +14,7 @@
 REQUIRE_SSP = True
 
 DOC = '''
-Run the Tast test(s) to run Syzkaller reproducers to test Chrome OS kernels.
+Run the Tast test(s) to run Syzkaller reproducers to test ChromeOS Kernels.
 This is a regression test suite for the kernel(both core and drivers).
 See https://github.com/dvyukov/syzkaller-repros for more information.
 

server/site_tests/tast/control.syzkaller

diff --git a/server/site_tests/tast/control.syzkaller b/server/site_tests/tast/control.syzkaller
index 187f8f5..d2c015a 100644
--- a/server/site_tests/tast/control.syzkaller
+++ b/server/site_tests/tast/control.syzkaller
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = 'mwiitala, Chrome OS Kernel Team'
+AUTHOR = 'mwiitala, ChromeOS Kernel Team'
 NAME = 'tast.syzkaller'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
@@ -14,7 +14,7 @@
 REQUIRE_SSP = True
 
 DOC = '''
-Run the Tast test(s) to fuzz the Chrome OS kernel using Syzkaller.
+Run the Tast test(s) to fuzz the ChromeOS Kernel using Syzkaller.
 See go/ctp-syzkaller for more details.
 
 Tast is an integration-testing framework analogous to the test-running portion

server/site_tests/telemetry_Benchmarks/control.backdrop_filter.rendering.desktop

diff --git a/server/site_tests/telemetry_Benchmarks/control.backdrop_filter.rendering.desktop b/server/site_tests/telemetry_Benchmarks/control.backdrop_filter.rendering.desktop
index 0bbcac2..b4807ee 100644
--- a/server/site_tests/telemetry_Benchmarks/control.backdrop_filter.rendering.desktop
+++ b/server/site_tests/telemetry_Benchmarks/control.backdrop_filter.rendering.desktop
@@ -9,7 +9,7 @@
 
 from autotest_lib.client.common_lib import utils
 
-AUTHOR = 'Chrome OS Team'
+AUTHOR = 'ChromeOS Team'
 NAME = 'telemetry_Benchmarks.backdrop_filter.rendering.desktop'
 ATTRIBUTES = 'suite:crosbolt_perf_perbuild'
 TIME = 'LONG'
@@ -21,7 +21,7 @@
 DOC = '''
 This server side test suite executes the Telemetry Benchmark:
 rendering.desktop (but only stories with tag backdrop_filter)
-This is part of Chrome for Chrome OS performance testing.
+This is part of Chrome for ChromeOS performance testing.
 
 Pass local=True to run with local telemetry and no AFE server.
 '''

server/site_tests/telemetry_Benchmarks/control.blink_perf.image_decoder

diff --git a/server/site_tests/telemetry_Benchmarks/control.blink_perf.image_decoder b/server/site_tests/telemetry_Benchmarks/control.blink_perf.image_decoder
index b272ea7..2c49c0d 100644
--- a/server/site_tests/telemetry_Benchmarks/control.blink_perf.image_decoder
+++ b/server/site_tests/telemetry_Benchmarks/control.blink_perf.image_decoder
@@ -6,7 +6,7 @@
 
 from autotest_lib.client.common_lib import utils
 
-AUTHOR = 'Chrome OS Team'
+AUTHOR = 'ChromeOS Team'
 NAME = 'telemetry_Benchmarks.blink_perf.image_decoder'
 # Disable this test until it can be fixed: http://b/170998795
 # ATTRIBUTES = 'suite:crosbolt_perf_nightly'
@@ -19,7 +19,7 @@
 DOC = '''
 This server side test suite executes the Telemetry Benchmark:
 blink_perf.image_decoder
-This is part of Chrome for Chrome OS performance testing.
+This is part of Chrome for ChromeOS performance testing.
 
 Pass local=True to run with local telemetry and no AFE server.
 '''

server/site_tests/telemetry_Benchmarks/control.loading.desktop

diff --git a/server/site_tests/telemetry_Benchmarks/control.loading.desktop b/server/site_tests/telemetry_Benchmarks/control.loading.desktop
index 48954bc..a1330ae 100644
--- a/server/site_tests/telemetry_Benchmarks/control.loading.desktop
+++ b/server/site_tests/telemetry_Benchmarks/control.loading.desktop
@@ -6,7 +6,7 @@
 
 from autotest_lib.client.common_lib import utils
 
-AUTHOR = 'Chrome OS Team'
+AUTHOR = 'ChromeOS Team'
 NAME = 'telemetry_Benchmarks.loading.desktop'
 ATTRIBUTES = 'suite:crosbolt_perf_perbuild'
 TIME = 'LONG'
@@ -18,7 +18,7 @@
 DOC = '''
 This server side test suite executes the Telemetry Benchmark:
 loading.desktop
-This is part of Chrome for Chrome OS performance testing.
+This is part of Chrome for ChromeOS performance testing.
 
 Pass local=True to run with local telemetry and no AFE server.
 '''

server/site_tests/telemetry_Benchmarks/control.rendering.desktop

diff --git a/server/site_tests/telemetry_Benchmarks/control.rendering.desktop b/server/site_tests/telemetry_Benchmarks/control.rendering.desktop
index 200d91f..4863abe 100644
--- a/server/site_tests/telemetry_Benchmarks/control.rendering.desktop
+++ b/server/site_tests/telemetry_Benchmarks/control.rendering.desktop
@@ -6,7 +6,7 @@
 
 from autotest_lib.client.common_lib import utils
 
-AUTHOR = 'Chrome OS Team'
+AUTHOR = 'ChromeOS Team'
 NAME = 'telemetry_Benchmarks.rendering.desktop'
 ATTRIBUTES = 'suite:crosbolt_perf_perbuild'
 TIME = 'LONG'
@@ -18,7 +18,7 @@
 DOC = '''
 This server side test suite executes the Telemetry Benchmark:
 rendering.desktop
-This is part of Chrome for Chrome OS performance testing.
+This is part of Chrome for ChromeOS performance testing.
 
 Pass local=True to run with local telemetry and no AFE server.
 '''

server/site_tests/telemetry_Benchmarks/control.speedometer2

diff --git a/server/site_tests/telemetry_Benchmarks/control.speedometer2 b/server/site_tests/telemetry_Benchmarks/control.speedometer2
index 2dd411e..8700490 100644
--- a/server/site_tests/telemetry_Benchmarks/control.speedometer2
+++ b/server/site_tests/telemetry_Benchmarks/control.speedometer2
@@ -6,7 +6,7 @@
 
 from autotest_lib.client.common_lib import utils
 
-AUTHOR = 'Chrome OS Team'
+AUTHOR = 'ChromeOS Team'
 NAME = 'telemetry_Benchmarks.speedometer2'
 ATTRIBUTES = 'suite:crosbolt_perf_perbuild'
 TIME = 'LONG'
@@ -18,7 +18,7 @@
 DOC = '''
 This server side test suite executes the Telemetry Benchmark:
 speedometer2
-This is part of Chrome for Chrome OS performance testing.
+This is part of Chrome for ChromeOS performance testing.
 
 Pass local=True to run with local telemetry and no AFE server.
 '''

server/site_tests/telemetry_Crosperf/control

diff --git a/server/site_tests/telemetry_Crosperf/control b/server/site_tests/telemetry_Crosperf/control
index 0247320..0a86dad 100644
--- a/server/site_tests/telemetry_Crosperf/control
+++ b/server/site_tests/telemetry_Crosperf/control
@@ -16,7 +16,7 @@
 
 DOC = """
 This runs various Telemetry performance tests under the crosperf script.
-This is part of Chrome OS Toolchain testing platform.
+This is part of ChromeOS Toolchain testing platform.
 """
 
 # Put the args into the args_dict.

server/site_tests/telemetry_ScrollingActionTests/control

diff --git a/server/site_tests/telemetry_ScrollingActionTests/control b/server/site_tests/telemetry_ScrollingActionTests/control
index f772c23..e666217 100644
--- a/server/site_tests/telemetry_ScrollingActionTests/control
+++ b/server/site_tests/telemetry_ScrollingActionTests/control
@@ -11,7 +11,7 @@
 
 DOC = """
 This server side test suite executes the Telemetry Scrolling Benchmark.
-This is part of our effort to support Chrome for Chrome OS performance testing.
+This is part of our effort to support Chrome for ChromeOS performance testing.
 """
 
 def run_test(machine):

test_suites/control.AFDO_record

diff --git a/test_suites/control.AFDO_record b/test_suites/control.AFDO_record
index 394c7ac..be8f31a 100644
--- a/test_suites/control.AFDO_record
+++ b/test_suites/control.AFDO_record
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "AFDO_record"
 PURPOSE = "Exercise Chrome, record profiling data using AFDO."
 

test_suites/control.arc-data-snapshot_per-build

diff --git a/test_suites/control.arc-data-snapshot_per-build b/test_suites/control.arc-data-snapshot_per-build
index 03d2fe8..543ec3a 100644
--- a/test_suites/control.arc-data-snapshot_per-build
+++ b/test_suites/control.arc-data-snapshot_per-build
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team, arc-commercial@google.com"
+AUTHOR = "ChromeOS Team, arc-commercial@google.com"
 NAME = "arc-data-snapshot_per-build"
 PURPOSE = "ARC data/ snapshot tests"
 

test_suites/control.arcless_smoke

diff --git a/test_suites/control.arcless_smoke b/test_suites/control.arcless_smoke
index 870bbc9..87c603a 100644
--- a/test_suites/control.arcless_smoke
+++ b/test_suites/control.arcless_smoke
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "arcless_smoke"
 PURPOSE = "Basic non-ARC tests that are able to run in VMs"
 

test_suites/control.audio_essential

diff --git a/test_suites/control.audio_essential b/test_suites/control.audio_essential
index 2c55135..34ba596 100644
--- a/test_suites/control.audio_essential
+++ b/test_suites/control.audio_essential
@@ -13,7 +13,7 @@
 
 DOC = """
 Audio tests that cover audio functionalities that are essential to the
-Chrome OS audio stack.
+ChromeOS audio stack.
 
 Generally the tests require chameleon and audio boards connected.
 Together with DUT and jack plugger bundled in audio-box environment for

test_suites/control.bluetooth

diff --git a/test_suites/control.bluetooth b/test_suites/control.bluetooth
index e88726d..423fda4 100644
--- a/test_suites/control.bluetooth
+++ b/test_suites/control.bluetooth
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bluetooth"
 PURPOSE = "Automated testing of Bluetooth."
 

test_suites/control.bluetooth_e2e

diff --git a/test_suites/control.bluetooth_e2e b/test_suites/control.bluetooth_e2e
index a28bf34..6ca8c01 100644
--- a/test_suites/control.bluetooth_e2e
+++ b/test_suites/control.bluetooth_e2e
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bluetooth_e2e"
 PURPOSE = "Automated testing of Bluetooth."
 

test_suites/control.bluetooth_e2e_cq

diff --git a/test_suites/control.bluetooth_e2e_cq b/test_suites/control.bluetooth_e2e_cq
index 6aff6e1..c63debc 100644
--- a/test_suites/control.bluetooth_e2e_cq
+++ b/test_suites/control.bluetooth_e2e_cq
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Bluetooth Team"
+AUTHOR = "ChromeOS Bluetooth Team"
 NAME = "bluetooth_e2e_cq"
 PURPOSE = "Bluetooth tests to be included in rfcell CQ"
 

test_suites/control.bluetooth_flaky

diff --git a/test_suites/control.bluetooth_flaky b/test_suites/control.bluetooth_flaky
index 80f0695..deb4d91 100644
--- a/test_suites/control.bluetooth_flaky
+++ b/test_suites/control.bluetooth_flaky
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bluetooth_flaky"
 PURPOSE = "Automated testing of Bluetooth."
 

test_suites/control.bluetooth_floss

diff --git a/test_suites/control.bluetooth_floss b/test_suites/control.bluetooth_floss
index cc50ac5..35d3647 100644
--- a/test_suites/control.bluetooth_floss
+++ b/test_suites/control.bluetooth_floss
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Bluetooth Team"
+AUTHOR = "ChromeOS Bluetooth Team"
 NAME = "bluetooth_floss"
 PURPOSE = "Automated testing of Bluetooth Floss Stack"
 

test_suites/control.bluetooth_health

diff --git a/test_suites/control.bluetooth_health b/test_suites/control.bluetooth_health
index 8db9012..0eaa799 100644
--- a/test_suites/control.bluetooth_health
+++ b/test_suites/control.bluetooth_health
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bluetooth_health"
 PURPOSE = "Automated health testing of Bluetooth."
 

test_suites/control.bluetooth_mtbf

diff --git a/test_suites/control.bluetooth_mtbf b/test_suites/control.bluetooth_mtbf
index 510488b..6018c21 100644
--- a/test_suites/control.bluetooth_mtbf
+++ b/test_suites/control.bluetooth_mtbf
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bluetooth_mtbf"
 PURPOSE = "Automated mtbf testing of Bluetooth."
 

test_suites/control.bluetooth_qualification

diff --git a/test_suites/control.bluetooth_qualification b/test_suites/control.bluetooth_qualification
index 4df7f2d..e8ad1fd 100644
--- a/test_suites/control.bluetooth_qualification
+++ b/test_suites/control.bluetooth_qualification
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bluetooth_qualification"
 PURPOSE = "Automated qualification testing of Bluetooth."
 

test_suites/control.bluetooth_standalone

diff --git a/test_suites/control.bluetooth_standalone b/test_suites/control.bluetooth_standalone
index 0252a71..3d520ef 100644
--- a/test_suites/control.bluetooth_standalone
+++ b/test_suites/control.bluetooth_standalone
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bluetooth_standalone"
 PURPOSE = "Automated testing of Bluetooth."
 

test_suites/control.bluetooth_standalone_cq

diff --git a/test_suites/control.bluetooth_standalone_cq b/test_suites/control.bluetooth_standalone_cq
index 281ae24..01e1961 100644
--- a/test_suites/control.bluetooth_standalone_cq
+++ b/test_suites/control.bluetooth_standalone_cq
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Bluetooth Team"
+AUTHOR = "ChromeOS Bluetooth Team"
 NAME = "bluetooth_standalone_cq"
 PURPOSE = "Standalone Bluetooth tests to be included in CQ"
 

test_suites/control.bluetooth_stress

diff --git a/test_suites/control.bluetooth_stress b/test_suites/control.bluetooth_stress
index 713d01c..4a91c97 100644
--- a/test_suites/control.bluetooth_stress
+++ b/test_suites/control.bluetooth_stress
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bluetooth_stress"
 PURPOSE = "Automated stress testing of Bluetooth."
 

test_suites/control.bluetooth_wifi_coex

diff --git a/test_suites/control.bluetooth_wifi_coex b/test_suites/control.bluetooth_wifi_coex
index 8314e66..dc9126e 100644
--- a/test_suites/control.bluetooth_wifi_coex
+++ b/test_suites/control.bluetooth_wifi_coex
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bluetooth_wifi_coex"
 PURPOSE = "Automated testing of Bluetooth."
 

test_suites/control.bluetooth_wifi_testbed_update

diff --git a/test_suites/control.bluetooth_wifi_testbed_update b/test_suites/control.bluetooth_wifi_testbed_update
index 3ab0bd8..81b8047 100644
--- a/test_suites/control.bluetooth_wifi_testbed_update
+++ b/test_suites/control.bluetooth_wifi_testbed_update
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Platform Engprod Team, cros-conn-test-team@google.com"
+AUTHOR = "ChromeOS Platform Engprod Team, cros-conn-test-team@google.com"
 NAME = "bluetooth_wifi_testbed_update"
 PURPOSE = "Tests that check and update bluetooth/WiFi peer in wificell test bed"
 

test_suites/control.borealis-cq

diff --git a/test_suites/control.borealis-cq b/test_suites/control.borealis-cq
index 8801cc6..1f4cb60 100644
--- a/test_suites/control.borealis-cq
+++ b/test_suites/control.borealis-cq
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Graphics Team"
+AUTHOR = "ChromeOS Graphics Team"
 NAME = "borealis-cq"
 PURPOSE = "Run borealis-related critical tests."
 

test_suites/control.bvt-arc

diff --git a/test_suites/control.bvt-arc b/test_suites/control.bvt-arc
index 67ced11..2e68fd7 100644
--- a/test_suites/control.bvt-arc
+++ b/test_suites/control.bvt-arc
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-arc"
 PURPOSE = "Test basic functionality of ARC."
 
@@ -19,10 +19,10 @@
   * Failures in the canary turn the tree red, block lower priority
     tests for the build, and generally mean that QA cannot further
     evaluate the build's fitness for release.
-  * Chrome OS CLs must pass these tests in the Commit Queue prior to
+  * ChromeOS CLs must pass these tests in the Commit Queue prior to
     being accepted into the tree.
   * A new Chrome or Android build must pass these tests prior to the
-    build being included in a Chrome OS canary build.
+    build being included in a ChromeOS canary build.
 
 Requirements for a test to be in this suite:
  1. The test should be SHORT or MEDIUM, and should not require any

test_suites/control.bvt-cq

diff --git a/test_suites/control.bvt-cq b/test_suites/control.bvt-cq
index 29dbdc0..8b15984 100644
--- a/test_suites/control.bvt-cq
+++ b/test_suites/control.bvt-cq
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-cq"
 PURPOSE = "Test functionality required by the Commit Queue."
 
@@ -13,12 +13,12 @@
 
 DOC = """
 This is the portion of the Build Verification Test suite required to
-pass the Chrome OS Commit Queue and Pre-Flight Queue.  Test failures
+pass the ChromeOS Commit Queue and Pre-Flight Queue.  Test failures
 prevent code from being included in the tree or in canary builds:
-  * Chrome OS CLs must pass these tests prior to being accepted into
+  * ChromeOS CLs must pass these tests prior to being accepted into
     the tree.
   * A new Chrome build must pass these tests prior to the build
-    being included in a Chrome OS canary build.
+    being included in a ChromeOS canary build.
 
 Requirements for a test to be in this suite:
  1. The test should be SHORT, and should not require any specialized

test_suites/control.bvt-inline

diff --git a/test_suites/control.bvt-inline b/test_suites/control.bvt-inline
index c93df23..49297cb 100644
--- a/test_suites/control.bvt-inline
+++ b/test_suites/control.bvt-inline
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-inline"
 PURPOSE = "Test critical functionality."
 

test_suites/control.bvt-installer

diff --git a/test_suites/control.bvt-installer b/test_suites/control.bvt-installer
index 143a6a6..7f6a76c 100644
--- a/test_suites/control.bvt-installer
+++ b/test_suites/control.bvt-installer
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-installer"
 PURPOSE = "Build verification of ChromeOS pieces related to Installer."
 

test_suites/control.bvt-perbuild

diff --git a/test_suites/control.bvt-perbuild b/test_suites/control.bvt-perbuild
index fc4c19d..6134320 100644
--- a/test_suites/control.bvt-perbuild
+++ b/test_suites/control.bvt-perbuild
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-perbuild"
 PURPOSE = "Test basic, required functionality."
 

test_suites/control.bvt-tast-android-pfq

diff --git a/test_suites/control.bvt-tast-android-pfq b/test_suites/control.bvt-tast-android-pfq
index 3dd2d45..c411a04 100644
--- a/test_suites/control.bvt-tast-android-pfq
+++ b/test_suites/control.bvt-tast-android-pfq
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-android-pfq"
 PURPOSE = "Tests critical ARC functionality for Android PFQ using Tast."
 

test_suites/control.bvt-tast-arc

diff --git a/test_suites/control.bvt-tast-arc b/test_suites/control.bvt-tast-arc
index ac74de7..065bf19 100644
--- a/test_suites/control.bvt-tast-arc
+++ b/test_suites/control.bvt-tast-arc
@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-arc"
-PURPOSE = "Tests critical ARC functionality for Chrome OS CQ using Tast."
+PURPOSE = "Tests critical ARC functionality for ChromeOS CQ using Tast."
 
 TIME = "SHORT"
 TEST_CATEGORY = "General"
@@ -13,7 +13,7 @@
 
 DOC = """
 This suite verifies ARC's basic functionality for ARC variant boards
-(e.g. *-arc-r) in the Chrome OS CQ, by running ARC-specific Tast integration
+(e.g. *-arc-r) in the ChromeOS CQ, by running ARC-specific Tast integration
 tests that must always pass against a DUT. See http://go/tast for more
 information about Tast.
 

test_suites/control.bvt-tast-chrome-pfq

diff --git a/test_suites/control.bvt-tast-chrome-pfq b/test_suites/control.bvt-tast-chrome-pfq
index 2a546b0..e24f7fb 100644
--- a/test_suites/control.bvt-tast-chrome-pfq
+++ b/test_suites/control.bvt-tast-chrome-pfq
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-chrome-pfq"
 PURPOSE = "Tests critical Chrome functionality for Chrome PFQ using Tast."
 

test_suites/control.bvt-tast-cq

diff --git a/test_suites/control.bvt-tast-cq b/test_suites/control.bvt-tast-cq
index 9e13058..faf24e3 100644
--- a/test_suites/control.bvt-tast-cq
+++ b/test_suites/control.bvt-tast-cq
@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq"
-PURPOSE = "Tests all critical functionality for Chrome OS CQ using Tast."
+PURPOSE = "Tests all critical functionality for ChromeOS CQ using Tast."
 
 TIME = "SHORT"
 TEST_CATEGORY = "General"
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests (exercising ARC, Chrome, and the OS
 itself) that must always pass against a DUT. See http://go/tast for more
 information about Tast.

test_suites/control.bvt-tast-cq-a11y

diff --git a/test_suites/control.bvt-tast-cq-a11y b/test_suites/control.bvt-tast-cq-a11y
index a94aca6..32e5293 100644
--- a/test_suites/control.bvt-tast-cq-a11y
+++ b/test_suites/control.bvt-tast-cq-a11y
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-a11y"
 PURPOSE = 'Tests the critical Tast tests in the "a11y" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "a11y" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-ad

diff --git a/test_suites/control.bvt-tast-cq-ad b/test_suites/control.bvt-tast-cq-ad
index 99d98d1..250fcf2 100644
--- a/test_suites/control.bvt-tast-cq-ad
+++ b/test_suites/control.bvt-tast-cq-ad
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-ad"
 PURPOSE = 'Tests the critical Tast tests in the "ad" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "ad" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-ambient

diff --git a/test_suites/control.bvt-tast-cq-ambient b/test_suites/control.bvt-tast-cq-ambient
index 6927a84..d431a6e 100644
--- a/test_suites/control.bvt-tast-cq-ambient
+++ b/test_suites/control.bvt-tast-cq-ambient
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-ambient"
 PURPOSE = 'Tests the critical Tast tests in the "ambient" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "ambient" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-apps

diff --git a/test_suites/control.bvt-tast-cq-apps b/test_suites/control.bvt-tast-cq-apps
index e4f66ec..c020e18 100644
--- a/test_suites/control.bvt-tast-cq-apps
+++ b/test_suites/control.bvt-tast-cq-apps
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-apps"
 PURPOSE = 'Tests the critical Tast tests in the "apps" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "apps" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-arc

diff --git a/test_suites/control.bvt-tast-cq-arc b/test_suites/control.bvt-tast-cq-arc
index a2c8702..4ad353f 100644
--- a/test_suites/control.bvt-tast-cq-arc
+++ b/test_suites/control.bvt-tast-cq-arc
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-arc"
 PURPOSE = 'Tests the critical Tast tests in the "arc" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "arc" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-arcappcompat

diff --git a/test_suites/control.bvt-tast-cq-arcappcompat b/test_suites/control.bvt-tast-cq-arcappcompat
index 1eab0cb..ead80bd 100644
--- a/test_suites/control.bvt-tast-cq-arcappcompat
+++ b/test_suites/control.bvt-tast-cq-arcappcompat
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-arcappcompat"
 PURPOSE = 'Tests the critical Tast tests in the "arcappcompat" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "arcappcompat" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-assistant

diff --git a/test_suites/control.bvt-tast-cq-assistant b/test_suites/control.bvt-tast-cq-assistant
index 2966ad9..dc33665 100644
--- a/test_suites/control.bvt-tast-cq-assistant
+++ b/test_suites/control.bvt-tast-cq-assistant
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-assistant"
 PURPOSE = 'Tests the critical Tast tests in the "assistant" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "assistant" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-audio

diff --git a/test_suites/control.bvt-tast-cq-audio b/test_suites/control.bvt-tast-cq-audio
index 3d64fbd..91cc3b0 100644
--- a/test_suites/control.bvt-tast-cq-audio
+++ b/test_suites/control.bvt-tast-cq-audio
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-audio"
 PURPOSE = 'Tests the critical Tast tests in the "audio" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "audio" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-baserpc

diff --git a/test_suites/control.bvt-tast-cq-baserpc b/test_suites/control.bvt-tast-cq-baserpc
index 286e0c8..a879e81 100644
--- a/test_suites/control.bvt-tast-cq-baserpc
+++ b/test_suites/control.bvt-tast-cq-baserpc
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-baserpc"
 PURPOSE = 'Tests the critical Tast tests in the "baserpc" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "baserpc" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-biod

diff --git a/test_suites/control.bvt-tast-cq-biod b/test_suites/control.bvt-tast-cq-biod
index 0ca4591..9e98e98 100644
--- a/test_suites/control.bvt-tast-cq-biod
+++ b/test_suites/control.bvt-tast-cq-biod
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-biod"
 PURPOSE = 'Tests the critical Tast tests in the "biod" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "biod" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-camera

diff --git a/test_suites/control.bvt-tast-cq-camera b/test_suites/control.bvt-tast-cq-camera
index 34bc58a..ff78082 100644
--- a/test_suites/control.bvt-tast-cq-camera
+++ b/test_suites/control.bvt-tast-cq-camera
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-camera"
 PURPOSE = 'Tests the critical Tast tests in the "camera" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "camera" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-crash

diff --git a/test_suites/control.bvt-tast-cq-crash b/test_suites/control.bvt-tast-cq-crash
index 11b11b1..cbbe4cd 100644
--- a/test_suites/control.bvt-tast-cq-crash
+++ b/test_suites/control.bvt-tast-cq-crash
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-crash"
 PURPOSE = 'Tests the critical Tast tests in the "crash" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "crash" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-crostini

diff --git a/test_suites/control.bvt-tast-cq-crostini b/test_suites/control.bvt-tast-cq-crostini
index 4e23c47..33b9fa8 100644
--- a/test_suites/control.bvt-tast-cq-crostini
+++ b/test_suites/control.bvt-tast-cq-crostini
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-crostini"
 PURPOSE = 'Tests the critical Tast tests in the "crostini" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "crostini" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-cryptohome

diff --git a/test_suites/control.bvt-tast-cq-cryptohome b/test_suites/control.bvt-tast-cq-cryptohome
index 6913671..fa7d8eb 100644
--- a/test_suites/control.bvt-tast-cq-cryptohome
+++ b/test_suites/control.bvt-tast-cq-cryptohome
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-cryptohome"
 PURPOSE = 'Tests the critical Tast tests in the "cryptohome" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "cryptohome" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-dbus

diff --git a/test_suites/control.bvt-tast-cq-dbus b/test_suites/control.bvt-tast-cq-dbus
index 42e95ad..f6fdb85 100644
--- a/test_suites/control.bvt-tast-cq-dbus
+++ b/test_suites/control.bvt-tast-cq-dbus
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-dbus"
 PURPOSE = 'Tests the critical Tast tests in the "dbus" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "dbus" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-debugd

diff --git a/test_suites/control.bvt-tast-cq-debugd b/test_suites/control.bvt-tast-cq-debugd
index d5db66f..0c9c3d7 100644
--- a/test_suites/control.bvt-tast-cq-debugd
+++ b/test_suites/control.bvt-tast-cq-debugd
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-debugd"
 PURPOSE = 'Tests the critical Tast tests in the "debugd" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "debugd" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-dev

diff --git a/test_suites/control.bvt-tast-cq-dev b/test_suites/control.bvt-tast-cq-dev
index 82ade06..9cdcb50 100644
--- a/test_suites/control.bvt-tast-cq-dev
+++ b/test_suites/control.bvt-tast-cq-dev
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-dev"
 PURPOSE = 'Tests the critical Tast tests in the "dev" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "dev" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-diagnostics

diff --git a/test_suites/control.bvt-tast-cq-diagnostics b/test_suites/control.bvt-tast-cq-diagnostics
index 07005a2..d9c9879 100644
--- a/test_suites/control.bvt-tast-cq-diagnostics
+++ b/test_suites/control.bvt-tast-cq-diagnostics
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-diagnostics"
 PURPOSE = 'Tests the critical Tast tests in the "diagnostics" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "diagnostics" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-documentscanapi

diff --git a/test_suites/control.bvt-tast-cq-documentscanapi b/test_suites/control.bvt-tast-cq-documentscanapi
index 04ffcc6..fa1c87a 100644
--- a/test_suites/control.bvt-tast-cq-documentscanapi
+++ b/test_suites/control.bvt-tast-cq-documentscanapi
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-documentscanapi"
 PURPOSE = 'Tests the critical Tast tests in the "documentscanapi" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "documentscanapi" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-enterprise

diff --git a/test_suites/control.bvt-tast-cq-enterprise b/test_suites/control.bvt-tast-cq-enterprise
index ad13e96..fb96e91 100644
--- a/test_suites/control.bvt-tast-cq-enterprise
+++ b/test_suites/control.bvt-tast-cq-enterprise
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-enterprise"
 PURPOSE = 'Tests the critical Tast tests in the "enterprise" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "enterprise" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-example

diff --git a/test_suites/control.bvt-tast-cq-example b/test_suites/control.bvt-tast-cq-example
index 6d833da..d9837a8 100644
--- a/test_suites/control.bvt-tast-cq-example
+++ b/test_suites/control.bvt-tast-cq-example
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-example"
 PURPOSE = 'Tests the critical Tast tests in the "example" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "example" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-factory

diff --git a/test_suites/control.bvt-tast-cq-factory b/test_suites/control.bvt-tast-cq-factory
index 639159f..34425f9 100644
--- a/test_suites/control.bvt-tast-cq-factory
+++ b/test_suites/control.bvt-tast-cq-factory
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-factory"
 PURPOSE = 'Tests the critical Tast tests in the "factory" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "factory" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-familylink

diff --git a/test_suites/control.bvt-tast-cq-familylink b/test_suites/control.bvt-tast-cq-familylink
index 823bfe9..c2867d0 100644
--- a/test_suites/control.bvt-tast-cq-familylink
+++ b/test_suites/control.bvt-tast-cq-familylink
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-familylink"
 PURPOSE = 'Tests the critical Tast tests in the "familylink" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "familylink" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-feedback

diff --git a/test_suites/control.bvt-tast-cq-feedback b/test_suites/control.bvt-tast-cq-feedback
index 74a6cd0..7fbee8c 100644
--- a/test_suites/control.bvt-tast-cq-feedback
+++ b/test_suites/control.bvt-tast-cq-feedback
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-feedback"
 PURPOSE = 'Tests the critical Tast tests in the "feedback" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "feedback" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-filemanager

diff --git a/test_suites/control.bvt-tast-cq-filemanager b/test_suites/control.bvt-tast-cq-filemanager
index 1cff663..a8b78ed 100644
--- a/test_suites/control.bvt-tast-cq-filemanager
+++ b/test_suites/control.bvt-tast-cq-filemanager
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-filemanager"
 PURPOSE = 'Tests the critical Tast tests in the "filemanager" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "filemanager" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-firmware

diff --git a/test_suites/control.bvt-tast-cq-firmware b/test_suites/control.bvt-tast-cq-firmware
index 134e570..e4b244c 100644
--- a/test_suites/control.bvt-tast-cq-firmware
+++ b/test_suites/control.bvt-tast-cq-firmware
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-firmware"
 PURPOSE = 'Tests the critical Tast tests in the "firmware" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "firmware" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-gamepad

diff --git a/test_suites/control.bvt-tast-cq-gamepad b/test_suites/control.bvt-tast-cq-gamepad
index 09395d0..94cca38 100644
--- a/test_suites/control.bvt-tast-cq-gamepad
+++ b/test_suites/control.bvt-tast-cq-gamepad
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-gamepad"
 PURPOSE = 'Tests the critical Tast tests in the "gamepad" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "gamepad" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-graphics

diff --git a/test_suites/control.bvt-tast-cq-graphics b/test_suites/control.bvt-tast-cq-graphics
index 426f9bc..7668f5a 100644
--- a/test_suites/control.bvt-tast-cq-graphics
+++ b/test_suites/control.bvt-tast-cq-graphics
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-graphics"
 PURPOSE = 'Tests the critical Tast tests in the "graphics" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "graphics" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-hardware

diff --git a/test_suites/control.bvt-tast-cq-hardware b/test_suites/control.bvt-tast-cq-hardware
index 0659b15..dddda29 100644
--- a/test_suites/control.bvt-tast-cq-hardware
+++ b/test_suites/control.bvt-tast-cq-hardware
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-hardware"
 PURPOSE = 'Tests the critical Tast tests in the "hardware" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "hardware" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-health

diff --git a/test_suites/control.bvt-tast-cq-health b/test_suites/control.bvt-tast-cq-health
index bbeea3a..08959a9 100644
--- a/test_suites/control.bvt-tast-cq-health
+++ b/test_suites/control.bvt-tast-cq-health
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-health"
 PURPOSE = 'Tests the critical Tast tests in the "health" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "health" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-hwsec

diff --git a/test_suites/control.bvt-tast-cq-hwsec b/test_suites/control.bvt-tast-cq-hwsec
index c6677cd..22a690f 100644
--- a/test_suites/control.bvt-tast-cq-hwsec
+++ b/test_suites/control.bvt-tast-cq-hwsec
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-hwsec"
 PURPOSE = 'Tests the critical Tast tests in the "hwsec" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "hwsec" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-inputs

diff --git a/test_suites/control.bvt-tast-cq-inputs b/test_suites/control.bvt-tast-cq-inputs
index cccfff0..93afd38 100644
--- a/test_suites/control.bvt-tast-cq-inputs
+++ b/test_suites/control.bvt-tast-cq-inputs
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-inputs"
 PURPOSE = 'Tests the critical Tast tests in the "inputs" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "inputs" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-kernel

diff --git a/test_suites/control.bvt-tast-cq-kernel b/test_suites/control.bvt-tast-cq-kernel
index 90e3943..27737f1 100644
--- a/test_suites/control.bvt-tast-cq-kernel
+++ b/test_suites/control.bvt-tast-cq-kernel
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-kernel"
 PURPOSE = 'Tests the critical Tast tests in the "kernel" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "kernel" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-lacros

diff --git a/test_suites/control.bvt-tast-cq-lacros b/test_suites/control.bvt-tast-cq-lacros
index 7b415a1..a1e8142 100644
--- a/test_suites/control.bvt-tast-cq-lacros
+++ b/test_suites/control.bvt-tast-cq-lacros
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-lacros"
 PURPOSE = 'Tests the critical Tast tests in the "lacros" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "lacros" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-launcher

diff --git a/test_suites/control.bvt-tast-cq-launcher b/test_suites/control.bvt-tast-cq-launcher
index 55cb8c8c..5950e53 100644
--- a/test_suites/control.bvt-tast-cq-launcher
+++ b/test_suites/control.bvt-tast-cq-launcher
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-launcher"
 PURPOSE = 'Tests the critical Tast tests in the "launcher" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "launcher" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-logs

diff --git a/test_suites/control.bvt-tast-cq-logs b/test_suites/control.bvt-tast-cq-logs
index 0a776c8..cb93f11 100644
--- a/test_suites/control.bvt-tast-cq-logs
+++ b/test_suites/control.bvt-tast-cq-logs
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-logs"
 PURPOSE = 'Tests the critical Tast tests in the "logs" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "logs" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-meta

diff --git a/test_suites/control.bvt-tast-cq-meta b/test_suites/control.bvt-tast-cq-meta
index e70deb8..9578651 100644
--- a/test_suites/control.bvt-tast-cq-meta
+++ b/test_suites/control.bvt-tast-cq-meta
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-meta"
 PURPOSE = 'Tests the critical Tast tests in the "meta" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "meta" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-mlservice

diff --git a/test_suites/control.bvt-tast-cq-mlservice b/test_suites/control.bvt-tast-cq-mlservice
index fd47c21..d84ab6a 100644
--- a/test_suites/control.bvt-tast-cq-mlservice
+++ b/test_suites/control.bvt-tast-cq-mlservice
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-mlservice"
 PURPOSE = 'Tests the critical Tast tests in the "mlservice" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "mlservice" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-multivm

diff --git a/test_suites/control.bvt-tast-cq-multivm b/test_suites/control.bvt-tast-cq-multivm
index ac50ad1..d662369 100644
--- a/test_suites/control.bvt-tast-cq-multivm
+++ b/test_suites/control.bvt-tast-cq-multivm
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-multivm"
 PURPOSE = 'Tests the critical Tast tests in the "multivm" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "multivm" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-nacl

diff --git a/test_suites/control.bvt-tast-cq-nacl b/test_suites/control.bvt-tast-cq-nacl
index bfedb4d..8768a2b 100644
--- a/test_suites/control.bvt-tast-cq-nacl
+++ b/test_suites/control.bvt-tast-cq-nacl
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-nacl"
 PURPOSE = 'Tests the critical Tast tests in the "nacl" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "nacl" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-nearbyshare

diff --git a/test_suites/control.bvt-tast-cq-nearbyshare b/test_suites/control.bvt-tast-cq-nearbyshare
index 64d8983..12de0cc 100644
--- a/test_suites/control.bvt-tast-cq-nearbyshare
+++ b/test_suites/control.bvt-tast-cq-nearbyshare
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-nearbyshare"
 PURPOSE = 'Tests the critical Tast tests in the "nearbyshare" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "nearbyshare" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-network

diff --git a/test_suites/control.bvt-tast-cq-network b/test_suites/control.bvt-tast-cq-network
index 7b00006..f948b6f 100644
--- a/test_suites/control.bvt-tast-cq-network
+++ b/test_suites/control.bvt-tast-cq-network
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-network"
 PURPOSE = 'Tests the critical Tast tests in the "network" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "network" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-notifications

diff --git a/test_suites/control.bvt-tast-cq-notifications b/test_suites/control.bvt-tast-cq-notifications
index a064255..fb5cc3c 100644
--- a/test_suites/control.bvt-tast-cq-notifications
+++ b/test_suites/control.bvt-tast-cq-notifications
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-notifications"
 PURPOSE = 'Tests the critical Tast tests in the "notifications" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "notifications" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-ocr

diff --git a/test_suites/control.bvt-tast-cq-ocr b/test_suites/control.bvt-tast-cq-ocr
index b9bae8b..445fcda 100644
--- a/test_suites/control.bvt-tast-cq-ocr
+++ b/test_suites/control.bvt-tast-cq-ocr
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-ocr"
 PURPOSE = 'Tests the critical Tast tests in the "ocr" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "ocr" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-peripherals

diff --git a/test_suites/control.bvt-tast-cq-peripherals b/test_suites/control.bvt-tast-cq-peripherals
index 161c319..f658096 100644
--- a/test_suites/control.bvt-tast-cq-peripherals
+++ b/test_suites/control.bvt-tast-cq-peripherals
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-peripherals"
 PURPOSE = 'Tests the critical Tast tests in the "peripherals" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "peripherals" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-platform

diff --git a/test_suites/control.bvt-tast-cq-platform b/test_suites/control.bvt-tast-cq-platform
index 37ba551..ba26056 100644
--- a/test_suites/control.bvt-tast-cq-platform
+++ b/test_suites/control.bvt-tast-cq-platform
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-platform"
 PURPOSE = 'Tests the critical Tast tests in the "platform" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "platform" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-policy

diff --git a/test_suites/control.bvt-tast-cq-policy b/test_suites/control.bvt-tast-cq-policy
index 38b1061..00ae450 100644
--- a/test_suites/control.bvt-tast-cq-policy
+++ b/test_suites/control.bvt-tast-cq-policy
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-policy"
 PURPOSE = 'Tests the critical Tast tests in the "policy" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "policy" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-power

diff --git a/test_suites/control.bvt-tast-cq-power b/test_suites/control.bvt-tast-cq-power
index 0bb1f0f..f38adc4 100644
--- a/test_suites/control.bvt-tast-cq-power
+++ b/test_suites/control.bvt-tast-cq-power
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-power"
 PURPOSE = 'Tests the critical Tast tests in the "power" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "power" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-printer

diff --git a/test_suites/control.bvt-tast-cq-printer b/test_suites/control.bvt-tast-cq-printer
index c855eca..136848d 100644
--- a/test_suites/control.bvt-tast-cq-printer
+++ b/test_suites/control.bvt-tast-cq-printer
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-printer"
 PURPOSE = 'Tests the critical Tast tests in the "printer" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "printer" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-qemu

diff --git a/test_suites/control.bvt-tast-cq-qemu b/test_suites/control.bvt-tast-cq-qemu
index d5d2c3d..6b4cf13 100644
--- a/test_suites/control.bvt-tast-cq-qemu
+++ b/test_suites/control.bvt-tast-cq-qemu
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-qemu"
 PURPOSE = 'Tests the critical Tast tests in the "qemu" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "qemu" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-scanapp

diff --git a/test_suites/control.bvt-tast-cq-scanapp b/test_suites/control.bvt-tast-cq-scanapp
index bfc1d8b..4e56c67 100644
--- a/test_suites/control.bvt-tast-cq-scanapp
+++ b/test_suites/control.bvt-tast-cq-scanapp
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-scanapp"
 PURPOSE = 'Tests the critical Tast tests in the "scanapp" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "scanapp" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-scanner

diff --git a/test_suites/control.bvt-tast-cq-scanner b/test_suites/control.bvt-tast-cq-scanner
index c831792..1f4949b 100644
--- a/test_suites/control.bvt-tast-cq-scanner
+++ b/test_suites/control.bvt-tast-cq-scanner
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-scanner"
 PURPOSE = 'Tests the critical Tast tests in the "scanner" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "scanner" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-sched

diff --git a/test_suites/control.bvt-tast-cq-sched b/test_suites/control.bvt-tast-cq-sched
index 799821a..698948a 100644
--- a/test_suites/control.bvt-tast-cq-sched
+++ b/test_suites/control.bvt-tast-cq-sched
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-sched"
 PURPOSE = 'Tests the critical Tast tests in the "sched" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "sched" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-screenshot

diff --git a/test_suites/control.bvt-tast-cq-screenshot b/test_suites/control.bvt-tast-cq-screenshot
index b3e10b5..7adf963 100644
--- a/test_suites/control.bvt-tast-cq-screenshot
+++ b/test_suites/control.bvt-tast-cq-screenshot
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-screenshot"
 PURPOSE = 'Tests the critical Tast tests in the "screenshot" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "screenshot" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-security

diff --git a/test_suites/control.bvt-tast-cq-security b/test_suites/control.bvt-tast-cq-security
index 285c163..8793ce0 100644
--- a/test_suites/control.bvt-tast-cq-security
+++ b/test_suites/control.bvt-tast-cq-security
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-security"
 PURPOSE = 'Tests the critical Tast tests in the "security" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "security" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-session

diff --git a/test_suites/control.bvt-tast-cq-session b/test_suites/control.bvt-tast-cq-session
index 27d483c..e583d38 100644
--- a/test_suites/control.bvt-tast-cq-session
+++ b/test_suites/control.bvt-tast-cq-session
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-session"
 PURPOSE = 'Tests the critical Tast tests in the "session" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "session" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-shelf

diff --git a/test_suites/control.bvt-tast-cq-shelf b/test_suites/control.bvt-tast-cq-shelf
index 3c82924..9f51b35 100644
--- a/test_suites/control.bvt-tast-cq-shelf
+++ b/test_suites/control.bvt-tast-cq-shelf
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-shelf"
 PURPOSE = 'Tests the critical Tast tests in the "shelf" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "shelf" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-storage

diff --git a/test_suites/control.bvt-tast-cq-storage b/test_suites/control.bvt-tast-cq-storage
index 07dfcd9..984304c 100644
--- a/test_suites/control.bvt-tast-cq-storage
+++ b/test_suites/control.bvt-tast-cq-storage
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-storage"
 PURPOSE = 'Tests the critical Tast tests in the "storage" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "storage" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-typec

diff --git a/test_suites/control.bvt-tast-cq-typec b/test_suites/control.bvt-tast-cq-typec
index 5e7acf8..a67153d 100644
--- a/test_suites/control.bvt-tast-cq-typec
+++ b/test_suites/control.bvt-tast-cq-typec
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-typec"
 PURPOSE = 'Tests the critical Tast tests in the "typec" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "typec" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-u2fd

diff --git a/test_suites/control.bvt-tast-cq-u2fd b/test_suites/control.bvt-tast-cq-u2fd
index 4e1abbe..651681a 100644
--- a/test_suites/control.bvt-tast-cq-u2fd
+++ b/test_suites/control.bvt-tast-cq-u2fd
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-u2fd"
 PURPOSE = 'Tests the critical Tast tests in the "u2fd" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "u2fd" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-ui

diff --git a/test_suites/control.bvt-tast-cq-ui b/test_suites/control.bvt-tast-cq-ui
index edbd171..50dca58 100644
--- a/test_suites/control.bvt-tast-cq-ui
+++ b/test_suites/control.bvt-tast-cq-ui
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-ui"
 PURPOSE = 'Tests the critical Tast tests in the "ui" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "ui" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-video

diff --git a/test_suites/control.bvt-tast-cq-video b/test_suites/control.bvt-tast-cq-video
index 7c16d41..5e61b07 100644
--- a/test_suites/control.bvt-tast-cq-video
+++ b/test_suites/control.bvt-tast-cq-video
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-video"
 PURPOSE = 'Tests the critical Tast tests in the "video" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "video" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-vm

diff --git a/test_suites/control.bvt-tast-cq-vm b/test_suites/control.bvt-tast-cq-vm
index 114196e..b23d7d4 100644
--- a/test_suites/control.bvt-tast-cq-vm
+++ b/test_suites/control.bvt-tast-cq-vm
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-vm"
 PURPOSE = 'Tests the critical Tast tests in the "vm" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "vm" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-webrtc

diff --git a/test_suites/control.bvt-tast-cq-webrtc b/test_suites/control.bvt-tast-cq-webrtc
index 1cdf7a4..35049df 100644
--- a/test_suites/control.bvt-tast-cq-webrtc
+++ b/test_suites/control.bvt-tast-cq-webrtc
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-webrtc"
 PURPOSE = 'Tests the critical Tast tests in the "webrtc" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "webrtc" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-wifi

diff --git a/test_suites/control.bvt-tast-cq-wifi b/test_suites/control.bvt-tast-cq-wifi
index e014224..6c0114c 100644
--- a/test_suites/control.bvt-tast-cq-wifi
+++ b/test_suites/control.bvt-tast-cq-wifi
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-wifi"
 PURPOSE = 'Tests the critical Tast tests in the "wifi" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "wifi" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-cq-wilco

diff --git a/test_suites/control.bvt-tast-cq-wilco b/test_suites/control.bvt-tast-cq-wilco
index 55b4244..4565b53 100644
--- a/test_suites/control.bvt-tast-cq-wilco
+++ b/test_suites/control.bvt-tast-cq-wilco
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-cq-wilco"
 PURPOSE = 'Tests the critical Tast tests in the "wilco" category.'
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
+This suite verifies ChromeOS's basic functionality for the ChromeOS Commit
 Queue by running all Tast integration tests in the "wilco" category that must
 always pass against a DUT. See http://go/tast for more information about Tast.
 

test_suites/control.bvt-tast-informational

diff --git a/test_suites/control.bvt-tast-informational b/test_suites/control.bvt-tast-informational
index 9e222a5..595e0de 100644
--- a/test_suites/control.bvt-tast-informational
+++ b/test_suites/control.bvt-tast-informational
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-informational"
 PURPOSE = "Runs informational Tast tests."
 

test_suites/control.bvt-tast-parallels-cq

diff --git a/test_suites/control.bvt-tast-parallels-cq b/test_suites/control.bvt-tast-parallels-cq
index 82f8529..9746af7 100644
--- a/test_suites/control.bvt-tast-parallels-cq
+++ b/test_suites/control.bvt-tast-parallels-cq
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-parallels-cq"
 PURPOSE = "Runs all critical Parallels Tast tests."
 
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies basic Parallels functionality on Chrome OS for the Chrome
+This suite verifies basic Parallels functionality on ChromeOS for the Chrome
 OS Commit Queue by running all Parallels Tast integration tests that must
 always pass against a DUT.
 

test_suites/control.bvt-tast-parallels-informational

diff --git a/test_suites/control.bvt-tast-parallels-informational b/test_suites/control.bvt-tast-parallels-informational
index 8043790..bf1a74f 100644
--- a/test_suites/control.bvt-tast-parallels-informational
+++ b/test_suites/control.bvt-tast-parallels-informational
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-tast-parallels-informational"
 PURPOSE = "Runs informational Parallels Tast tests."
 

test_suites/control.camera-libcamera

diff --git a/test_suites/control.camera-libcamera b/test_suites/control.camera-libcamera
index 76bf796..941e8d9 100644
--- a/test_suites/control.camera-libcamera
+++ b/test_suites/control.camera-libcamera
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "camera-libcamera"
 PURPOSE = "Suite to run camera tests in for libcamera build"
 TIME = "MEDIUM"

test_suites/control.camera-postsubmit

diff --git a/test_suites/control.camera-postsubmit b/test_suites/control.camera-postsubmit
index 90ae2db..b07017d 100644
--- a/test_suites/control.camera-postsubmit
+++ b/test_suites/control.camera-postsubmit
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "camera-postsubmit"
 PURPOSE = "Suite to run camera tests in postsubmit"
 TIME = "MEDIUM"

test_suites/control.camera-usb-qual

diff --git a/test_suites/control.camera-usb-qual b/test_suites/control.camera-usb-qual
index da81cb6..36baeb9 100644
--- a/test_suites/control.camera-usb-qual
+++ b/test_suites/control.camera-usb-qual
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "camera-usb-qual"
 PURPOSE = "Suite to run camera tests for USB camera qualification"
 TIME = "MEDIUM"

test_suites/control.cellular-cq

diff --git a/test_suites/control.cellular-cq b/test_suites/control.cellular-cq
index 4ba01c5..5a6333c 100644
--- a/test_suites/control.cellular-cq
+++ b/test_suites/control.cellular-cq
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Cellular Team"
+AUTHOR = "ChromeOS Cellular Team"
 NAME = "cellular-cq"
 PURPOSE = "Cellular tests to be included in cellular CQ"
 

test_suites/control.cellular_callbox

diff --git a/test_suites/control.cellular_callbox b/test_suites/control.cellular_callbox
index 28c3b81..17c9f89 100644
--- a/test_suites/control.cellular_callbox
+++ b/test_suites/control.cellular_callbox
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Cellular Team"
+AUTHOR = "ChromeOS Cellular Team"
 NAME = "cellular_callbox"
 PURPOSE = "Cellular callbox tests to be included in cellular callbox CQ"
 

test_suites/control.cellular_mbim_compliance

diff --git a/test_suites/control.cellular_mbim_compliance b/test_suites/control.cellular_mbim_compliance
index 20d10f2..c2cb351 100644
--- a/test_suites/control.cellular_mbim_compliance
+++ b/test_suites/control.cellular_mbim_compliance
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "cellular_mbim_compliance"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

test_suites/control.cellular_modem_fw

diff --git a/test_suites/control.cellular_modem_fw b/test_suites/control.cellular_modem_fw
index 1c2a003..38acd1f 100644
--- a/test_suites/control.cellular_modem_fw
+++ b/test_suites/control.cellular_modem_fw
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "cellular_modem_fw"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

test_suites/control.cellular_ota

diff --git a/test_suites/control.cellular_ota b/test_suites/control.cellular_ota
index 8db7839..3130c46 100644
--- a/test_suites/control.cellular_ota
+++ b/test_suites/control.cellular_ota
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "cellular_ota"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

test_suites/control.cellular_ota_avl

diff --git a/test_suites/control.cellular_ota_avl b/test_suites/control.cellular_ota_avl
index 0acac9e..a8cbf4a 100644
--- a/test_suites/control.cellular_ota_avl
+++ b/test_suites/control.cellular_ota_avl
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "cellular_ota_avl"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

test_suites/control.cellular_ota_flaky

diff --git a/test_suites/control.cellular_ota_flaky b/test_suites/control.cellular_ota_flaky
index 61e02ca..669e3a4 100644
--- a/test_suites/control.cellular_ota_flaky
+++ b/test_suites/control.cellular_ota_flaky
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "cellular_ota_flaky"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"

test_suites/control.cellular_pseudomodem

diff --git a/test_suites/control.cellular_pseudomodem b/test_suites/control.cellular_pseudomodem
index 5ca6b61..dcfdded 100644
--- a/test_suites/control.cellular_pseudomodem
+++ b/test_suites/control.cellular_pseudomodem
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "cellular_pseudomodem"
 PURPOSE = "Cellular tests that use a pseudomodem and are able to run in VMs"
 

test_suites/control.chameleon_audio_perbuild

diff --git a/test_suites/control.chameleon_audio_perbuild b/test_suites/control.chameleon_audio_perbuild
index cabdcad..fb9fb7b 100644
--- a/test_suites/control.chameleon_audio_perbuild
+++ b/test_suites/control.chameleon_audio_perbuild
@@ -14,7 +14,7 @@
 DOC = """
 Audio tests which require chameleon and audio boards connected.
 The Audio and Chameleon boards can emulate audio jack audio activity
-in order to test the Chrome OS audio stack.
+in order to test the ChromeOS audio stack.
 
 Together with DUT and external peripherals they are bundled in
 audio-box environment for end-to-end testing. Details on go/audioboard

test_suites/control.chameleon_audio_unstable

diff --git a/test_suites/control.chameleon_audio_unstable b/test_suites/control.chameleon_audio_unstable
index 6ae3198..1225192 100644
--- a/test_suites/control.chameleon_audio_unstable
+++ b/test_suites/control.chameleon_audio_unstable
@@ -14,7 +14,7 @@
 DOC = """
 Audio tests which require chameleon and audio boards connected.
 The Audio and Chameleon boards can emulate audio jack audio activity
-in order to test the Chrome OS audio stack.
+in order to test the ChromeOS audio stack.
 
 Together with DUT and external peripherals they are bundled in
 audio-box environment for end-to-end testing. Details on go/audioboard

test_suites/control.chameleon_hdmi_perbuild

diff --git a/test_suites/control.chameleon_hdmi_perbuild b/test_suites/control.chameleon_hdmi_perbuild
index 6cdc03d..0e099ab 100644
--- a/test_suites/control.chameleon_hdmi_perbuild
+++ b/test_suites/control.chameleon_hdmi_perbuild
@@ -14,7 +14,7 @@
 DOC = """
 Display tests which require Chameleon board connected via HDMI connection.
 The Chameleon board can emulate a monitor such that the test can control
-its behaviors in order to test the Chrome OS graphic stack.
+its behaviors in order to test the ChromeOS graphic stack.
 
 @param build: The name of the image to test.
               Ex: x86-mario-release/R17-1412.33.0-a1-b29

test_suites/control.chameleon_hdmi_stress

diff --git a/test_suites/control.chameleon_hdmi_stress b/test_suites/control.chameleon_hdmi_stress
index ebd7317..d837786 100644
--- a/test_suites/control.chameleon_hdmi_stress
+++ b/test_suites/control.chameleon_hdmi_stress
@@ -14,7 +14,7 @@
 DOC = """
 Display tests which require Chameleon board connected via HDMI connection.
 The Chameleon board can emulate a monitor such that the test can control
-its behaviors in order to test the Chrome OS graphic stack.
+its behaviors in order to test the ChromeOS graphic stack.
 
 @param build: The name of the image to test.
               Ex: x86-mario-release/R17-1412.33.0-a1-b29

test_suites/control.chameleon_hdmi_unstable

diff --git a/test_suites/control.chameleon_hdmi_unstable b/test_suites/control.chameleon_hdmi_unstable
index fed5c98..e39f4f8 100644
--- a/test_suites/control.chameleon_hdmi_unstable
+++ b/test_suites/control.chameleon_hdmi_unstable
@@ -14,7 +14,7 @@
 DOC = """
 Display tests which require Chameleon board connected via HDMI connection.
 The Chameleon board can emulate a monitor such that the test can control
-its behaviors in order to test the Chrome OS graphic stack.
+its behaviors in order to test the ChromeOS graphic stack.
 
 @param build: The name of the image to test.
               Ex: x86-mario-release/R17-1412.33.0-a1-b29

test_suites/control.check_setup_cts_N

diff --git a/test_suites/control.check_setup_cts_N b/test_suites/control.check_setup_cts_N
index 6ce8699..5310b58 100644
--- a/test_suites/control.check_setup_cts_N
+++ b/test_suites/control.check_setup_cts_N
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "check_setup_cts_N"
 PURPOSE = """
 Test moblab has correct DUT configuration for cts N suite

test_suites/control.check_setup_storage_qual

diff --git a/test_suites/control.check_setup_storage_qual b/test_suites/control.check_setup_storage_qual
index 84e0a4b..20d7f96 100644
--- a/test_suites/control.check_setup_storage_qual
+++ b/test_suites/control.check_setup_storage_qual
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "check_setup_storage_qual"
 PURPOSE = """
 Test moblab has correct DUT configuration for storage qual suite

test_suites/control.chrome-informational

diff --git a/test_suites/control.chrome-informational b/test_suites/control.chrome-informational
index a6901bd..033ce60 100644
--- a/test_suites/control.chrome-informational
+++ b/test_suites/control.chrome-informational
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "chrome-informational"
 PURPOSE = "Informational tests of chrome"
 
@@ -14,10 +14,10 @@
 DOC = """
 This suite contains informational tests that:
 
-* Test Chrome, not Chrome OS
+* Test Chrome, not ChromeOS
 * Require real hardware (for example, to test GPU process init
 or display management)
-* Should not block uprev of Chrome into Chrome OS
+* Should not block uprev of Chrome into ChromeOS
 
 Chrome tests that do not require real hardware should be
 implemented in the Chrome repository as unit_tests or browser_tests.

test_suites/control.cr50_stress

diff --git a/test_suites/control.cr50_stress b/test_suites/control.cr50_stress
index 6d29c7c..c65ff88 100644
--- a/test_suites/control.cr50_stress
+++ b/test_suites/control.cr50_stress
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "cr50_stress"
 PURPOSE = "Cr50 stress test functionality and devices"
 

test_suites/control.cros_test_platform

diff --git a/test_suites/control.cros_test_platform b/test_suites/control.cros_test_platform
index 8938ca0..d316d24 100644
--- a/test_suites/control.cros_test_platform
+++ b/test_suites/control.cros_test_platform
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Test Platform Team"
+AUTHOR = "ChromeOS Test Platform Team"
 NAME = "cros_test_platform"
 PURPOSE = "Entry point for cros_test_platform execution of autotest tests."
 

test_suites/control.cross-device

diff --git a/test_suites/control.cross-device b/test_suites/control.cross-device
index 08bf1ab..56b6e1b 100644
--- a/test_suites/control.cross-device
+++ b/test_suites/control.cross-device
@@ -4,7 +4,7 @@
 
 AUTHOR = "ChromeOS SW Engprod Team (chromeos-sw-engprod@google.com)"
 NAME = "cross-device"
-PURPOSE = "Suite to run Cross Device tests on Chrome OS devices."
+PURPOSE = "Suite to run Cross Device tests on ChromeOS devices."
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "suite"

test_suites/control.cuj

diff --git a/test_suites/control.cuj b/test_suites/control.cuj
index b6c0729..73cd464 100644
--- a/test_suites/control.cuj
+++ b/test_suites/control.cuj
@@ -4,7 +4,7 @@
 
 AUTHOR = "ChromeOS Performance Metrics Team (chromeos-perfmetrics-eng@google.com)"
 NAME = "cuj"
-PURPOSE = "Suite to run CUJ tests regularly on Chrome OS devices."
+PURPOSE = "Suite to run CUJ tests regularly on ChromeOS devices."
 
 TIME = "MEDIUM"
 TEST_CATEGORY = "General"

test_suites/control.debug_kernel_testing

diff --git a/test_suites/control.debug_kernel_testing b/test_suites/control.debug_kernel_testing
index 44a9df6..c71673d 100644
--- a/test_suites/control.debug_kernel_testing
+++ b/test_suites/control.debug_kernel_testing
@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "mwiitala, Chrome OS Kernel Team"
+AUTHOR = "mwiitala, ChromeOS Kernel Team"
 NAME = "debug_kernel_testing"
-PURPOSE = "Suite to run Syzkaller tests on Chrome OS devices."
+PURPOSE = "Suite to run Syzkaller tests on ChromeOS devices."
 
 TIME = "SHORT"
 TEST_CATEGORY = "General"

test_suites/control.distributed_lab_qual_faft

diff --git a/test_suites/control.distributed_lab_qual_faft b/test_suites/control.distributed_lab_qual_faft
index 031c4b6..9598aae 100644
--- a/test_suites/control.distributed_lab_qual_faft
+++ b/test_suites/control.distributed_lab_qual_faft
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Distributed Fleet Platform"
+AUTHOR = "ChromeOS Distributed Fleet Platform"
 NAME = "distributed_lab_qual_faft"
 PURPOSE = "Test Distributed Lab stability with faft tests"
 

test_suites/control.drivefs-cq

diff --git a/test_suites/control.drivefs-cq b/test_suites/control.drivefs-cq
index 060a8d4..fdffe22 100644
--- a/test_suites/control.drivefs-cq
+++ b/test_suites/control.drivefs-cq
@@ -11,7 +11,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite verifies all of Chrome OS's basic functionality using tests
+This suite verifies all of ChromeOS's basic functionality using tests
 which have a tast group attribute of drivefs-cq. These tests should run
 as presubmit only when a new ebuild is uprevved in the drivefs and
 drivefs-ipc packages.

test_suites/control.dummy_server

diff --git a/test_suites/control.dummy_server b/test_suites/control.dummy_server
index 5f8cc71..5e3ace8 100644
--- a/test_suites/control.dummy_server
+++ b/test_suites/control.dummy_server
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "dummy_server"
 PURPOSE = "To be run while testing the infrastructure and test harness."
 

test_suites/control.dummy_server_nossp

diff --git a/test_suites/control.dummy_server_nossp b/test_suites/control.dummy_server_nossp
index fdb1ead..daa26e4 100644
--- a/test_suites/control.dummy_server_nossp
+++ b/test_suites/control.dummy_server_nossp
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "dummy_server_nossp"
 PURPOSE = "To be run while testing the infrastructure and test harness."
 

test_suites/control.dummyflake

diff --git a/test_suites/control.dummyflake b/test_suites/control.dummyflake
index b149d76..5a010bf 100644
--- a/test_suites/control.dummyflake
+++ b/test_suites/control.dummyflake
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "dummyflake"
 PURPOSE = "Test basic, required functionality."
 

test_suites/control.experimental

diff --git a/test_suites/control.experimental b/test_suites/control.experimental
index b418426..3beed33 100644
--- a/test_suites/control.experimental
+++ b/test_suites/control.experimental
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "experimental"
 PURPOSE = "Staging ground for BVT candidates"
 

test_suites/control.faft_bios

diff --git a/test_suites/control.faft_bios b/test_suites/control.faft_bios
index 34e91fa..9408f4c 100644
--- a/test_suites/control.faft_bios
+++ b/test_suites/control.faft_bios
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_bios"
 PURPOSE = "Test hard-to-automate firmware scenarios."
 

test_suites/control.faft_bios_tot

diff --git a/test_suites/control.faft_bios_tot b/test_suites/control.faft_bios_tot
index 6776143..484baa6 100644
--- a/test_suites/control.faft_bios_tot
+++ b/test_suites/control.faft_bios_tot
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_bios_tot"
 PURPOSE = "Test hard-to-automate firmware scenarios on Tot."
 

test_suites/control.faft_ccd

diff --git a/test_suites/control.faft_ccd b/test_suites/control.faft_ccd
index 952dc65..6f251f2 100644
--- a/test_suites/control.faft_ccd
+++ b/test_suites/control.faft_ccd
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_ccd"
 PURPOSE = "Test suite to verify basic ccd functionality."
 

test_suites/control.faft_cr50_crypto

diff --git a/test_suites/control.faft_cr50_crypto b/test_suites/control.faft_cr50_crypto
index ad9d59f..aa5048c 100644
--- a/test_suites/control.faft_cr50_crypto
+++ b/test_suites/control.faft_cr50_crypto
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_cr50_crypto"
 PURPOSE = "Experimental verify cr50 crypto."
 

test_suites/control.faft_cr50_experimental

diff --git a/test_suites/control.faft_cr50_experimental b/test_suites/control.faft_cr50_experimental
index 6e0a859..3834ee1 100644
--- a/test_suites/control.faft_cr50_experimental
+++ b/test_suites/control.faft_cr50_experimental
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_cr50_experimental"
 PURPOSE = "Experimental suite to test cr50 stress tests."
 

test_suites/control.faft_cr50_prepvt

diff --git a/test_suites/control.faft_cr50_prepvt b/test_suites/control.faft_cr50_prepvt
index cb1d016..73c2c1a 100644
--- a/test_suites/control.faft_cr50_prepvt
+++ b/test_suites/control.faft_cr50_prepvt
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_cr50_prepvt"
 PURPOSE = "Suite to test cr50 prePVT images."
 

test_suites/control.faft_cr50_pvt

diff --git a/test_suites/control.faft_cr50_pvt b/test_suites/control.faft_cr50_pvt
index 151029d..a7f70a2 100644
--- a/test_suites/control.faft_cr50_pvt
+++ b/test_suites/control.faft_cr50_pvt
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_cr50_pvt"
 PURPOSE = "Experimental suite to test cr50 stress tests."
 

test_suites/control.faft_cr50_tot

diff --git a/test_suites/control.faft_cr50_tot b/test_suites/control.faft_cr50_tot
index 73e6fc5..bcd6c72 100644
--- a/test_suites/control.faft_cr50_tot
+++ b/test_suites/control.faft_cr50_tot
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_cr50_tot"
 PURPOSE = "Suite to test TOT cr50 images."
 

test_suites/control.faft_dev

diff --git a/test_suites/control.faft_dev b/test_suites/control.faft_dev
index 3b1d4b5..0ba9878 100644
--- a/test_suites/control.faft_dev
+++ b/test_suites/control.faft_dev
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_dev"
 PURPOSE = "Test hard-to-automate firmware and ec scenarios."
 

test_suites/control.faft_ec

diff --git a/test_suites/control.faft_ec b/test_suites/control.faft_ec
index 9800e56..d7482bb 100644
--- a/test_suites/control.faft_ec
+++ b/test_suites/control.faft_ec
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_ec"
 PURPOSE = "Test hard-to-automate firmware and ec scenarios."
 
@@ -13,7 +13,7 @@
 
 DOC = """
 This is a faft (FULLY AUTOMATED FIRMWARE TEST) suite. The tests in this suite
-verify the Chrome OS EC operation, that valid boot scenarios progress properly
+verify the ChromeOS EC operation, that valid boot scenarios progress properly
 (with state progress checks) and that error scenarios (corrupted blobs) are
 caught as expected. Some of these test failures should close the tree as they
 may imply that the system is unbootable and further tests will only become

test_suites/control.faft_ec_tot

diff --git a/test_suites/control.faft_ec_tot b/test_suites/control.faft_ec_tot
index 410c658..f21b5bf 100644
--- a/test_suites/control.faft_ec_tot
+++ b/test_suites/control.faft_ec_tot
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_ec_tot"
 PURPOSE = "Test hard-to-automate firmware and ec scenarios on Tot."
 
@@ -16,7 +16,7 @@
 Tot instead of from the firmware branches.
 
 This is a faft (FULLY AUTOMATED FIRMWARE TEST) suite. The tests in this suite
-verify the Chrome OS EC operation, that valid boot scenarios progress properly
+verify the ChromeOS EC operation, that valid boot scenarios progress properly
 (with state progress checks) and that error scenarios (corrupted blobs) are
 caught as expected. Some of these test failures should close the tree as they
 may imply that the system is unbootable and further tests will only become

test_suites/control.faft_experimental

diff --git a/test_suites/control.faft_experimental b/test_suites/control.faft_experimental
index 55d35a1..4d52097 100644
--- a/test_suites/control.faft_experimental
+++ b/test_suites/control.faft_experimental
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_experimental"
 PURPOSE = "Experimental suite to test faft_bios and faft_ec."
 

test_suites/control.faft_flashrom

diff --git a/test_suites/control.faft_flashrom b/test_suites/control.faft_flashrom
index 24106c0..00cfae1 100644
--- a/test_suites/control.faft_flashrom
+++ b/test_suites/control.faft_flashrom
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_flashrom"
 PURPOSE = "Test flashrom and chromeos-firmwareupdate"
 

test_suites/control.faft_lv1

diff --git a/test_suites/control.faft_lv1 b/test_suites/control.faft_lv1
index 942a397..b991bc2 100644
--- a/test_suites/control.faft_lv1
+++ b/test_suites/control.faft_lv1
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_lv1"
 PURPOSE = "Test hard-to-automate 'normal' mode firmware scenarios."
 
@@ -14,7 +14,7 @@
 DOC = """
 
 This test suite runs FAFT (Fully Automated Firmware Test) for BIOS that should
-all pass and that verifies the BIOS fit Chrome OS verified-boot requirements.
+all pass and that verifies the BIOS fit ChromeOS verified-boot requirements.
 
 All BIOS tests are categorized into 5 test levels:
   Level-1: Basic BIOS tests which verify basic vboot functions.

test_suites/control.faft_lv2

diff --git a/test_suites/control.faft_lv2 b/test_suites/control.faft_lv2
index c72aea9..d856c5d 100644
--- a/test_suites/control.faft_lv2
+++ b/test_suites/control.faft_lv2
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_lv2"
 PURPOSE = "Test hard-to-automate 'normal' mode firmware scenarios."
 
@@ -14,7 +14,7 @@
 DOC = """
 
 This test suite runs FAFT (Fully Automated Firmware Test) for BIOS that should
-all pass and that verifies the BIOS fit Chrome OS verified-boot requirements.
+all pass and that verifies the BIOS fit ChromeOS verified-boot requirements.
 
 All BIOS tests are categorized into 5 test levels:
   Level-1: Basic BIOS tests which verify basic vboot functions.

test_suites/control.faft_lv3

diff --git a/test_suites/control.faft_lv3 b/test_suites/control.faft_lv3
index 84707e1..d493b3d 100644
--- a/test_suites/control.faft_lv3
+++ b/test_suites/control.faft_lv3
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_lv3"
 PURPOSE = "Test hard-to-automate 'normal' mode firmware scenarios."
 
@@ -14,7 +14,7 @@
 DOC = """
 
 This test suite runs FAFT (Fully Automated Firmware Test) for BIOS that should
-all pass and that verifies the BIOS fit Chrome OS verified-boot requirements.
+all pass and that verifies the BIOS fit ChromeOS verified-boot requirements.
 
 All BIOS tests are categorized into 5 test levels:
   Level-1: Basic BIOS tests which verify basic vboot functions.

test_suites/control.faft_lv4

diff --git a/test_suites/control.faft_lv4 b/test_suites/control.faft_lv4
index fb97155..0ac5555 100644
--- a/test_suites/control.faft_lv4
+++ b/test_suites/control.faft_lv4
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_lv4"
 PURPOSE = "Test hard-to-automate 'normal' mode firmware scenarios."
 
@@ -14,7 +14,7 @@
 DOC = """
 
 This test suite runs FAFT (Fully Automated Firmware Test) for BIOS that should
-all pass and that verifies the BIOS fit Chrome OS verified-boot requirements.
+all pass and that verifies the BIOS fit ChromeOS verified-boot requirements.
 
 All BIOS tests are categorized into 5 test levels:
   Level-1: Basic BIOS tests which verify basic vboot functions.

test_suites/control.faft_lv5

diff --git a/test_suites/control.faft_lv5 b/test_suites/control.faft_lv5
index 41cf6ee..b37729f 100644
--- a/test_suites/control.faft_lv5
+++ b/test_suites/control.faft_lv5
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_lv5"
 PURPOSE = "Test hard-to-automate 'normal' mode firmware scenarios."
 
@@ -14,7 +14,7 @@
 DOC = """
 
 This test suite runs FAFT (Fully Automated Firmware Test) for BIOS that should
-all pass and that verifies the BIOS fit Chrome OS verified-boot requirements.
+all pass and that verifies the BIOS fit ChromeOS verified-boot requirements.
 
 All BIOS tests are categorized into 5 test levels:
   Level-1: Basic BIOS tests which verify basic vboot functions.

test_suites/control.faft_normal

diff --git a/test_suites/control.faft_normal b/test_suites/control.faft_normal
index aea72bd..6e1f78f 100644
--- a/test_suites/control.faft_normal
+++ b/test_suites/control.faft_normal
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_normal"
 PURPOSE = "Test hard-to-automate 'normal' mode firmware scenarios."
 

test_suites/control.faft_pd

diff --git a/test_suites/control.faft_pd b/test_suites/control.faft_pd
index 7aa4343..064786b 100644
--- a/test_suites/control.faft_pd
+++ b/test_suites/control.faft_pd
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_pd"
 PURPOSE = "Stress test hard-to-automate USB PD behaviors and ULP mode."
 

test_suites/control.faft_setup

diff --git a/test_suites/control.faft_setup b/test_suites/control.faft_setup
index 5d7ceec..58816c9 100644
--- a/test_suites/control.faft_setup
+++ b/test_suites/control.faft_setup
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_setup"
 PURPOSE = "Suite to setup and run validity checks to ensure DUT is ready for FAFT"
 

test_suites/control.faft_smoke

diff --git a/test_suites/control.faft_smoke b/test_suites/control.faft_smoke
index 88c43d6..193d5f4 100644
--- a/test_suites/control.faft_smoke
+++ b/test_suites/control.faft_smoke
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_smoke"
 PURPOSE = "Smoke test of new firmware."""
 TIME = "SHORT"

test_suites/control.faft_unstable

diff --git a/test_suites/control.faft_unstable b/test_suites/control.faft_unstable
index ef7b5bc..0887995 100644
--- a/test_suites/control.faft_unstable
+++ b/test_suites/control.faft_unstable
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_unstable"
 PURPOSE = "Unstable suite to test faft_bios and faft_ec."
 

test_suites/control.faft_wilco

diff --git a/test_suites/control.faft_wilco b/test_suites/control.faft_wilco
index 28ce4df..e3b7ba8 100644
--- a/test_suites/control.faft_wilco
+++ b/test_suites/control.faft_wilco
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "faft_wilco"
 PURPOSE = "Test Wilco-specific firmware behavior."
 

test_suites/control.fingerprint

diff --git a/test_suites/control.fingerprint b/test_suites/control.fingerprint
index 025a3a3..7e9e3f4 100644
--- a/test_suites/control.fingerprint
+++ b/test_suites/control.fingerprint
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "fingerprint"
 PURPOSE = "Runs fingerprint firmware tests."
 

test_suites/control.fingerprint-cq

diff --git a/test_suites/control.fingerprint-cq b/test_suites/control.fingerprint-cq
index d71b413..a4f8b2a 100644
--- a/test_suites/control.fingerprint-cq
+++ b/test_suites/control.fingerprint-cq
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Fingerprint Team"
+AUTHOR = "ChromeOS Fingerprint Team"
 NAME = "fingerprint-cq"
 PURPOSE = "Run fingerprint-related critical tests."
 

test_suites/control.graphics

diff --git a/test_suites/control.graphics b/test_suites/control.graphics
index f1d147f..b2123ac 100644
--- a/test_suites/control.graphics
+++ b/test_suites/control.graphics
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "graphics"
 PURPOSE = "Test graphics functionality."
 

test_suites/control.hwqual

diff --git a/test_suites/control.hwqual b/test_suites/control.hwqual
index ac47032..8559e39 100644
--- a/test_suites/control.hwqual
+++ b/test_suites/control.hwqual
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Jean Zheng <jean@google.com>/Chrome OS PSO"
+AUTHOR = "Jean Zheng <jean@google.com>/ChromeOS PSO"
 NAME = "hwqual"
 TIME = "LONG"
 TEST_CATEGORY = "General"

test_suites/control.jailed_build

diff --git a/test_suites/control.jailed_build b/test_suites/control.jailed_build
index 9917fff..04242c6 100644
--- a/test_suites/control.jailed_build
+++ b/test_suites/control.jailed_build
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "jailed_build"
 PURPOSE = "Quartine potentially dangerous tests."
 

test_suites/control.kernel_daily_benchmarks

diff --git a/test_suites/control.kernel_daily_benchmarks b/test_suites/control.kernel_daily_benchmarks
index 0569f37..a99d96d 100644
--- a/test_suites/control.kernel_daily_benchmarks
+++ b/test_suites/control.kernel_daily_benchmarks
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Mike Truty <truty@google.com>/Chrome OS Kernel"
+AUTHOR = "Mike Truty <truty@google.com>/ChromeOS Kernel"
 NAME = "kernel_daily_benchmarks"
 PURPOSE = "Gather benchmark/performance data for kernel evaluation."
 

test_suites/control.kernel_daily_regression

diff --git a/test_suites/control.kernel_daily_regression b/test_suites/control.kernel_daily_regression
index 96c13c0..471abaf 100644
--- a/test_suites/control.kernel_daily_regression
+++ b/test_suites/control.kernel_daily_regression
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Mike Truty <truty@google.com>/Chrome OS Kernel"
+AUTHOR = "Mike Truty <truty@google.com>/ChromeOS Kernel"
 NAME = "kernel_daily_regression"
 PURPOSE = "Test required functionality - longer running than bvt tests usually."
 

test_suites/control.kernel_per-build_benchmarks

diff --git a/test_suites/control.kernel_per-build_benchmarks b/test_suites/control.kernel_per-build_benchmarks
index 7449886..679a1e5 100644
--- a/test_suites/control.kernel_per-build_benchmarks
+++ b/test_suites/control.kernel_per-build_benchmarks
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "kernel_per-build_benchmarks"
 PURPOSE = "Gather benchmark/performance data for kernel evaluation."
 

test_suites/control.kernel_per-build_regression

diff --git a/test_suites/control.kernel_per-build_regression b/test_suites/control.kernel_per-build_regression
index 42bf62e..609b678 100644
--- a/test_suites/control.kernel_per-build_regression
+++ b/test_suites/control.kernel_per-build_regression
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "kernel_per-build_regression"
 PURPOSE = "Test required functionality - longer running than bvt tests usually."
 

test_suites/control.kernel_weekly_regression

diff --git a/test_suites/control.kernel_weekly_regression b/test_suites/control.kernel_weekly_regression
index 8bd12eb..3e6a78e 100644
--- a/test_suites/control.kernel_weekly_regression
+++ b/test_suites/control.kernel_weekly_regression
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "kernel_weekly_regression"
 PURPOSE = "Test required functionality - longer running than bvt tests usually."
 

test_suites/control.labqual

diff --git a/test_suites/control.labqual b/test_suites/control.labqual
index f42a334..655b993 100644
--- a/test_suites/control.labqual
+++ b/test_suites/control.labqual
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "labqual"
 PURPOSE = "Suite to qualify firmware for low-touch lab"
 

test_suites/control.link_perf

diff --git a/test_suites/control.link_perf b/test_suites/control.link_perf
index 1b8256e..90c743f 100644
--- a/test_suites/control.link_perf
+++ b/test_suites/control.link_perf
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "link_perf"
 TIME = "SHORT"
 TEST_CATEGORY = "Servo"

test_suites/control.manual_platform_suite

diff --git a/test_suites/control.manual_platform_suite b/test_suites/control.manual_platform_suite
index 2494ddd..7d64fc6 100644
--- a/test_suites/control.manual_platform_suite
+++ b/test_suites/control.manual_platform_suite
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "platform_manual_suite"
 PURPOSE = "USB peripherals detection during stress procedure."
 

test_suites/control.moblab

diff --git a/test_suites/control.moblab b/test_suites/control.moblab
index fafa4d4..b82b3ba 100644
--- a/test_suites/control.moblab
+++ b/test_suites/control.moblab
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "moblab"
 PURPOSE = "Test critical moblab functionality."
 

test_suites/control.moblab-cts-mini

diff --git a/test_suites/control.moblab-cts-mini b/test_suites/control.moblab-cts-mini
index 8a73283..4249518 100644
--- a/test_suites/control.moblab-cts-mini
+++ b/test_suites/control.moblab-cts-mini
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "moblab-cts-mini"
 PURPOSE = "Ensure that CTS is running on moblab for every commit."
 

test_suites/control.moblab_quick

diff --git a/test_suites/control.moblab_quick b/test_suites/control.moblab_quick
index 8969e3a..3888838 100644
--- a/test_suites/control.moblab_quick
+++ b/test_suites/control.moblab_quick
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "moblab_quick"
 PURPOSE = "Quickly test basic moblab functionality."
 

test_suites/control.moblab_storage_qual

diff --git a/test_suites/control.moblab_storage_qual b/test_suites/control.moblab_storage_qual
index 9413818..a1035d0 100644
--- a/test_suites/control.moblab_storage_qual
+++ b/test_suites/control.moblab_storage_qual
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "moblab_storage_qual"
 PURPOSE = "Quickly test basic moblab functionality."
 

test_suites/control.mtp

diff --git a/test_suites/control.mtp b/test_suites/control.mtp
index 65934fd..d1efba2 100644
--- a/test_suites/control.mtp
+++ b/test_suites/control.mtp
@@ -4,7 +4,7 @@
 
 AUTHOR = "ARC Engprod Team"
 NAME = "mtp"
-PURPOSE = "Suite to run MTP(Media Transfer Protocol) tests on Chrome OS devices."
+PURPOSE = "Suite to run MTP(Media Transfer Protocol) tests on ChromeOS devices."
 TIME = "MEDIUM"
 TEST_CATEGORY = "General"
 TEST_CLASS = "suite"

test_suites/control.nearby-share

diff --git a/test_suites/control.nearby-share b/test_suites/control.nearby-share
index da46783..20eb10e6 100644
--- a/test_suites/control.nearby-share
+++ b/test_suites/control.nearby-share
@@ -4,7 +4,7 @@
 
 AUTHOR = "ChromeOS SW Engprod Team (chromeos-sw-engprod@google.com)"
 NAME = "nearby-share"
-PURPOSE = "Suite to run Nearby Share tests on Chrome OS devices."
+PURPOSE = "Suite to run Nearby Share tests on ChromeOS devices."
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "suite"

test_suites/control.nearby-share-android

diff --git a/test_suites/control.nearby-share-android b/test_suites/control.nearby-share-android
index 7f07c20..90dee46 100644
--- a/test_suites/control.nearby-share-android
+++ b/test_suites/control.nearby-share-android
@@ -4,7 +4,7 @@
 
 AUTHOR = "ChromeOS SW Engprod Team (chromeos-sw-engprod@google.com)"
 NAME = "nearby-share-android"
-PURPOSE = "Suite to run Nearby Share tests on Chrome OS devices."
+PURPOSE = "Suite to run Nearby Share tests on ChromeOS devices."
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "suite"

test_suites/control.nearby-share-arc

diff --git a/test_suites/control.nearby-share-arc b/test_suites/control.nearby-share-arc
index 9f61dbb..0f5e6f3 100644
--- a/test_suites/control.nearby-share-arc
+++ b/test_suites/control.nearby-share-arc
@@ -4,7 +4,7 @@
 
 AUTHOR = "ChromeOS SW Engprod Team (chromeos-sw-engprod@google.com)"
 NAME = "nearby-share-arc"
-PURPOSE = "Suite to run Nearby Share tests on Chrome OS devices."
+PURPOSE = "Suite to run Nearby Share tests on ChromeOS devices."
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "suite"

test_suites/control.nearby-share-dev

diff --git a/test_suites/control.nearby-share-dev b/test_suites/control.nearby-share-dev
index 0f1eb53..3cc873f 100644
--- a/test_suites/control.nearby-share-dev
+++ b/test_suites/control.nearby-share-dev
@@ -4,7 +4,7 @@
 
 AUTHOR = "ChromeOS SW Engprod Team (chromeos-sw-engprod@google.com)"
 NAME = "nearby-share-dev"
-PURPOSE = "Nearby Share tests on Chrome OS devices with dev Android Nearby."
+PURPOSE = "Nearby Share tests on ChromeOS devices with dev Android Nearby."
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "suite"

test_suites/control.nearby-share-prod

diff --git a/test_suites/control.nearby-share-prod b/test_suites/control.nearby-share-prod
index b34fba4..e92cdb3 100644
--- a/test_suites/control.nearby-share-prod
+++ b/test_suites/control.nearby-share-prod
@@ -4,7 +4,7 @@
 
 AUTHOR = "ChromeOS SW Engprod Team (chromeos-sw-engprod@google.com)"
 NAME = "nearby-share-prod"
-PURPOSE = "Nearby Share tests on Chrome OS devices with prod Android Nearby."
+PURPOSE = "Nearby Share tests on ChromeOS devices with prod Android Nearby."
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "suite"

test_suites/control.nearby-share-remote

diff --git a/test_suites/control.nearby-share-remote b/test_suites/control.nearby-share-remote
index a38845a..82b812b 100644
--- a/test_suites/control.nearby-share-remote
+++ b/test_suites/control.nearby-share-remote
@@ -4,7 +4,7 @@
 
 AUTHOR = "ChromeOS SW Engprod Team (chromeos-sw-engprod@google.com)"
 NAME = "nearby-share-remote"
-PURPOSE = "Suite to run Nearby Share remote tests on Chrome OS devices."
+PURPOSE = "Suite to run Nearby Share remote tests on ChromeOS devices."
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "suite"

test_suites/control.network_nightly

diff --git a/test_suites/control.network_nightly b/test_suites/control.network_nightly
index 4d4e4ac..1196226 100644
--- a/test_suites/control.network_nightly
+++ b/test_suites/control.network_nightly
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS "
+AUTHOR = "ChromeOS "
 NAME = "network_nightly"
 PURPOSE = "A simple example suite."
 

test_suites/control.network_ui

diff --git a/test_suites/control.network_ui b/test_suites/control.network_ui
index dc80202..78fe561 100644
--- a/test_suites/control.network_ui
+++ b/test_suites/control.network_ui
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "network_ui"
 PURPOSE = "Software-only network UI tests for shill and Chrome integration."
 
@@ -13,7 +13,7 @@
 
 DOC = """
 Run automated tests backed up by a fake hardware simulator (e.g. pseudomodem)
-to test the Chrome OS network UI and the chrome.networkingPrivate extension
+to test the ChromeOS network UI and the chrome.networkingPrivate extension
 API layer.
 
 @param build: The name of the image to test.

test_suites/control.perfalerts

diff --git a/test_suites/control.perfalerts b/test_suites/control.perfalerts
index 606635a..e9f8f3e 100644
--- a/test_suites/control.perfalerts
+++ b/test_suites/control.perfalerts
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "perfalerts"
 TIME = "LONG"
 TEST_CATEGORY = "Functional"

test_suites/control.power_build

diff --git a/test_suites/control.power_build b/test_suites/control.power_build
index e626cc6..b5f971f 100644
--- a/test_suites/control.power_build
+++ b/test_suites/control.power_build
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_build"
 TIME = "SHORT"
 TEST_CATEGORY = "General"

test_suites/control.power_check

diff --git a/test_suites/control.power_check b/test_suites/control.power_check
index 380c89c..5998536 100644
--- a/test_suites/control.power_check
+++ b/test_suites/control.power_check
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_check"
 PURPOSE = "Daily power check tests"
 

test_suites/control.power_daily

diff --git a/test_suites/control.power_daily b/test_suites/control.power_daily
index 6b82fee..9af3068 100644
--- a/test_suites/control.power_daily
+++ b/test_suites/control.power_daily
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_daily"
 TIME = "SHORT"
 TEST_CATEGORY = "General"

test_suites/control.power_idle

diff --git a/test_suites/control.power_idle b/test_suites/control.power_idle
index 43df634..f39b19c 100644
--- a/test_suites/control.power_idle
+++ b/test_suites/control.power_idle
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_idle"
 PURPOSE = "Measure power usage when system is idle."
 

test_suites/control.power_loadtest

diff --git a/test_suites/control.power_loadtest b/test_suites/control.power_loadtest
index 7d770b0..91147c3 100644
--- a/test_suites/control.power_loadtest
+++ b/test_suites/control.power_loadtest
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_loadtest"
 PURPOSE = "Power load testing."
 

test_suites/control.power_loadtest_1hour

diff --git a/test_suites/control.power_loadtest_1hour b/test_suites/control.power_loadtest_1hour
index 55c63b6..43e6e64 100644
--- a/test_suites/control.power_loadtest_1hour
+++ b/test_suites/control.power_loadtest_1hour
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_loadtest_1hour"
 PURPOSE = "Power load testing."
 

test_suites/control.power_loadtest_fast

diff --git a/test_suites/control.power_loadtest_fast b/test_suites/control.power_loadtest_fast
index b26d7c4..acd09a2 100644
--- a/test_suites/control.power_loadtest_fast
+++ b/test_suites/control.power_loadtest_fast
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_loadtest_fast"
 PURPOSE = "Power load testing."
 

test_suites/control.power_measurement_wrapper

diff --git a/test_suites/control.power_measurement_wrapper b/test_suites/control.power_measurement_wrapper
index c15689a..0cad379 100644
--- a/test_suites/control.power_measurement_wrapper
+++ b/test_suites/control.power_measurement_wrapper
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_measurement_wrapper"
 PURPOSE = "Power testing."
 

test_suites/control.power_requirements

diff --git a/test_suites/control.power_requirements b/test_suites/control.power_requirements
index a7f2be3..30b7f07 100644
--- a/test_suites/control.power_requirements
+++ b/test_suites/control.power_requirements
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "power_requirements"
 TIME = "LONG"
 TEST_CATEGORY = "General"

test_suites/control.provision

diff --git a/test_suites/control.provision b/test_suites/control.provision
index 95b28f1..c683acf 100644
--- a/test_suites/control.provision
+++ b/test_suites/control.provision
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 # This name is hard-coded in run_suite.py
 NAME = "provision"
 PURPOSE = "Provisioning suite job."

test_suites/control.push_to_prod

diff --git a/test_suites/control.push_to_prod b/test_suites/control.push_to_prod
index cfbb479..f0365d0 100644
--- a/test_suites/control.push_to_prod
+++ b/test_suites/control.push_to_prod
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "push_to_prod"
 PURPOSE = "Test Autotest before push to prod."
 

test_suites/control.pvs-audio

diff --git a/test_suites/control.pvs-audio b/test_suites/control.pvs-audio
index 5e6e45a..e59dde2 100644
--- a/test_suites/control.pvs-audio
+++ b/test_suites/control.pvs-audio
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "pvs-audio"
 PURPOSE = "PVS Audio tests that require no special hardware to run"
 

test_suites/control.pvs-bvt-inline

diff --git a/test_suites/control.pvs-bvt-inline b/test_suites/control.pvs-bvt-inline
index 77877dc..948a04b 100644
--- a/test_suites/control.pvs-bvt-inline
+++ b/test_suites/control.pvs-bvt-inline
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS PVS Team"
+AUTHOR = "ChromeOS PVS Team"
 NAME = "pvs-bvt-inline"
 PURPOSE = "Test critical functionality."
 

test_suites/control.pvs-display

diff --git a/test_suites/control.pvs-display b/test_suites/control.pvs-display
index bf7015b..c8b83f5 100644
--- a/test_suites/control.pvs-display
+++ b/test_suites/control.pvs-display
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = 'Chrome OS Team'
+AUTHOR = 'ChromeOS Team'
 NAME = 'pvs-display'
 PURPOSE = 'PVS Display tests that require no special hardware to run'
 

test_suites/control.pvs-graphics

diff --git a/test_suites/control.pvs-graphics b/test_suites/control.pvs-graphics
index 6137d82..c60a5ec 100644
--- a/test_suites/control.pvs-graphics
+++ b/test_suites/control.pvs-graphics
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "pvs-graphics"
 PURPOSE = "PVS graphics tests that require no special hardware to run"
 

test_suites/control.pvs-kernel

diff --git a/test_suites/control.pvs-kernel b/test_suites/control.pvs-kernel
index 6834e11..aded6ae 100644
--- a/test_suites/control.pvs-kernel
+++ b/test_suites/control.pvs-kernel
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "pvs-kernel"
 PURPOSE = "Run kernel tests that partners are able to run over moblab"
 

test_suites/control.pvs-staging

diff --git a/test_suites/control.pvs-staging b/test_suites/control.pvs-staging
index e87ea3a..337d4ce 100644
--- a/test_suites/control.pvs-staging
+++ b/test_suites/control.pvs-staging
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "mwiitala, Chrome OS Team"
+AUTHOR = "mwiitala, ChromeOS Team"
 NAME = "pvs-staging"
 PURPOSE = "Verify that tests are stable and ready to be run by partners for PVS"
 

test_suites/control.pvs-tast-cq

diff --git a/test_suites/control.pvs-tast-cq b/test_suites/control.pvs-tast-cq
index 2ea2ee9..300a0bd 100644
--- a/test_suites/control.pvs-tast-cq
+++ b/test_suites/control.pvs-tast-cq
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "pvs-tast-cq"
 PURPOSE = "Run critical (CQ-blocking) tast tests"
 

test_suites/control.pvs-video

diff --git a/test_suites/control.pvs-video b/test_suites/control.pvs-video
index 50dd352..5986745 100644
--- a/test_suites/control.pvs-video
+++ b/test_suites/control.pvs-video
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = 'Chrome OS Team'
+AUTHOR = 'ChromeOS Team'
 NAME = 'pvs-video'
 PURPOSE = 'PVS Video tests that require no special hardware to run'
 

test_suites/control.regression

diff --git a/test_suites/control.regression b/test_suites/control.regression
index d5733f7..e5b2fed 100644
--- a/test_suites/control.regression
+++ b/test_suites/control.regression
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "regression"
 TIME = "SHORT"
 TEST_CATEGORY = "General"

test_suites/control.satlab-qual-bvt-installer

diff --git a/test_suites/control.satlab-qual-bvt-installer b/test_suites/control.satlab-qual-bvt-installer
index cb2de82..6ef0adc 100644
--- a/test_suites/control.satlab-qual-bvt-installer
+++ b/test_suites/control.satlab-qual-bvt-installer
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "bvt-installer"
 PURPOSE = "Build verification of ChromeOS pieces related to Installer for Satlab"
 

test_suites/control.security

diff --git a/test_suites/control.security b/test_suites/control.security
index 3d4c8f8..e4c85cc 100644
--- a/test_suites/control.security
+++ b/test_suites/control.security
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "security"
 PURPOSE = "Test security related functionality."
 

test_suites/control.security_weekly

diff --git a/test_suites/control.security_weekly b/test_suites/control.security_weekly
index 4447f41..365f7e6 100644
--- a/test_suites/control.security_weekly
+++ b/test_suites/control.security_weekly
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "security_weekly"
 PURPOSE = "Test long-running security related functionality each week."
 

test_suites/control.skylab_staging_test

diff --git a/test_suites/control.skylab_staging_test b/test_suites/control.skylab_staging_test
index 3334d5b..e813e20 100644
--- a/test_suites/control.skylab_staging_test
+++ b/test_suites/control.skylab_staging_test
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "skylab_staging_test"
 PURPOSE = "Test Skylab (and lucifer, autotest) before push to prod."
 

test_suites/control.smoke

diff --git a/test_suites/control.smoke b/test_suites/control.smoke
index 28601ca..a51cb1c 100644
--- a/test_suites/control.smoke
+++ b/test_suites/control.smoke
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "smoke"
 PURPOSE = "Basic tests that are able to run in VMs"
 

test_suites/control.stress

diff --git a/test_suites/control.stress b/test_suites/control.stress
index 96f681d..121e0af 100644
--- a/test_suites/control.stress
+++ b/test_suites/control.stress
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "stress"
 PURPOSE = "Stress test functionality and devices."
 

test_suites/control.stub

diff --git a/test_suites/control.stub b/test_suites/control.stub
index 7b5121e..ea4a54b 100644
--- a/test_suites/control.stub
+++ b/test_suites/control.stub
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "stub"
 PURPOSE = "To be run while testing the infrastructure and test harness."
 

test_suites/control.syzcorpus

diff --git a/test_suites/control.syzcorpus b/test_suites/control.syzcorpus
index 1f02fb3..b5a986a 100644
--- a/test_suites/control.syzcorpus
+++ b/test_suites/control.syzcorpus
@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "zsm, Chrome OS Kernel Team"
+AUTHOR = "zsm, ChromeOS Kernel Team"
 NAME = "syzcorpus"
-PURPOSE = "Suite to run Syzkaller repros on Chrome OS devices."
+PURPOSE = "Suite to run Syzkaller repros on ChromeOS devices."
 
 TIME = "MEDIUM"
 TEST_CATEGORY = "General"
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite runs Syzkaller reproducers to test the Chrome OS kernel.
+This suite runs Syzkaller reproducers to test the ChromeOS Kernel.
 This is a regression test suite for the kernel(both core and drivers).
 See https://github.com/dvyukov/syzkaller-repros for more information.
 """

test_suites/control.syzkaller

diff --git a/test_suites/control.syzkaller b/test_suites/control.syzkaller
index 9ab029b..7c77866 100644
--- a/test_suites/control.syzkaller
+++ b/test_suites/control.syzkaller
@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "mwiitala, Chrome OS Kernel Team"
+AUTHOR = "mwiitala, ChromeOS Kernel Team"
 NAME = "syzkaller"
-PURPOSE = "Suite to run Syzkaller tests on Chrome OS devices."
+PURPOSE = "Suite to run Syzkaller tests on ChromeOS devices."
 
 TIME = "SHORT"
 TEST_CATEGORY = "General"
@@ -12,7 +12,7 @@
 TEST_TYPE = "Server"
 
 DOC = """
-This suite utilizes Syzkaller to fuzz the Chrome OS kernel.
+This suite utilizes Syzkaller to fuzz the ChromeOS Kernel.
 See go/ctp-syzkaller for more details.
 """
 

test_suites/control.telemetry_unit

diff --git a/test_suites/control.telemetry_unit b/test_suites/control.telemetry_unit
index 47f88cb..df03e30 100644
--- a/test_suites/control.telemetry_unit
+++ b/test_suites/control.telemetry_unit
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "telemetry_unit"
 PURPOSE = "Telemetry unit tests."
 

test_suites/control.telemetry_unit_server

diff --git a/test_suites/control.telemetry_unit_server b/test_suites/control.telemetry_unit_server
index 178af7e..287aac6 100644
--- a/test_suites/control.telemetry_unit_server
+++ b/test_suites/control.telemetry_unit_server
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "telemetry_unit_server"
 PURPOSE = "Telemetry unit tests."
 

test_suites/control.toolchain-tests

diff --git a/test_suites/control.toolchain-tests b/test_suites/control.toolchain-tests
index 3f5d756..327012e 100644
--- a/test_suites/control.toolchain-tests
+++ b/test_suites/control.toolchain-tests
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "toolchain-tests"
 PURPOSE = "Test basic, required functionality for the toolchain team."
 

test_suites/control.typec_lab

diff --git a/test_suites/control.typec_lab b/test_suites/control.typec_lab
index 17f4d03..e21b3e2 100644
--- a/test_suites/control.typec_lab
+++ b/test_suites/control.typec_lab
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "typec_lab"
 PURPOSE = 'Tests the end to end Tast tests in the "typec-lab" category.'
 

test_suites/control.usb_detect

diff --git a/test_suites/control.usb_detect b/test_suites/control.usb_detect
index 1532d46..6b97269 100644
--- a/test_suites/control.usb_detect
+++ b/test_suites/control.usb_detect
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "usb_detect"
 PURPOSE = "USB peripherals detection."
 

test_suites/control.usb_detect_stress

diff --git a/test_suites/control.usb_detect_stress b/test_suites/control.usb_detect_stress
index 8bc9f8b..67ee4ad 100644
--- a/test_suites/control.usb_detect_stress
+++ b/test_suites/control.usb_detect_stress
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "usb_detect_stress"
 PURPOSE = "USB peripherals detection during stress procedure."
 

test_suites/control.wificell_dut_validation

diff --git a/test_suites/control.wificell_dut_validation b/test_suites/control.wificell_dut_validation
index 08bdfe4..3727ee6 100644
--- a/test_suites/control.wificell_dut_validation
+++ b/test_suites/control.wificell_dut_validation
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "wificell_dut_validation"
 PURPOSE = "Group of tests run by lab team to validate AP, PCAP, BT-Peers & DUT during deployment."
 

test_suites/control.wifichaos

diff --git a/test_suites/control.wifichaos b/test_suites/control.wifichaos
index e5f0151..d1d3973 100644
--- a/test_suites/control.wifichaos
+++ b/test_suites/control.wifichaos
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = "Chrome OS Team"
+AUTHOR = "ChromeOS Team"
 NAME = "wifichaos"
 TIME = "SHORT"
 TEST_CATEGORY = "General"