fix ChromiumOS authors and whitespace warnings

BUG=none
TEST=none

Change-Id: I61b0b0106a43f723ec3bc805eb190aef00bbd05b
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3894391
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>

129 files changed, 145 insertions, 131 deletions

diff --git a/test/aes.tasklist b/test/aes.tasklist
index 24870f2abb..86bc8aa2d5 100644
--- a/test/aes.tasklist
+++ b/test/aes.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/base32.c b/test/base32.c
index 6fd574bb73..45f758d046 100644
--- a/test/base32.c
+++ b/test/base32.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/base32.tasklist b/test/base32.tasklist
index 7150f17cbd..6373a70ab1 100644
--- a/test/base32.tasklist
+++ b/test/base32.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/build.mk b/test/build.mk
index 16638acaae..32160bd120 100644
--- a/test/build.mk
+++ b/test/build.mk
@@ -1,5 +1,5 @@
 # -*- makefile -*-
-# Copyright 2013 The Chromium OS Authors. All rights reserved.
+# Copyright 2013 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/button.c b/test/button.c
index 29cbbce93e..5c632d901d 100644
--- a/test/button.c
+++ b/test/button.c
@@ -1,4 +1,4 @@
-/* Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/button.tasklist b/test/button.tasklist
index 5a8fb1bfbe..e2f8671c60 100644
--- a/test/button.tasklist
+++ b/test/button.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/cec.c b/test/cec.c
index 64b230e509..c108397612 100644
--- a/test/cec.c
+++ b/test/cec.c
@@ -1,4 +1,4 @@
-/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/cec.tasklist b/test/cec.tasklist
index e7634958a9..df71bfc0f9 100644
--- a/test/cec.tasklist
+++ b/test/cec.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/console_edit.c b/test/console_edit.c
index 69ed6d28fb..e40de7aec3 100644
--- a/test/console_edit.c
+++ b/test/console_edit.c
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/console_edit.tasklist b/test/console_edit.tasklist
index da0ab6211a..100cb6b5bd 100644
--- a/test/console_edit.tasklist
+++ b/test/console_edit.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/crc32.c b/test/crc32.c
index 986a1c60c3..7b79dbc140 100644
--- a/test/crc32.c
+++ b/test/crc32.c
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/crc32.tasklist b/test/crc32.tasklist
index f46a2eaa1d..bf2309064a 100644
--- a/test/crc32.tasklist
+++ b/test/crc32.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/ec_comm.c b/test/ec_comm.c
index c24f968442..715713fa4e 100644
--- a/test/ec_comm.c
+++ b/test/ec_comm.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 The Chromium OS Authors. All rights reserved.
+/* Copyright 2020 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/ec_comm.tasklist b/test/ec_comm.tasklist
index 52c0d390ef..08d31e0102 100644
--- a/test/ec_comm.tasklist
+++ b/test/ec_comm.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2020 The Chromium OS Authors. All rights reserved.
+/* Copyright 2020 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/ec_comm21.tasklist b/test/ec_comm21.tasklist
index 52c0d390ef..08d31e0102 100644
--- a/test/ec_comm21.tasklist
+++ b/test/ec_comm21.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2020 The Chromium OS Authors. All rights reserved.
+/* Copyright 2020 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/entropy.c b/test/entropy.c
index a19a8eb33f..f4d90f9f30 100644
--- a/test/entropy.c
+++ b/test/entropy.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/entropy.tasklist b/test/entropy.tasklist
index 80072bb620..329f9a3d28 100644
--- a/test/entropy.tasklist
+++ b/test/entropy.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/flash.c b/test/flash.c
index b23af5e05f..2ac612f99f 100644
--- a/test/flash.c
+++ b/test/flash.c
@@ -1,4 +1,4 @@
-/* Copyright 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright 2012 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/flash.tasklist b/test/flash.tasklist
index dae84c1635..dbebe0dabb 100644
--- a/test/flash.tasklist
+++ b/test/flash.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/flash_log.c b/test/flash_log.c
index 48c842371e..e5c3ea8151 100644
--- a/test/flash_log.c
+++ b/test/flash_log.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/flash_log.tasklist b/test/flash_log.tasklist
index 9fc1a80f4d..844ddb6c10 100644
--- a/test/flash_log.tasklist
+++ b/test/flash_log.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/float.tasklist b/test/float.tasklist
index 9ad0114d8a..5216cd488c 100644
--- a/test/float.tasklist
+++ b/test/float.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/fp.c b/test/fp.c
index 296a78e4df..e8a1c0ff4f 100644
--- a/test/fp.c
+++ b/test/fp.c
@@ -1,4 +1,4 @@
-/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/fp.tasklist b/test/fp.tasklist
index 9ad0114d8a..5216cd488c 100644
--- a/test/fp.tasklist
+++ b/test/fp.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/hooks.c b/test/hooks.c
index 09ed981ae1..0382cb624e 100644
--- a/test/hooks.c
+++ b/test/hooks.c
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/hooks.tasklist b/test/hooks.tasklist
index da0ab6211a..100cb6b5bd 100644
--- a/test/hooks.tasklist
+++ b/test/hooks.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/host_command.c b/test/host_command.c
index 4b51a6f8fc..efae13ed53 100644
--- a/test/host_command.c
+++ b/test/host_command.c
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/host_command.tasklist b/test/host_command.tasklist
index da0ab6211a..100cb6b5bd 100644
--- a/test/host_command.tasklist
+++ b/test/host_command.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/interrupt.c b/test/interrupt.c
index 5b69ee3c20..b2ae7b06d4 100644
--- a/test/interrupt.c
+++ b/test/interrupt.c
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/interrupt.tasklist b/test/interrupt.tasklist
index da0ab6211a..100cb6b5bd 100644
--- a/test/interrupt.tasklist
+++ b/test/interrupt.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/is_enabled.c b/test/is_enabled.c
index c994d84b45..c9d1f934f0 100644
--- a/test/is_enabled.c
+++ b/test/is_enabled.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/is_enabled.tasklist b/test/is_enabled.tasklist
index 5ffe662d01..2d4595f76a 100644
--- a/test/is_enabled.tasklist
+++ b/test/is_enabled.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/is_enabled_error.c b/test/is_enabled_error.c
index 2f17925337..38c150be8f 100644
--- a/test/is_enabled_error.c
+++ b/test/is_enabled_error.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/is_enabled_error.sh b/test/is_enabled_error.sh
index 1e5407f31f..c99c4f0e26 100644
--- a/test/is_enabled_error.sh
+++ b/test/is_enabled_error.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -e
-# Copyright 2019 The Chromium OS Authors. All rights reserved.
+# Copyright 2019 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/is_enabled_error.tasklist b/test/is_enabled_error.tasklist
index 5ffe662d01..2d4595f76a 100644
--- a/test/is_enabled_error.tasklist
+++ b/test/is_enabled_error.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/legacy_nvmem_dump.h b/test/legacy_nvmem_dump.h
index 6816673c23..cfb96febdc 100644
--- a/test/legacy_nvmem_dump.h
+++ b/test/legacy_nvmem_dump.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Chromium OS Authors. All rights reserved.
+ * Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/math_util.c b/test/math_util.c
index 9a2900eb73..6a2f300e4d 100644
--- a/test/math_util.c
+++ b/test/math_util.c
@@ -1,4 +1,4 @@
-/* Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/math_util.tasklist b/test/math_util.tasklist
index f5c894ccaf..dbe560d4aa 100644
--- a/test/math_util.tasklist
+++ b/test/math_util.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/mutex.c b/test/mutex.c
index 266b94ac31..933ff29648 100644
--- a/test/mutex.c
+++ b/test/mutex.c
@@ -1,4 +1,4 @@
-/* Copyright 2011 The Chromium OS Authors. All rights reserved.
+/* Copyright 2011 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  * Copyright 2011 Google Inc.
diff --git a/test/mutex.tasklist b/test/mutex.tasklist
index 8e3d08ddc2..46cdad7fa1 100644
--- a/test/mutex.tasklist
+++ b/test/mutex.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/nvmem.c b/test/nvmem.c
index ed1553747d..859ca30f7a 100644
--- a/test/nvmem.c
+++ b/test/nvmem.c
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/nvmem.tasklist b/test/nvmem.tasklist
index 43afb03fb5..450d249a0b 100644
--- a/test/nvmem.tasklist
+++ b/test/nvmem.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/nvmem_test.h b/test/nvmem_test.h
index 58775d4bcb..f1d3fcf29a 100644
--- a/test/nvmem_test.h
+++ b/test/nvmem_test.h
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/nvmem_tpm2_mock.c b/test/nvmem_tpm2_mock.c
index 00c87df3b9..75b9458f73 100644
--- a/test/nvmem_tpm2_mock.c
+++ b/test/nvmem_tpm2_mock.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/pingpong.c b/test/pingpong.c
index 3a5d6afd6e..1f50639f37 100644
--- a/test/pingpong.c
+++ b/test/pingpong.c
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/pingpong.tasklist b/test/pingpong.tasklist
index 760d204b67..7db2ce33a6 100644
--- a/test/pingpong.tasklist
+++ b/test/pingpong.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/pinweaver.c b/test/pinweaver.c
index 8f2890d34b..332edc5f2e 100644
--- a/test/pinweaver.c
+++ b/test/pinweaver.c
@@ -1,4 +1,4 @@
-/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/pinweaver.tasklist b/test/pinweaver.tasklist
index 24870f2abb..86bc8aa2d5 100644
--- a/test/pinweaver.tasklist
+++ b/test/pinweaver.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/power_button.c b/test/power_button.c
index 26e3dcc1b0..50a813d678 100644
--- a/test/power_button.c
+++ b/test/power_button.c
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/power_button.tasklist b/test/power_button.tasklist
index da0ab6211a..100cb6b5bd 100644
--- a/test/power_button.tasklist
+++ b/test/power_button.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/powerdemo.c b/test/powerdemo.c
index e695bb8e5e..ab8271fff0 100644
--- a/test/powerdemo.c
+++ b/test/powerdemo.c
@@ -1,4 +1,4 @@
-/* Copyright 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright 2012 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/powerdemo.h b/test/powerdemo.h
index 17ed482042..f3dabe8b1a 100644
--- a/test/powerdemo.h
+++ b/test/powerdemo.h
@@ -1,4 +1,4 @@
-/* Copyright 2011 The Chromium OS Authors. All rights reserved.
+/* Copyright 2011 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/powerdemo.tasklist b/test/powerdemo.tasklist
index a4fff562e3..3824306072 100644
--- a/test/powerdemo.tasklist
+++ b/test/powerdemo.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/printf.c b/test/printf.c
index 43f4125e0c..0b0def33a5 100644
--- a/test/printf.c
+++ b/test/printf.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/printf.tasklist b/test/printf.tasklist
index 9fc1a80f4d..844ddb6c10 100644
--- a/test/printf.tasklist
+++ b/test/printf.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/queue.c b/test/queue.c
index 79df79fa22..1f4d46cc79 100644
--- a/test/queue.c
+++ b/test/queue.c
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/queue.tasklist b/test/queue.tasklist
index da0ab6211a..100cb6b5bd 100644
--- a/test/queue.tasklist
+++ b/test/queue.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/rma_auth.c b/test/rma_auth.c
index 129cc70383..924bb0483b 100644
--- a/test/rma_auth.c
+++ b/test/rma_auth.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/rma_auth.tasklist b/test/rma_auth.tasklist
index 7150f17cbd..6373a70ab1 100644
--- a/test/rma_auth.tasklist
+++ b/test/rma_auth.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/rsa.c b/test/rsa.c
index aaa4a656e2..c1765224d0 100644
--- a/test/rsa.c
+++ b/test/rsa.c
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
@@ -51,4 +51,3 @@ void run_test(void)
 
 	test_pass();
 }
-
diff --git a/test/rsa.tasklist b/test/rsa.tasklist
index f46a2eaa1d..bf2309064a 100644
--- a/test/rsa.tasklist
+++ b/test/rsa.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/rsa2048-3.h b/test/rsa2048-3.h
index d1b15c15a4..454e10d525 100644
--- a/test/rsa2048-3.h
+++ b/test/rsa2048-3.h
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/rsa2048-F4.h b/test/rsa2048-F4.h
index afe66a198f..8b96ae2c06 100644
--- a/test/rsa2048-F4.h
+++ b/test/rsa2048-F4.h
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/rsa3.tasklist b/test/rsa3.tasklist
index 6cfe0ef051..bf2309064a 120000..100644
--- a/test/rsa3.tasklist
+++ b/test/rsa3.tasklist
@@ -1 +1,9 @@
-rsa.tasklist
\ No newline at end of file
+/* Copyright 2016 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/**
+ * See CONFIG_TASK_LIST in config.h for details.
+ */
+#define CONFIG_TEST_TASK_LIST
diff --git a/test/rtc.c b/test/rtc.c
index 5d16d3008c..ccf21f82d2 100644
--- a/test/rtc.c
+++ b/test/rtc.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/rtc.tasklist b/test/rtc.tasklist
index 80072bb620..329f9a3d28 100644
--- a/test/rtc.tasklist
+++ b/test/rtc.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/sha256.c b/test/sha256.c
index 6af3fb1343..9a25b93a8c 100644
--- a/test/sha256.c
+++ b/test/sha256.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/sha256.tasklist b/test/sha256.tasklist
index 80072bb620..329f9a3d28 100644
--- a/test/sha256.tasklist
+++ b/test/sha256.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/sha256_unrolled.tasklist b/test/sha256_unrolled.tasklist
index 06d8620957..329f9a3d28 120000..100644
--- a/test/sha256_unrolled.tasklist
+++ b/test/sha256_unrolled.tasklist
@@ -1 +1,9 @@
-sha256.tasklist
\ No newline at end of file
+/* Copyright 2017 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/**
+ * See CONFIG_TASK_LIST in config.h for details.
+ */
+#define CONFIG_TEST_TASK_LIST
diff --git a/test/shmalloc.c b/test/shmalloc.c
index b841d7ae1e..4f644f646d 100644
--- a/test/shmalloc.c
+++ b/test/shmalloc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Chromium OS Authors. All rights reserved.
+ * Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/shmalloc.tasklist b/test/shmalloc.tasklist
index a8ef01a489..1413e373b1 100644
--- a/test/shmalloc.tasklist
+++ b/test/shmalloc.tasklist
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Chromium OS Authors. All rights reserved.
+ * Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/static_if.c b/test/static_if.c
index 46e8057d7f..5406702396 100644
--- a/test/static_if.c
+++ b/test/static_if.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/static_if.tasklist b/test/static_if.tasklist
index 5ffe662d01..2d4595f76a 100644
--- a/test/static_if.tasklist
+++ b/test/static_if.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/static_if_error.c b/test/static_if_error.c
index bbe4839981..3866a14542 100644
--- a/test/static_if_error.c
+++ b/test/static_if_error.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/static_if_error.sh b/test/static_if_error.sh
index efc7cd3e1e..ef17780f4c 100644
--- a/test/static_if_error.sh
+++ b/test/static_if_error.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -e
-# Copyright 2019 The Chromium OS Authors. All rights reserved.
+# Copyright 2019 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/static_if_error.tasklist b/test/static_if_error.tasklist
index 5ffe662d01..2d4595f76a 100644
--- a/test/static_if_error.tasklist
+++ b/test/static_if_error.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2019 The Chromium OS Authors. All rights reserved.
+/* Copyright 2019 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/stress.c b/test/stress.c
index aa7c604765..fbd5b7b221 100644
--- a/test/stress.c
+++ b/test/stress.c
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/stress.tasklist b/test/stress.tasklist
index da0ab6211a..100cb6b5bd 100644
--- a/test/stress.tasklist
+++ b/test/stress.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/system.c b/test/system.c
index 37d5e5751a..bcb7f0251c 100644
--- a/test/system.c
+++ b/test/system.c
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/system.tasklist b/test/system.tasklist
index 4e455a7ea3..6967ec1095 100644
--- a/test/system.tasklist
+++ b/test/system.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/test_config.h b/test/test_config.h
index 493d255626..6b7d0c467e 100644
--- a/test/test_config.h
+++ b/test/test_config.h
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/thermal.c b/test/thermal.c
index 922b58da78..d20a4d4e79 100644
--- a/test/thermal.c
+++ b/test/thermal.c
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/thermal.tasklist b/test/thermal.tasklist
index d22719d1fb..7494e757cf 100644
--- a/test/thermal.tasklist
+++ b/test/thermal.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/timer_calib.c b/test/timer_calib.c
index 361689f8bd..6f67c86d12 100644
--- a/test/timer_calib.c
+++ b/test/timer_calib.c
@@ -1,4 +1,4 @@
-/* Copyright 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright 2012 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/timer_calib.py b/test/timer_calib.py
index 2a625d80c7..0a704cc139 100644
--- a/test/timer_calib.py
+++ b/test/timer_calib.py
@@ -1,4 +1,4 @@
-# Copyright 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
diff --git a/test/timer_calib.tasklist b/test/timer_calib.tasklist
index 51f5beb6c1..22a63c247e 100644
--- a/test/timer_calib.tasklist
+++ b/test/timer_calib.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/timer_dos.c b/test/timer_dos.c
index d70f7e8231..7392ec4e18 100644
--- a/test/timer_dos.c
+++ b/test/timer_dos.c
@@ -1,4 +1,4 @@
-/* Copyright 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright 2012 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/timer_dos.tasklist b/test/timer_dos.tasklist
index 4da3419f77..5bd77b0580 100644
--- a/test/timer_dos.tasklist
+++ b/test/timer_dos.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/timer_jump.py b/test/timer_jump.py
index d183fbf918..627ed4fd9e 100644
--- a/test/timer_jump.py
+++ b/test/timer_jump.py
@@ -1,4 +1,4 @@
-# Copyright 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
diff --git a/test/timer_jump.tasklist b/test/timer_jump.tasklist
index da0ab6211a..100cb6b5bd 100644
--- a/test/timer_jump.tasklist
+++ b/test/timer_jump.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/tpm_test/Makefile b/test/tpm_test/Makefile
index 95c407c03f..a34132ebc8 100644
--- a/test/tpm_test/Makefile
+++ b/test/tpm_test/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/tpm_test/bn_test.c b/test/tpm_test/bn_test.c
index 01a2119daa..7c06c8b9bb 100644
--- a/test/tpm_test/bn_test.c
+++ b/test/tpm_test/bn_test.c
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/tpm_test/crypto_test.py b/test/tpm_test/crypto_test.py
index b10b04df1c..d08b34fcb5 100644
--- a/test/tpm_test/crypto_test.py
+++ b/test/tpm_test/crypto_test.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/tpm_test/crypto_test.xml b/test/tpm_test/crypto_test.xml
index 152f55c97f..96d54696a0 100644
--- a/test/tpm_test/crypto_test.xml
+++ b/test/tpm_test/crypto_test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2015 The Chromium OS Authors. All rights reserved.
+Copyright 2015 The ChromiumOS Authors
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
diff --git a/test/tpm_test/drbg_test.py b/test/tpm_test/drbg_test.py
index 1ada131600..38a97132b4 100644
--- a/test/tpm_test/drbg_test.py
+++ b/test/tpm_test/drbg_test.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2019 The Chromium OS Authors. All rights reserved.
+# Copyright 2019 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/tpm_test/ecc_test.py b/test/tpm_test/ecc_test.py
index ecc68dbdd5..b2d25dece0 100644
--- a/test/tpm_test/ecc_test.py
+++ b/test/tpm_test/ecc_test.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2016 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/tpm_test/ecies_test.py b/test/tpm_test/ecies_test.py
index c19be8d123..bae84e70c1 100644
--- a/test/tpm_test/ecies_test.py
+++ b/test/tpm_test/ecies_test.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2016 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/tpm_test/ftdi_spi_tpm.c b/test/tpm_test/ftdi_spi_tpm.c
index c0fc2669e2..fe3b46db83 100644
--- a/test/tpm_test/ftdi_spi_tpm.c
+++ b/test/tpm_test/ftdi_spi_tpm.c
@@ -1,4 +1,4 @@
-/* Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 2015 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/tpm_test/ftdi_spi_tpm.h b/test/tpm_test/ftdi_spi_tpm.h
index 5393d4cd86..3153d01149 100644
--- a/test/tpm_test/ftdi_spi_tpm.h
+++ b/test/tpm_test/ftdi_spi_tpm.h
@@ -1,4 +1,4 @@
-/* Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 2015 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/tpm_test/ftdi_spi_tpm.i b/test/tpm_test/ftdi_spi_tpm.i
index 2bbcded64b..589caab042 100644
--- a/test/tpm_test/ftdi_spi_tpm.i
+++ b/test/tpm_test/ftdi_spi_tpm.i
@@ -1,4 +1,4 @@
-/* Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 2015 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/tpm_test/genvectors.py b/test/tpm_test/genvectors.py
index baf276bd88..2c8945b915 100755
--- a/test/tpm_test/genvectors.py
+++ b/test/tpm_test/genvectors.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2016 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/tpm_test/hash_test.py b/test/tpm_test/hash_test.py
index 1f88034065..24c77be151 100644
--- a/test/tpm_test/hash_test.py
+++ b/test/tpm_test/hash_test.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/tpm_test/hkdf_test.py b/test/tpm_test/hkdf_test.py
index ab1c87301a..cd42901ccf 100644
--- a/test/tpm_test/hkdf_test.py
+++ b/test/tpm_test/hkdf_test.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2016 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/tpm_test/lab_vectors.py b/test/tpm_test/lab_vectors.py
index dfa9f6a62f..d5db76f4ca 100644
--- a/test/tpm_test/lab_vectors.py
+++ b/test/tpm_test/lab_vectors.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
+# Copyright 2021 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/tpm_test/mpsse.c b/test/tpm_test/mpsse.c
index 249b548b11..9e7ebf17ee 100644
--- a/test/tpm_test/mpsse.c
+++ b/test/tpm_test/mpsse.c
@@ -1,4 +1,4 @@
-/* Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 2015 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/tpm_test/mpsse.h b/test/tpm_test/mpsse.h
index 2925dfe27a..b16b2e8cb2 100644
--- a/test/tpm_test/mpsse.h
+++ b/test/tpm_test/mpsse.h
@@ -1,4 +1,4 @@
-/* Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 2015 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/tpm_test/nist_entropy.sh b/test/tpm_test/nist_entropy.sh
index b25bd884bf..65630560b4 100755
--- a/test/tpm_test/nist_entropy.sh
+++ b/test/tpm_test/nist_entropy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2019 The Chromium OS Authors. All rights reserved.
+# Copyright 2019 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/tpm_test/rsa_test.py b/test/tpm_test/rsa_test.py
index ceaa15786f..d11143ff50 100644
--- a/test/tpm_test/rsa_test.py
+++ b/test/tpm_test/rsa_test.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/tpm_test/subcmd.py b/test/tpm_test/subcmd.py
index 754fbf575d..6d043b23c8 100644
--- a/test/tpm_test/subcmd.py
+++ b/test/tpm_test/subcmd.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/tpm_test/support.c b/test/tpm_test/support.c
index fbb4d0b6ab..52a361531b 100644
--- a/test/tpm_test/support.c
+++ b/test/tpm_test/support.c
@@ -1,4 +1,4 @@
-/* Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 2015 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/tpm_test/support.h b/test/tpm_test/support.h
index 77316582cc..d75184c3b6 100644
--- a/test/tpm_test/support.h
+++ b/test/tpm_test/support.h
@@ -1,4 +1,4 @@
-/* Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 2015 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/tpm_test/testlib/common.c b/test/tpm_test/testlib/common.c
index 35b07196aa..46d0e203a7 100644
--- a/test/tpm_test/testlib/common.c
+++ b/test/tpm_test/testlib/common.c
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/tpm_test/testlib/common.h b/test/tpm_test/testlib/common.h
index 9fdd7ebcae..52e16c00a4 100644
--- a/test/tpm_test/testlib/common.h
+++ b/test/tpm_test/testlib/common.h
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -15,4 +15,3 @@
 void rand_bytes(void *buf, size_t num);
 
 #endif  /* ! __EC_TEST_TPM_TEST_TESTLIB_COMMON_H */
