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>

137 files changed, 137 insertions, 145 deletions

diff --git a/common/acpi.c b/common/acpi.c
index 87e9c4fd27..33a4bcde7f 100644
--- a/common/acpi.c
+++ b/common/acpi.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/common/adc.c b/common/adc.c
index 5407de6cfe..64caace6e9 100644
--- a/common/adc.c
+++ b/common/adc.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/common/als.c b/common/als.c
index cf136ef50f..419d90a6e9 100644
--- a/common/als.c
+++ b/common/als.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/common/ap_hang_detect.c b/common/ap_hang_detect.c
index 0c9e7a186d..8c8ef41522 100644
--- a/common/ap_hang_detect.c
+++ b/common/ap_hang_detect.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/common/ap_ro_integrity_check.c b/common/ap_ro_integrity_check.c
index 9d34bc4318..18f87ea4fd 100644
--- a/common/ap_ro_integrity_check.c
+++ b/common/ap_ro_integrity_check.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/common/audio_codec.c b/common/audio_codec.c
index 9895f579e8..5273608e07 100644
--- a/common/audio_codec.c
+++ b/common/audio_codec.c
@@ -1,5 +1,5 @@
 /*
- * 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/common/audio_codec_dmic.c b/common/audio_codec_dmic.c
index c4f0b07a46..ac300be178 100644
--- a/common/audio_codec_dmic.c
+++ b/common/audio_codec_dmic.c
@@ -1,5 +1,5 @@
 /*
- * 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/common/audio_codec_i2s_rx.c b/common/audio_codec_i2s_rx.c
index 700fc41024..0d80877279 100644
--- a/common/audio_codec_i2s_rx.c
+++ b/common/audio_codec_i2s_rx.c
@@ -1,5 +1,5 @@
 /*
- * 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/common/audio_codec_wov.c b/common/audio_codec_wov.c
index f84e45f342..bfea4ce97a 100644
--- a/common/audio_codec_wov.c
+++ b/common/audio_codec_wov.c
@@ -1,5 +1,5 @@
 /*
- * 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/common/backlight_lid.c b/common/backlight_lid.c
index 3b857df592..a0f0f2b567 100644
--- a/common/backlight_lid.c
+++ b/common/backlight_lid.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.
  */
@@ -81,5 +81,3 @@ switch_command_enable_backlight(struct host_cmd_handler_args *args)
 DECLARE_HOST_COMMAND(EC_CMD_SWITCH_ENABLE_BKLIGHT,
 		     switch_command_enable_backlight,
 		     EC_VER_MASK(0));
-
-
diff --git a/common/base32.c b/common/base32.c
index 8a33d7685c..7615c0a50d 100644
--- a/common/base32.c
+++ b/common/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/common/base_state.c b/common/base_state.c
index 053b6d4b23..04ba1f84d7 100644
--- a/common/base_state.c
+++ b/common/base_state.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/common/build.mk b/common/build.mk
index 771b75da1a..ec5ce99916 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -1,5 +1,5 @@
 # -*- makefile -*-
-# 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/common/button.c b/common/button.c
index 7eee2e41e1..2990d345b9 100644
--- a/common/button.c
+++ b/common/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/common/capsense.c b/common/capsense.c
index b2413ac61f..5505efa4d3 100644
--- a/common/capsense.c
+++ b/common/capsense.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/common/cbi.c b/common/cbi.c
index ddeb41fd22..4de787bb03 100644
--- a/common/cbi.c
+++ b/common/cbi.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/common/ccd_config.c b/common/ccd_config.c
index bd1b0a8b6e..516da9ae11 100644
--- a/common/ccd_config.c
+++ b/common/ccd_config.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/common/cec.c b/common/cec.c
index 1bc3273c1d..872260ea60 100644
--- a/common/cec.c
+++ b/common/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/common/chargen.c b/common/chargen.c
index ae93ba1c42..321546c22f 100644
--- a/common/chargen.c
+++ b/common/chargen.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/common/chipset.c b/common/chipset.c
index 9791aeb93b..3a30c96112 100644
--- a/common/chipset.c
+++ b/common/chipset.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/common/clz.c b/common/clz.c
index b0b58e76a0..178c44d345 100644
--- a/common/clz.c
+++ b/common/clz.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/common/cmsg.c b/common/cmsg.c
index 63560171df..fb55d139a8 100644
--- a/common/cmsg.c
+++ b/common/cmsg.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/common/console.c b/common/console.c
index 9ee3dc5b13..5c1106a238 100644
--- a/common/console.c
+++ b/common/console.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/common/console_output.c b/common/console_output.c
index 03bb9d6914..c7701fb983 100644
--- a/common/console_output.c
+++ b/common/console_output.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/common/crc.c b/common/crc.c
index 2db1ffc361..4d3a78209c 100644
--- a/common/crc.c
+++ b/common/crc.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/common/crc8.c b/common/crc8.c
index 83ba31c5a4..72ac410648 100644
--- a/common/crc8.c
+++ b/common/crc8.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/common/ctz.c b/common/ctz.c
index bb6f69624e..ca6fdefa69 100644
--- a/common/ctz.c
+++ b/common/ctz.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/common/device_event.c b/common/device_event.c
index ab11c0826c..96378676e3 100644
--- a/common/device_event.c
+++ b/common/device_event.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/common/device_state.c b/common/device_state.c
index 0ba94d6115..f3e6d0c488 100644
--- a/common/device_state.c
+++ b/common/device_state.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/common/dptf.c b/common/dptf.c
index acc04b123f..a1e9228304 100644
--- a/common/dptf.c
+++ b/common/dptf.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/common/ec.libsharedobjs.ld b/common/ec.libsharedobjs.ld
index adf5081640..57b67daecc 100644
--- a/common/ec.libsharedobjs.ld
+++ b/common/ec.libsharedobjs.ld
@@ -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/common/ec_comm.c b/common/ec_comm.c
index bedd9e34af..39a6d8eff1 100644
--- a/common/ec_comm.c
+++ b/common/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/common/ec_efs.c b/common/ec_efs.c
index cf28844fee..a6b5f8e3e3 100644
--- a/common/ec_efs.c
+++ b/common/ec_efs.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/common/ec_features.c b/common/ec_features.c
index d817e8ccbc..c135659f14 100644
--- a/common/ec_features.c
+++ b/common/ec_features.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/common/event_log.c b/common/event_log.c
index 994967664c..19e33ba54d 100644
--- a/common/event_log.c
+++ b/common/event_log.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/common/extension.c b/common/extension.c
index d3dcae8217..18f03f12c8 100644
--- a/common/extension.c
+++ b/common/extension.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/common/extpower_gpio.c b/common/extpower_gpio.c
index 988cf243c9..95dda3229d 100644
--- a/common/extpower_gpio.c
+++ b/common/extpower_gpio.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/common/factory_mode.c b/common/factory_mode.c
index c1d6789b91..532fd5eccb 100644
--- a/common/factory_mode.c
+++ b/common/factory_mode.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/common/fan.c b/common/fan.c
index f3ee013a4c..75b82b1e07 100644
--- a/common/fan.c
+++ b/common/fan.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/common/firmware_image.S b/common/firmware_image.S
index 643c0b8b52..afc026b17a 100644
--- a/common/firmware_image.S
+++ b/common/firmware_image.S
@@ -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/common/firmware_image.lds.S b/common/firmware_image.lds.S
index 6f2433231a..791313cfe6 100644
--- a/common/firmware_image.lds.S
+++ b/common/firmware_image.lds.S
@@ -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/common/flash.c b/common/flash.c
index ae08fdbd5f..1c0756b505 100644
--- a/common/flash.c
+++ b/common/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/common/flash_log.c b/common/flash_log.c
index 927c7ac3f7..97431d442b 100644
--- a/common/flash_log.c
+++ b/common/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/common/flash_log_vc.c b/common/flash_log_vc.c
index 5d1515a754..73f66b8463 100644
--- a/common/flash_log_vc.c
+++ b/common/flash_log_vc.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/common/fmap.c b/common/fmap.c
index 001f83a184..c035cafc64 100644
--- a/common/fmap.c
+++ b/common/fmap.c
@@ -1,5 +1,5 @@
 /*
- * 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/common/gesture.c b/common/gesture.c
index 86039e33bb..df3830ba01 100644
--- a/common/gesture.c
+++ b/common/gesture.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.
  */
@@ -332,4 +332,3 @@ static int command_tap_info(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(tapinfo, command_tap_info,
 			"debug on/off",
 			"Print tap information");
-
diff --git a/common/gpio.c b/common/gpio.c
index 79d436815d..bf9d578461 100644
--- a/common/gpio.c
+++ b/common/gpio.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/common/gpio_commands.c b/common/gpio_commands.c
index 7986d747a4..ea8efa17f6 100644
--- a/common/gpio_commands.c
+++ b/common/gpio_commands.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/common/hooks.c b/common/hooks.c
index c029c5c0da..a057f1bac0 100644
--- a/common/hooks.c
+++ b/common/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/common/host_command.c b/common/host_command.c
index 4fe8705019..5b1ed038d6 100644
--- a/common/host_command.c
+++ b/common/host_command.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/common/host_command_pd.c b/common/host_command_pd.c
index 3f0f83c4b2..53c46d95c1 100644
--- a/common/host_command_pd.c
+++ b/common/host_command_pd.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/common/host_event_commands.c b/common/host_event_commands.c
index ee60d9fc50..31d5ac7b44 100644
--- a/common/host_event_commands.c
+++ b/common/host_event_commands.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/common/hotword_dsp_api.c b/common/hotword_dsp_api.c
index dc53cd0055..24291df8c0 100644
--- a/common/hotword_dsp_api.c
+++ b/common/hotword_dsp_api.c
@@ -1,5 +1,5 @@
 /*
- * 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/common/i2c_controller.c b/common/i2c_controller.c
index 933cfa8dbb..ab7706a16c 100644
--- a/common/i2c_controller.c
+++ b/common/i2c_controller.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/common/i2c_peripheral.c b/common/i2c_peripheral.c
index 20a4b4b0ae..8222ae60aa 100644
--- a/common/i2c_peripheral.c
+++ b/common/i2c_peripheral.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/common/i2c_wedge.c b/common/i2c_wedge.c
index 0d930a7729..0673c097b7 100644
--- a/common/i2c_wedge.c
+++ b/common/i2c_wedge.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.
  */
@@ -338,4 +338,3 @@ static int command_i2c_unwedge(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(i2cunwedge, command_i2c_unwedge,
 	"",
 	"Unwedge host I2C bus");
-
diff --git a/common/i2cp_tpm.c b/common/i2cp_tpm.c
index 4fbc27c899..331dd3e344 100644
--- a/common/i2cp_tpm.c
+++ b/common/i2cp_tpm.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/common/inductive_charging.c b/common/inductive_charging.c
index 793f535afe..9700e37dcc 100644
--- a/common/inductive_charging.c
+++ b/common/inductive_charging.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/common/keyboard_8042.c b/common/keyboard_8042.c
index 69669a740a..91e8adf0df 100644
--- a/common/keyboard_8042.c
+++ b/common/keyboard_8042.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/common/keyboard_8042_sharedlib.c b/common/keyboard_8042_sharedlib.c
index 429400ef28..4682d2582e 100644
--- a/common/keyboard_8042_sharedlib.c
+++ b/common/keyboard_8042_sharedlib.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/common/keyboard_backlight.c b/common/keyboard_backlight.c
index c0c46e5299..33b5596966 100644
--- a/common/keyboard_backlight.c
+++ b/common/keyboard_backlight.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/common/keyboard_mkbp.c b/common/keyboard_mkbp.c
index aa8a518809..5b382c2406 100644
--- a/common/keyboard_mkbp.c
+++ b/common/keyboard_mkbp.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/common/keyboard_scan.c b/common/keyboard_scan.c
index d371ddc0c7..99b6076bce 100644
--- a/common/keyboard_scan.c
+++ b/common/keyboard_scan.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/common/keyboard_test.c b/common/keyboard_test.c
index e7b1dfe501..1a15d1ce4e 100644
--- a/common/keyboard_test.c
+++ b/common/keyboard_test.c
@@ -1,5 +1,5 @@
 /*
- * 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/common/lb_common.c b/common/lb_common.c
index 08783997fa..8b76afb725 100644
--- a/common/lb_common.c
+++ b/common/lb_common.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/common/led_common.c b/common/led_common.c
index 1ca5a7a959..a9a1331d58 100644
--- a/common/led_common.c
+++ b/common/led_common.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/common/led_onoff_states.c b/common/led_onoff_states.c
index c82cc2d17c..26ec31c24b 100644
--- a/common/led_onoff_states.c
+++ b/common/led_onoff_states.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/common/led_policy_std.c b/common/led_policy_std.c
index e9fe4568a2..4dc34bce63 100644
--- a/common/led_policy_std.c
+++ b/common/led_policy_std.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.
  *
@@ -199,4 +199,3 @@ static void led_second(void)
 		std_led_set_battery();
 }
 DECLARE_HOOK(HOOK_SECOND, led_second, HOOK_PRIO_DEFAULT);
-
diff --git a/common/led_pwm.c b/common/led_pwm.c
index dd8f33a137..dddbf43cfd 100644
--- a/common/led_pwm.c
+++ b/common/led_pwm.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/common/lid_angle.c b/common/lid_angle.c
index 94ecce9549..b13df9d986 100644
--- a/common/lid_angle.c
+++ b/common/lid_angle.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/common/lid_switch.c b/common/lid_switch.c
index 2528e00092..44c3298cd3 100644
--- a/common/lid_switch.c
+++ b/common/lid_switch.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/common/lightbar.c b/common/lightbar.c
index f070398481..db21fd01e9 100644
--- a/common/lightbar.c
+++ b/common/lightbar.c
@@ -1,5 +1,5 @@
 /*
- * 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/common/mag_cal.c b/common/mag_cal.c
index db09050007..772f408cde 100644
--- a/common/mag_cal.c
+++ b/common/mag_cal.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/common/main.c b/common/main.c
index 67fba14505..b27b8192e8 100644
--- a/common/main.c
+++ b/common/main.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/common/mat33.c b/common/mat33.c
index 87e335db26..4e8ec5d8c0 100644
--- a/common/mat33.c
+++ b/common/mat33.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/common/mat44.c b/common/mat44.c
index a4232bf8d4..d48ca4f596 100644
--- a/common/mat44.c
+++ b/common/mat44.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/common/math_util.c b/common/math_util.c
index 53c688ae1c..d6a26738ce 100644
--- a/common/math_util.c
+++ b/common/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/common/memory_commands.c b/common/memory_commands.c
index 98c64d918b..0d5a8dcb5b 100644
--- a/common/memory_commands.c
+++ b/common/memory_commands.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/common/mkbp_event.c b/common/mkbp_event.c
index 1b37bf78de..6cc5744213 100644
--- a/common/mkbp_event.c
+++ b/common/mkbp_event.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/common/mock/README.md b/common/mock/README.md
index df984c3314..ddc0978017 100644
--- a/common/mock/README.md
+++ b/common/mock/README.md
@@ -38,7 +38,7 @@ The mocklist file is optional, so you may need to create one.
 Example `.mocklist`:
 
 ```c
-/* 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/common/mock/build.mk b/common/mock/build.mk
index c8aac53723..0589e68279 100644
--- a/common/mock/build.mk
+++ b/common/mock/build.mk
@@ -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/common/mock/fp_sensor_mock.c b/common/mock/fp_sensor_mock.c
index 778b7c270d..e77ad904fd 100644
--- a/common/mock/fp_sensor_mock.c
+++ b/common/mock/fp_sensor_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/common/mock/mkbp_events_mock.c b/common/mock/mkbp_events_mock.c
index fdab664c39..408fe8433e 100644
--- a/common/mock/mkbp_events_mock.c
+++ b/common/mock/mkbp_events_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/common/mock/rollback_mock.c b/common/mock/rollback_mock.c
index 84e9c4aa43..cd0361a695 100644
--- a/common/mock/rollback_mock.c
+++ b/common/mock/rollback_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/common/mock/tcpc_mock.c b/common/mock/tcpc_mock.c
index dabe5cda70..d69bdf8a45 100644
--- a/common/mock/tcpc_mock.c
+++ b/common/mock/tcpc_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/common/mock/tcpc_mock.h b/common/mock/tcpc_mock.h
index 0cea10412a..51824d1773 100644
--- a/common/mock/tcpc_mock.h
+++ b/common/mock/tcpc_mock.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/common/mock/timer_mock.c b/common/mock/timer_mock.c
index 21408b7fe6..1abfa79241 100644
--- a/common/mock/timer_mock.c
+++ b/common/mock/timer_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/common/motion_lid.c b/common/motion_lid.c
index bdef89f3b7..f8aca12f06 100644
--- a/common/motion_lid.c
+++ b/common/motion_lid.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.
  */
@@ -555,4 +555,3 @@ enum ec_status host_cmd_motion_lid(struct host_cmd_handler_args *args)
 
 	return EC_RES_SUCCESS;
 }
-
diff --git a/common/new_nvmem.c b/common/new_nvmem.c
index e55460b042..8e496fe9a5 100644
--- a/common/new_nvmem.c
+++ b/common/new_nvmem.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/common/nvmem.c b/common/nvmem.c
index af0ba3ad4c..d3cf791b60 100644
--- a/common/nvmem.c
+++ b/common/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/common/nvmem_vars.c b/common/nvmem_vars.c
index 2b60dbed0c..95bdcc252f 100644
--- a/common/nvmem_vars.c
+++ b/common/nvmem_vars.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/common/panic_output.c b/common/panic_output.c
index c8ad2cbb48..14ae34264a 100644
--- a/common/panic_output.c
+++ b/common/panic_output.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/common/pd_log.c b/common/pd_log.c
index b91a58762c..fe3023020f 100644
--- a/common/pd_log.c
+++ b/common/pd_log.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/common/peci.c b/common/peci.c
index e0f03c95dd..bc0a4c232b 100644
--- a/common/peci.c
+++ b/common/peci.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/common/physical_presence.c b/common/physical_presence.c
index 5fa97e1218..0114511896 100644
--- a/common/physical_presence.c
+++ b/common/physical_presence.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/common/pinweaver.c b/common/pinweaver.c
index 2c8c381d3b..31879da987 100644
--- a/common/pinweaver.c
+++ b/common/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/common/port80.c b/common/port80.c
index 52264cc446..5af01104df 100644
--- a/common/port80.c
+++ b/common/port80.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/common/power_button.c b/common/power_button.c
index 3d85d17c75..257dd50272 100644
--- a/common/power_button.c
+++ b/common/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.
  */
@@ -192,4 +192,3 @@ static int command_powerbtn(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(powerbtn, command_powerbtn,
 			"[msec]",
 			"Simulate power button press");
-
diff --git a/common/power_button_x86.c b/common/power_button_x86.c
index 7a380a2f81..98fd19eb25 100644
--- a/common/power_button_x86.c
+++ b/common/power_button_x86.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/common/printf.c b/common/printf.c
index 914d03b969..bdd071c86e 100644
--- a/common/printf.c
+++ b/common/printf.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/common/pstore_commands.c b/common/pstore_commands.c
index 52270cd1cf..93d6bb81e8 100644
--- a/common/pstore_commands.c
+++ b/common/pstore_commands.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/common/pwm.c b/common/pwm.c
index 73b12fc20c..2f334f60a7 100644
--- a/common/pwm.c
+++ b/common/pwm.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/common/pwm_kblight.c b/common/pwm_kblight.c
index c6464b7011..f1450b72ef 100644
--- a/common/pwm_kblight.c
+++ b/common/pwm_kblight.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/common/queue.c b/common/queue.c
index 2cea6d0070..2b8c77f7ea 100644
--- a/common/queue.c
+++ b/common/queue.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/common/queue_policies.c b/common/queue_policies.c
index 090c837fae..c297afcacf 100644
--- a/common/queue_policies.c
+++ b/common/queue_policies.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/common/rma_auth.c b/common/rma_auth.c
index 01c3ff827e..c7cf33d375 100644
--- a/common/rma_auth.c
+++ b/common/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/common/rsa.c b/common/rsa.c
index 891614bbfa..ef98801c01 100644
--- a/common/rsa.c
+++ b/common/rsa.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/common/rtc.c b/common/rtc.c
index 8a2fbc7139..c09aa20492 100644
--- a/common/rtc.c
+++ b/common/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/common/rwsig.c b/common/rwsig.c
index f6ad6d5ed2..34b6227eaa 100644
--- a/common/rwsig.c
+++ b/common/rwsig.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/common/sha1.c b/common/sha1.c
index 57e6e8999b..4f56d1e2c9 100644
--- a/common/sha1.c
+++ b/common/sha1.c
@@ -1,4 +1,4 @@
-/* Copyright 2010 The Chromium OS Authors. All rights reserved.
+/* Copyright 2010 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/common/shared_mem.c b/common/shared_mem.c
index be420f60a6..511bcf91f4 100644
--- a/common/shared_mem.c
+++ b/common/shared_mem.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/common/shmalloc.c b/common/shmalloc.c
index b1705b52d1..a275a22211 100644
--- a/common/shmalloc.c
+++ b/common/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/common/spi_commands.c b/common/spi_commands.c
index 1a70a5be82..8f8077b30f 100644
--- a/common/spi_commands.c
+++ b/common/spi_commands.c
@@ -1,5 +1,5 @@
 /*
- * 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.
  *
@@ -68,4 +68,3 @@ static int command_spixfer(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(spixfer, command_spixfer,
 			"rlen/w id offset [value | len]",
 			"Read write spi. id is spi_devices array index");
-
diff --git a/common/spi_flash.c b/common/spi_flash.c
index 3f003052bf..d7eaf3edc4 100644
--- a/common/spi_flash.c
+++ b/common/spi_flash.c
@@ -1,5 +1,5 @@
 /*
- * 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/common/spi_flash_reg.c b/common/spi_flash_reg.c
index 3cee0f3bd4..6541f7702a 100644
--- a/common/spi_flash_reg.c
+++ b/common/spi_flash_reg.c
@@ -1,5 +1,5 @@
 /*
- * 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/common/switch.c b/common/switch.c
index ea07efbca0..df2e798071 100644
--- a/common/switch.c
+++ b/common/switch.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/common/system.c b/common/system.c
index 96fc57f4b9..85f1e0411a 100644
--- a/common/system.c
+++ b/common/system.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/common/tablet_mode.c b/common/tablet_mode.c
index 5486ffc668..764ea7c32a 100644
--- a/common/tablet_mode.c
+++ b/common/tablet_mode.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/common/temp_sensor.c b/common/temp_sensor.c
index 819da155ac..66c709af5a 100644
--- a/common/temp_sensor.c
+++ b/common/temp_sensor.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/common/test_util.c b/common/test_util.c
index da0daa49c7..446a85feca 100644
--- a/common/test_util.c
+++ b/common/test_util.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/common/thermal.c b/common/thermal.c
index 1ab47d743c..62a2561587 100644
--- a/common/thermal.c
+++ b/common/thermal.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/common/throttle_ap.c b/common/throttle_ap.c
index 4d446f44d0..356dc7580e 100644
--- a/common/throttle_ap.c
+++ b/common/throttle_ap.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/common/timer.c b/common/timer.c
index cadebead7c..e08fe88056 100644
--- a/common/timer.c
+++ b/common/timer.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/common/tpm_registers.c b/common/tpm_registers.c
index 429e895283..fda89f2f14 100644
--- a/common/tpm_registers.c
+++ b/common/tpm_registers.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/common/u2f.c b/common/u2f.c
index 1a4026b559..98e05cf100 100644
--- a/common/u2f.c
+++ b/common/u2f.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/common/uart_buffering.c b/common/uart_buffering.c
index ec1987df76..7509734741 100644
--- a/common/uart_buffering.c
+++ b/common/uart_buffering.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/common/usb_console_stream.c b/common/usb_console_stream.c
index 6ba1f484a4..52111cd65a 100644
--- a/common/usb_console_stream.c
+++ b/common/usb_console_stream.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/common/usb_i2c.c b/common/usb_i2c.c
index ace2e7139c..585d35feca 100644
--- a/common/usb_i2c.c
+++ b/common/usb_i2c.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/common/util.c b/common/util.c
index 88c93fa314..7d5030ae39 100644
--- a/common/util.c
+++ b/common/util.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/common/vboot/common.c b/common/vboot/common.c
index 39f8c193c7..423e7ebe57 100644
--- a/common/vboot/common.c
+++ b/common/vboot/common.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/common/vboot/vb21_lib.c b/common/vboot/vb21_lib.c
index 5aac6e1f04..cc2d370d49 100644
--- a/common/vboot/vb21_lib.c
+++ b/common/vboot/vb21_lib.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/common/vboot_hash.c b/common/vboot_hash.c
index f44565f9f0..37dae21f82 100644
--- a/common/vboot_hash.c
+++ b/common/vboot_hash.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/common/vec3.c b/common/vec3.c
index 9a3561365a..27fa54fe77 100644
--- a/common/vec3.c
+++ b/common/vec3.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/common/version.c b/common/version.c
index 962f4621e8..a5444d4c95 100644
--- a/common/version.c
+++ b/common/version.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/common/vstore.c b/common/vstore.c
index 9b4636397c..5b823cbbcc 100644
--- a/common/vstore.c
+++ b/common/vstore.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/common/webusb_desc.c b/common/webusb_desc.c
index 41d39006e0..e2f51b4c0f 100644
--- a/common/webusb_desc.c
+++ b/common/webusb_desc.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/common/wireless.c b/common/wireless.c
index d1f5cad645..9a327b988f 100644
--- a/common/wireless.c
+++ b/common/wireless.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.
  */