-
diff --git a/test/tpm_test/testlib/trng.h b/test/tpm_test/testlib/trng.h
index 25ff00b4f7..b7c29b12d0 100644
--- a/test/tpm_test/testlib/trng.h
+++ b/test/tpm_test/testlib/trng.h
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/tpm_test/testlib/util.h b/test/tpm_test/testlib/util.h
index 25ff00b4f7..b7c29b12d0 100644
--- a/test/tpm_test/testlib/util.h
+++ b/test/tpm_test/testlib/util.h
@@ -1,4 +1,4 @@
-/* Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/tpm_test/tpmtest.py b/test/tpm_test/tpmtest.py
index 62e299f7d0..0df57548f8 100755
--- a/test/tpm_test/tpmtest.py
+++ b/test/tpm_test/tpmtest.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Module for initializing and driving a SPI TPM."""
diff --git a/test/tpm_test/trng_test.py b/test/tpm_test/trng_test.py
index 38aabc7c13..9433d11d24 100644
--- a/test/tpm_test/trng_test.py
+++ b/test/tpm_test/trng_test.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2019 The Chromium OS Authors. All rights reserved.
+# Copyright 2019 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Tests for trng."""
diff --git a/test/tpm_test/u2f_test.py b/test/tpm_test/u2f_test.py
index a5f9e0743c..a7439602ef 100644
--- a/test/tpm_test/u2f_test.py
+++ b/test/tpm_test/u2f_test.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
+# Copyright 2021 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/tpm_test/upgrade_test.py b/test/tpm_test/upgrade_test.py
index 1cdd15a728..1d8885188e 100644
--- a/test/tpm_test/upgrade_test.py
+++ b/test/tpm_test/upgrade_test.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2016 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Firmware upgrade tests"""
diff --git a/test/tpm_test/utils.py b/test/tpm_test/utils.py
index b4e1748779..0f85bbba6a 100644
--- a/test/tpm_test/utils.py
+++ b/test/tpm_test/utils.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/test/u2f.c b/test/u2f.c
index baa58bf489..195f12acff 100644
--- a/test/u2f.c
+++ b/test/u2f.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+/* Copyright 2021 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/u2f.tasklist b/test/u2f.tasklist
index 299cf25390..35fa6f24bd 100644
--- a/test/u2f.tasklist
+++ b/test/u2f.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+/* Copyright 2021 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/utils.c b/test/utils.c
index 1cd86830ed..ff775bc473 100644
--- a/test/utils.c
+++ b/test/utils.c
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/utils.tasklist b/test/utils.tasklist
index da0ab6211a..100cb6b5bd 100644
--- a/test/utils.tasklist
+++ b/test/utils.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/utils_str.c b/test/utils_str.c
index 81c600bc03..d9e856f131 100644
--- a/test/utils_str.c
+++ b/test/utils_str.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/utils_str.tasklist b/test/utils_str.tasklist
index 7150f17cbd..6373a70ab1 100644
--- a/test/utils_str.tasklist
+++ b/test/utils_str.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/vboot.c b/test/vboot.c
index 77f9c0af9f..ad51765e05 100644
--- a/test/vboot.c
+++ b/test/vboot.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
diff --git a/test/vboot.tasklist b/test/vboot.tasklist
index 7150f17cbd..6373a70ab1 100644
--- a/test/vboot.tasklist
+++ b/test/vboot.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
diff --git a/test/x25519.tasklist b/test/x25519.tasklist
index 80072bb620..329f9a3d28 100644
--- a/test/x25519.tasklist
+++ b/test/x25519.tasklist
@@ -1,4 +1,4 @@
-/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+/* Copyright 2017 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */