fix copyrights
diff --git a/Makefile-Android b/Makefile-Android
index f972564..168e249 100644
--- a/Makefile-Android
+++ b/Makefile-Android
@@ -1,5 +1,6 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2014-2017 Nest Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/Makefile-Standalone b/Makefile-Standalone
index 7ffe9cd..29b79ab 100644
--- a/Makefile-Standalone
+++ b/Makefile-Standalone
@@ -1,5 +1,6 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2014-2017 Nest Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/Makefile-bootstrap b/Makefile-bootstrap
index 461f9f8..7e673fd 100644
--- a/Makefile-bootstrap
+++ b/Makefile-bootstrap
@@ -1,5 +1,7 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright 2019 Google LLC. All Rights Reserved.
+# Copyright 2017-2018 Nest Labs Inc. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/Makefile-iOS b/Makefile-iOS
index 756227e..4624df4 100644
--- a/Makefile-iOS
+++ b/Makefile-iOS
@@ -1,5 +1,6 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2014-2017 Nest Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/Makefile.am b/Makefile.am
index 38d873f..af72231 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
#
# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2014-2018 Nest Labs, Inc.
+# Copyright (c) 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/bootstrap b/bootstrap
index b654faf..631b8cf 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,8 @@
#!/usr/bin/env bash
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2014-2017 Nest Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/autoconf/m4/nl_with_lwip.m4 b/build/autoconf/m4/nl_with_lwip.m4
index 1266d10..4c8dff9 100644
--- a/build/autoconf/m4/nl_with_lwip.m4
+++ b/build/autoconf/m4/nl_with_lwip.m4
@@ -1,5 +1,6 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2015-2017 Nest Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/config/standalone/CHIPProjectConfig.h b/build/config/standalone/CHIPProjectConfig.h
index 0fdea6b..b686028 100644
--- a/build/config/standalone/CHIPProjectConfig.h
+++ b/build/config/standalone/CHIPProjectConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/build/config/standalone/SystemProjectConfig.h b/build/config/standalone/SystemProjectConfig.h
index c3b78c7..682a21d 100644
--- a/build/config/standalone/SystemProjectConfig.h
+++ b/build/config/standalone/SystemProjectConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/build/config/standalone/darwin/CHIPProjectConfig.h b/build/config/standalone/darwin/CHIPProjectConfig.h
index f6b7db6..f3816d7 100644
--- a/build/config/standalone/darwin/CHIPProjectConfig.h
+++ b/build/config/standalone/darwin/CHIPProjectConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/build/config/standalone/no-openssl/CHIPProjectConfig.h b/build/config/standalone/no-openssl/CHIPProjectConfig.h
index d08908b..141dd49 100644
--- a/build/config/standalone/no-openssl/CHIPProjectConfig.h
+++ b/build/config/standalone/no-openssl/CHIPProjectConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/build/efr32/efr32-app.mk b/build/efr32/efr32-app.mk
index f801ee6..8a5c625 100644
--- a/build/efr32/efr32-app.mk
+++ b/build/efr32/efr32-app.mk
@@ -1,5 +1,6 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2019 Google LLC.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/build/nrf5/nrf5-app.mk b/build/nrf5/nrf5-app.mk
index abbd395..e2d435b 100644
--- a/build/nrf5/nrf5-app.mk
+++ b/build/nrf5/nrf5-app.mk
@@ -1,5 +1,6 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2019 Google LLC.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/configure.ac b/configure.ac
index 33c4cae..dde136e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,8 @@
# Process this file with autoconf to produce a configure script.
#
-# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2018-2019 Google LLC
+# Copyright (c) 2014-2018 Nest Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a935a2..7831467 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,7 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2014-2018 Nest Labs, Inc.
+# Copyright (c) 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/ble/BLEEndPoint.cpp b/src/ble/BLEEndPoint.cpp
index e6285f7..7f100ce 100644
--- a/src/ble/BLEEndPoint.cpp
+++ b/src/ble/BLEEndPoint.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/BLEEndPoint.h b/src/ble/BLEEndPoint.h
index 0a85fb1..289f61d 100644
--- a/src/ble/BLEEndPoint.h
+++ b/src/ble/BLEEndPoint.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/Ble.h b/src/ble/Ble.h
index 25b9d47..bce7f31 100644
--- a/src/ble/Ble.h
+++ b/src/ble/Ble.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2015-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/BleApplicationDelegate.h b/src/ble/BleApplicationDelegate.h
index 0807009..a94ff7f 100644
--- a/src/ble/BleApplicationDelegate.h
+++ b/src/ble/BleApplicationDelegate.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/BleConfig.h b/src/ble/BleConfig.h
index 4aa615a..3139534 100644
--- a/src/ble/BleConfig.h
+++ b/src/ble/BleConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/BleError.cpp b/src/ble/BleError.cpp
index 8bd95a3..8e627e8 100644
--- a/src/ble/BleError.cpp
+++ b/src/ble/BleError.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/BleError.h b/src/ble/BleError.h
index fba20ba..81db5a7 100644
--- a/src/ble/BleError.h
+++ b/src/ble/BleError.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2015-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/BleLayer.am b/src/ble/BleLayer.am
index a2bb8bf..0fe2ab3 100644
--- a/src/ble/BleLayer.am
+++ b/src/ble/BleLayer.am
@@ -1,5 +1,6 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2014-2017 Nest Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/ble/BleLayer.cpp b/src/ble/BleLayer.cpp
index da60283..2e9f494 100644
--- a/src/ble/BleLayer.cpp
+++ b/src/ble/BleLayer.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/BleLayer.h b/src/ble/BleLayer.h
index 236b974..d23dfd0 100644
--- a/src/ble/BleLayer.h
+++ b/src/ble/BleLayer.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/BlePlatformDelegate.h b/src/ble/BlePlatformDelegate.h
index 546de04..ce163b3 100644
--- a/src/ble/BlePlatformDelegate.h
+++ b/src/ble/BlePlatformDelegate.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/BleUUID.cpp b/src/ble/BleUUID.cpp
index bf92281..6400164 100644
--- a/src/ble/BleUUID.cpp
+++ b/src/ble/BleUUID.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/BleUUID.h b/src/ble/BleUUID.h
index a21c731..604132c 100644
--- a/src/ble/BleUUID.h
+++ b/src/ble/BleUUID.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/CHIPBleServiceData.h b/src/ble/CHIPBleServiceData.h
index de63e3d..2c80302 100644
--- a/src/ble/CHIPBleServiceData.h
+++ b/src/ble/CHIPBleServiceData.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/CHIPoBle.cpp b/src/ble/CHIPoBle.cpp
index 0680b3b..e2d821c 100644
--- a/src/ble/CHIPoBle.cpp
+++ b/src/ble/CHIPoBle.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/CHIPoBle.h b/src/ble/CHIPoBle.h
index c3f4d01..8158a2f 100644
--- a/src/ble/CHIPoBle.h
+++ b/src/ble/CHIPoBle.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/ble/Makefile.am b/src/ble/Makefile.am
index 9367f07..4cad31b 100644
--- a/src/ble/Makefile.am
+++ b/src/ble/Makefile.am
@@ -1,6 +1,7 @@
#
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2014-2017 Nest Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/include/platform/CHIPDeviceConfig.h b/src/include/platform/CHIPDeviceConfig.h
index 2dbf86e..5bf7cc9 100644
--- a/src/include/platform/CHIPDeviceConfig.h
+++ b/src/include/platform/CHIPDeviceConfig.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019-2020 Google LLC.
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/CHIPDeviceError.h b/src/include/platform/CHIPDeviceError.h
index 03b1522..cca6f3d 100644
--- a/src/include/platform/CHIPDeviceError.h
+++ b/src/include/platform/CHIPDeviceError.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/CHIPDeviceEvent.h b/src/include/platform/CHIPDeviceEvent.h
index ac6eca2..4602aea 100644
--- a/src/include/platform/CHIPDeviceEvent.h
+++ b/src/include/platform/CHIPDeviceEvent.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/CHIPDeviceLayer.h b/src/include/platform/CHIPDeviceLayer.h
index 2e43a3c..8288bb0 100644
--- a/src/include/platform/CHIPDeviceLayer.h
+++ b/src/include/platform/CHIPDeviceLayer.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/ConfigurationManager.h b/src/include/platform/ConfigurationManager.h
index 3a915e8..701245d 100644
--- a/src/include/platform/ConfigurationManager.h
+++ b/src/include/platform/ConfigurationManager.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019-2020 Google LLC.
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/ConnectivityManager.h b/src/include/platform/ConnectivityManager.h
index c04bf44..ce17b4c 100644
--- a/src/include/platform/ConnectivityManager.h
+++ b/src/include/platform/ConnectivityManager.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/BLEManagerImpl.h b/src/include/platform/EFR32/BLEManagerImpl.h
index 0a5d211..8dc395e 100644
--- a/src/include/platform/EFR32/BLEManagerImpl.h
+++ b/src/include/platform/EFR32/BLEManagerImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/BlePlatformConfig.h b/src/include/platform/EFR32/BlePlatformConfig.h
index 9b7254c..a3518d9 100644
--- a/src/include/platform/EFR32/BlePlatformConfig.h
+++ b/src/include/platform/EFR32/BlePlatformConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/CHIPDevicePlatformConfig.h b/src/include/platform/EFR32/CHIPDevicePlatformConfig.h
index a889df6..5f0c3cb 100644
--- a/src/include/platform/EFR32/CHIPDevicePlatformConfig.h
+++ b/src/include/platform/EFR32/CHIPDevicePlatformConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/CHIPDevicePlatformEvent.h b/src/include/platform/EFR32/CHIPDevicePlatformEvent.h
index f820aa7..fb879db 100644
--- a/src/include/platform/EFR32/CHIPDevicePlatformEvent.h
+++ b/src/include/platform/EFR32/CHIPDevicePlatformEvent.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/CHIPPlatformConfig.h b/src/include/platform/EFR32/CHIPPlatformConfig.h
index 82631a3..c2dfadc 100644
--- a/src/include/platform/EFR32/CHIPPlatformConfig.h
+++ b/src/include/platform/EFR32/CHIPPlatformConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/ConfigurationManagerImpl.h b/src/include/platform/EFR32/ConfigurationManagerImpl.h
index 8828e7e..0eb4385 100644
--- a/src/include/platform/EFR32/ConfigurationManagerImpl.h
+++ b/src/include/platform/EFR32/ConfigurationManagerImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/ConnectivityManagerImpl.h b/src/include/platform/EFR32/ConnectivityManagerImpl.h
index 4c9457b..c03650b 100644
--- a/src/include/platform/EFR32/ConnectivityManagerImpl.h
+++ b/src/include/platform/EFR32/ConnectivityManagerImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/EFR32Config.h b/src/include/platform/EFR32/EFR32Config.h
index 6802db3..b34151f 100644
--- a/src/include/platform/EFR32/EFR32Config.h
+++ b/src/include/platform/EFR32/EFR32Config.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/GroupKeyStoreImpl.h b/src/include/platform/EFR32/GroupKeyStoreImpl.h
index a108a82..b637b4b 100644
--- a/src/include/platform/EFR32/GroupKeyStoreImpl.h
+++ b/src/include/platform/EFR32/GroupKeyStoreImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/InetPlatformConfig.h b/src/include/platform/EFR32/InetPlatformConfig.h
index 44102b1..0908aee 100644
--- a/src/include/platform/EFR32/InetPlatformConfig.h
+++ b/src/include/platform/EFR32/InetPlatformConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/NetworkProvisioningServerImpl.h b/src/include/platform/EFR32/NetworkProvisioningServerImpl.h
index 87e3ef6..3c80a33 100644
--- a/src/include/platform/EFR32/NetworkProvisioningServerImpl.h
+++ b/src/include/platform/EFR32/NetworkProvisioningServerImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/PlatformManagerImpl.h b/src/include/platform/EFR32/PlatformManagerImpl.h
index 3bdae38..8347118 100644
--- a/src/include/platform/EFR32/PlatformManagerImpl.h
+++ b/src/include/platform/EFR32/PlatformManagerImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/SoftwareUpdateManagerImpl.h b/src/include/platform/EFR32/SoftwareUpdateManagerImpl.h
index 5927d36..d5349a3 100644
--- a/src/include/platform/EFR32/SoftwareUpdateManagerImpl.h
+++ b/src/include/platform/EFR32/SoftwareUpdateManagerImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/SystemPlatformConfig.h b/src/include/platform/EFR32/SystemPlatformConfig.h
index f206819..f60c72b 100644
--- a/src/include/platform/EFR32/SystemPlatformConfig.h
+++ b/src/include/platform/EFR32/SystemPlatformConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/ThreadStackManagerImpl.h b/src/include/platform/EFR32/ThreadStackManagerImpl.h
index f17101d..91d6c0d 100644
--- a/src/include/platform/EFR32/ThreadStackManagerImpl.h
+++ b/src/include/platform/EFR32/ThreadStackManagerImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/WarmPlatformConfig.h b/src/include/platform/EFR32/WarmPlatformConfig.h
index 6527495..3497be5 100644
--- a/src/include/platform/EFR32/WarmPlatformConfig.h
+++ b/src/include/platform/EFR32/WarmPlatformConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/freertos_bluetooth.h b/src/include/platform/EFR32/freertos_bluetooth.h
index eae8271..04972ce 100644
--- a/src/include/platform/EFR32/freertos_bluetooth.h
+++ b/src/include/platform/EFR32/freertos_bluetooth.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2020 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/gatt.xml b/src/include/platform/EFR32/gatt.xml
index f2abefc..a351ca9 100644
--- a/src/include/platform/EFR32/gatt.xml
+++ b/src/include/platform/EFR32/gatt.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2020 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/EFR32/gatt_db.h b/src/include/platform/EFR32/gatt_db.h
index 1c0d2cd..1007bbe 100644
--- a/src/include/platform/EFR32/gatt_db.h
+++ b/src/include/platform/EFR32/gatt_db.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2020 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/GeneralUtils.h b/src/include/platform/GeneralUtils.h
index c383f99..8e1d6d4 100644
--- a/src/include/platform/GeneralUtils.h
+++ b/src/include/platform/GeneralUtils.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/PersistedStorage.h b/src/include/platform/PersistedStorage.h
index 34d8052..c20c368 100644
--- a/src/include/platform/PersistedStorage.h
+++ b/src/include/platform/PersistedStorage.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/PlatformManager.h b/src/include/platform/PlatformManager.h
index 934d838..471eae0 100644
--- a/src/include/platform/PlatformManager.h
+++ b/src/include/platform/PlatformManager.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/SoftwareUpdateManager.h b/src/include/platform/SoftwareUpdateManager.h
index f55ecc2..281b7ea 100644
--- a/src/include/platform/SoftwareUpdateManager.h
+++ b/src/include/platform/SoftwareUpdateManager.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/ThreadStackManager.h b/src/include/platform/ThreadStackManager.h
index ae6efbe..2448f8d 100644
--- a/src/include/platform/ThreadStackManager.h
+++ b/src/include/platform/ThreadStackManager.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/TimeSyncManager.h b/src/include/platform/TimeSyncManager.h
index d89d4b5..2ff992c 100644
--- a/src/include/platform/TimeSyncManager.h
+++ b/src/include/platform/TimeSyncManager.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/BLEManager.h b/src/include/platform/internal/BLEManager.h
index f83d01d..de41e9a 100644
--- a/src/include/platform/internal/BLEManager.h
+++ b/src/include/platform/internal/BLEManager.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/CHIPDeviceLayerInternal.h b/src/include/platform/internal/CHIPDeviceLayerInternal.h
index ca1b27f..16b306e 100644
--- a/src/include/platform/internal/CHIPDeviceLayerInternal.h
+++ b/src/include/platform/internal/CHIPDeviceLayerInternal.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019-2020 Google LLC.
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/DeviceDescriptionServer.h b/src/include/platform/internal/DeviceDescriptionServer.h
index 74bee8a..d3908cc 100644
--- a/src/include/platform/internal/DeviceDescriptionServer.h
+++ b/src/include/platform/internal/DeviceDescriptionServer.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/EventLogging.h b/src/include/platform/internal/EventLogging.h
index 2c6ac33..d6485f3 100644
--- a/src/include/platform/internal/EventLogging.h
+++ b/src/include/platform/internal/EventLogging.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericConfigurationManagerImpl.h b/src/include/platform/internal/GenericConfigurationManagerImpl.h
index d08232e..2a434df 100644
--- a/src/include/platform/internal/GenericConfigurationManagerImpl.h
+++ b/src/include/platform/internal/GenericConfigurationManagerImpl.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019-2020 Google LLC.
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericConfigurationManagerImpl.ipp b/src/include/platform/internal/GenericConfigurationManagerImpl.ipp
index f9a282f..704fc28 100644
--- a/src/include/platform/internal/GenericConfigurationManagerImpl.ipp
+++ b/src/include/platform/internal/GenericConfigurationManagerImpl.ipp
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019-2020 Google LLC.
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl.h b/src/include/platform/internal/GenericConnectivityManagerImpl.h
index b9c98bb..2b24864 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.h b/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.h
index f0a20ee..4313b87 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.ipp b/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.ipp
index 6a64126..35e3d69 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.ipp
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.ipp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_NoBLE.h b/src/include/platform/internal/GenericConnectivityManagerImpl_NoBLE.h
index bef0797..f844c01 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_NoBLE.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_NoBLE.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h b/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h
index 8ab1587..bbce5bb 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_NoTunnel.h b/src/include/platform/internal/GenericConnectivityManagerImpl_NoTunnel.h
index ee6940f..e85d275 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_NoTunnel.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_NoTunnel.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h b/src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h
index d3abe5d..4fa0f07 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h b/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h
index b4a8813..e4666c8 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.ipp b/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.ipp
index 655a426..334f109 100644
--- a/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.ipp
+++ b/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.ipp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl.h b/src/include/platform/internal/GenericPlatformManagerImpl.h
index e7091c3..bcd175b 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl.h
+++ b/src/include/platform/internal/GenericPlatformManagerImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl.ipp b/src/include/platform/internal/GenericPlatformManagerImpl.ipp
index 6e58329..3d78d5a 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl.ipp
+++ b/src/include/platform/internal/GenericPlatformManagerImpl.ipp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.h b/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.h
index ffac5dd..5df9995 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.h
+++ b/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp b/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp
index 8304b8c..46f70eb 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp
+++ b/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.h b/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.h
index cb073b1..79b7191 100644
--- a/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.h
+++ b/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.ipp b/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.ipp
index b714867..4eba5ba 100644
--- a/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.ipp
+++ b/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.ipp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericSoftwareUpdateManagerImpl_BDX.h b/src/include/platform/internal/GenericSoftwareUpdateManagerImpl_BDX.h
index 46bbbf8..06eb246 100644
--- a/src/include/platform/internal/GenericSoftwareUpdateManagerImpl_BDX.h
+++ b/src/include/platform/internal/GenericSoftwareUpdateManagerImpl_BDX.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/GenericSoftwareUpdateManagerImpl_BDX.ipp b/src/include/platform/internal/GenericSoftwareUpdateManagerImpl_BDX.ipp
index 96fed61..a500f74 100644
--- a/src/include/platform/internal/GenericSoftwareUpdateManagerImpl_BDX.ipp
+++ b/src/include/platform/internal/GenericSoftwareUpdateManagerImpl_BDX.ipp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/internal/testing/ConfigUnitTest.h b/src/include/platform/internal/testing/ConfigUnitTest.h
index 7f041f8..c177ae0 100644
--- a/src/include/platform/internal/testing/ConfigUnitTest.h
+++ b/src/include/platform/internal/testing/ConfigUnitTest.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019-2020 Google LLC.
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/nRF5/BLEManagerImpl.h b/src/include/platform/nRF5/BLEManagerImpl.h
index 0eaf25e..acee420 100644
--- a/src/include/platform/nRF5/BLEManagerImpl.h
+++ b/src/include/platform/nRF5/BLEManagerImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/nRF5/BlePlatformConfig.h b/src/include/platform/nRF5/BlePlatformConfig.h
index 479f914..d3f3568 100644
--- a/src/include/platform/nRF5/BlePlatformConfig.h
+++ b/src/include/platform/nRF5/BlePlatformConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/nRF5/CHIPDevicePlatformConfig.h b/src/include/platform/nRF5/CHIPDevicePlatformConfig.h
index 46ff358..f143d2a 100644
--- a/src/include/platform/nRF5/CHIPDevicePlatformConfig.h
+++ b/src/include/platform/nRF5/CHIPDevicePlatformConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/nRF5/CHIPDevicePlatformEvent.h b/src/include/platform/nRF5/CHIPDevicePlatformEvent.h
index d686c13..b8d02ef 100644
--- a/src/include/platform/nRF5/CHIPDevicePlatformEvent.h
+++ b/src/include/platform/nRF5/CHIPDevicePlatformEvent.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/nRF5/CHIPPlatformConfig.h b/src/include/platform/nRF5/CHIPPlatformConfig.h
index 2ffb6da..2df8a36 100644
--- a/src/include/platform/nRF5/CHIPPlatformConfig.h
+++ b/src/include/platform/nRF5/CHIPPlatformConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/nRF5/ConfigurationManagerImpl.h b/src/include/platform/nRF5/ConfigurationManagerImpl.h
index bf7783b..3ea5b21 100644
--- a/src/include/platform/nRF5/ConfigurationManagerImpl.h
+++ b/src/include/platform/nRF5/ConfigurationManagerImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/nRF5/GroupKeyStoreImpl.h b/src/include/platform/nRF5/GroupKeyStoreImpl.h
index 9fe8c28..be1da64 100644
--- a/src/include/platform/nRF5/GroupKeyStoreImpl.h
+++ b/src/include/platform/nRF5/GroupKeyStoreImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/nRF5/InetPlatformConfig.h b/src/include/platform/nRF5/InetPlatformConfig.h
index 79bb96f..56e07c5 100644
--- a/src/include/platform/nRF5/InetPlatformConfig.h
+++ b/src/include/platform/nRF5/InetPlatformConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/nRF5/SystemPlatformConfig.h b/src/include/platform/nRF5/SystemPlatformConfig.h
index 0f71812..5592018 100644
--- a/src/include/platform/nRF5/SystemPlatformConfig.h
+++ b/src/include/platform/nRF5/SystemPlatformConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/nRF5/ThreadStackManagerImpl.h b/src/include/platform/nRF5/ThreadStackManagerImpl.h
index 693ee48..4594323 100644
--- a/src/include/platform/nRF5/ThreadStackManagerImpl.h
+++ b/src/include/platform/nRF5/ThreadStackManagerImpl.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/nRF5/nRF5Config.h b/src/include/platform/nRF5/nRF5Config.h
index d58e060..bd99337 100644
--- a/src/include/platform/nRF5/nRF5Config.h
+++ b/src/include/platform/nRF5/nRF5Config.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019-2020 Google LLC.
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/include/platform/nRF5/nRF5Utils.h b/src/include/platform/nRF5/nRF5Utils.h
index 47a90b7..24b28af 100644
--- a/src/include/platform/nRF5/nRF5Utils.h
+++ b/src/include/platform/nRF5/nRF5Utils.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/AsyncDNSResolverSockets.cpp b/src/inet/AsyncDNSResolverSockets.cpp
index a03cdda..bb8742a 100644
--- a/src/inet/AsyncDNSResolverSockets.cpp
+++ b/src/inet/AsyncDNSResolverSockets.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/AsyncDNSResolverSockets.h b/src/inet/AsyncDNSResolverSockets.h
index e84cc55..3bc5c22 100644
--- a/src/inet/AsyncDNSResolverSockets.h
+++ b/src/inet/AsyncDNSResolverSockets.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/DNSResolver.cpp b/src/inet/DNSResolver.cpp
index 69bbfc6..147708b 100644
--- a/src/inet/DNSResolver.cpp
+++ b/src/inet/DNSResolver.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/DNSResolver.h b/src/inet/DNSResolver.h
index a4ff15e..ef1c35d 100644
--- a/src/inet/DNSResolver.h
+++ b/src/inet/DNSResolver.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/EndPointBasis.cpp b/src/inet/EndPointBasis.cpp
index e9fb9ae..115914f 100644
--- a/src/inet/EndPointBasis.cpp
+++ b/src/inet/EndPointBasis.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2015-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/EndPointBasis.h b/src/inet/EndPointBasis.h
index f916439..52a0465 100644
--- a/src/inet/EndPointBasis.h
+++ b/src/inet/EndPointBasis.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2015-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/IANAConstants.h b/src/inet/IANAConstants.h
index bec5118..8d2501a 100644
--- a/src/inet/IANAConstants.h
+++ b/src/inet/IANAConstants.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2015-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/IPAddress-StringFuncts.cpp b/src/inet/IPAddress-StringFuncts.cpp
index 3351eae..fae23be 100644
--- a/src/inet/IPAddress-StringFuncts.cpp
+++ b/src/inet/IPAddress-StringFuncts.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/IPAddress.cpp b/src/inet/IPAddress.cpp
index a1056e8..1d96954 100644
--- a/src/inet/IPAddress.cpp
+++ b/src/inet/IPAddress.cpp
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
+ * Copyright (c) 2013-2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/IPAddress.h b/src/inet/IPAddress.h
index 4163a10..a0e674e 100644
--- a/src/inet/IPAddress.h
+++ b/src/inet/IPAddress.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
+ * Copyright (c) 2013-2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/IPEndPointBasis.cpp b/src/inet/IPEndPointBasis.cpp
index f48cda7..62835e6 100644
--- a/src/inet/IPEndPointBasis.cpp
+++ b/src/inet/IPEndPointBasis.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/IPEndPointBasis.h b/src/inet/IPEndPointBasis.h
index bcef75f..98da8e7 100644
--- a/src/inet/IPEndPointBasis.h
+++ b/src/inet/IPEndPointBasis.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/IPPrefix.cpp b/src/inet/IPPrefix.cpp
index 971141b..659ecb3 100644
--- a/src/inet/IPPrefix.cpp
+++ b/src/inet/IPPrefix.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/IPPrefix.h b/src/inet/IPPrefix.h
index 89344be..ebfc87c 100644
--- a/src/inet/IPPrefix.h
+++ b/src/inet/IPPrefix.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/Inet.h b/src/inet/Inet.h
index 1cf4919..f5dd8f3 100644
--- a/src/inet/Inet.h
+++ b/src/inet/Inet.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2015-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetBuffer.h b/src/inet/InetBuffer.h
index 65739c2..de2d59f 100644
--- a/src/inet/InetBuffer.h
+++ b/src/inet/InetBuffer.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetConfig.h b/src/inet/InetConfig.h
index 17353e3..8455756 100644
--- a/src/inet/InetConfig.h
+++ b/src/inet/InetConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetError.cpp b/src/inet/InetError.cpp
index 106337f..54a71d0 100644
--- a/src/inet/InetError.cpp
+++ b/src/inet/InetError.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetError.h b/src/inet/InetError.h
index 87efbfb..4da71f8 100644
--- a/src/inet/InetError.h
+++ b/src/inet/InetError.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetFaultInjection.cpp b/src/inet/InetFaultInjection.cpp
index 4aad131..93bfb98 100644
--- a/src/inet/InetFaultInjection.cpp
+++ b/src/inet/InetFaultInjection.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetFaultInjection.h b/src/inet/InetFaultInjection.h
index 22f56bc..09c46aa 100644
--- a/src/inet/InetFaultInjection.h
+++ b/src/inet/InetFaultInjection.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetInterface.cpp b/src/inet/InetInterface.cpp
index 69b9019..5d57c2f 100644
--- a/src/inet/InetInterface.cpp
+++ b/src/inet/InetInterface.cpp
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetInterface.h b/src/inet/InetInterface.h
index 34e217c..18ae25f 100644
--- a/src/inet/InetInterface.h
+++ b/src/inet/InetInterface.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetLayer.am b/src/inet/InetLayer.am
index 88fc217..fcaa822 100644
--- a/src/inet/InetLayer.am
+++ b/src/inet/InetLayer.am
@@ -1,5 +1,6 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2014-2017 Nest Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/inet/InetLayer.cpp b/src/inet/InetLayer.cpp
index 638ffcf..b07819f 100644
--- a/src/inet/InetLayer.cpp
+++ b/src/inet/InetLayer.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetLayer.h b/src/inet/InetLayer.h
index 21a6efe..173e09a 100644
--- a/src/inet/InetLayer.h
+++ b/src/inet/InetLayer.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetLayerBasis.cpp b/src/inet/InetLayerBasis.cpp
index f6dea4f..61cefcf 100644
--- a/src/inet/InetLayerBasis.cpp
+++ b/src/inet/InetLayerBasis.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetLayerBasis.h b/src/inet/InetLayerBasis.h
index 71660a2..37eb947 100644
--- a/src/inet/InetLayerBasis.h
+++ b/src/inet/InetLayerBasis.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetLayerEvents.h b/src/inet/InetLayerEvents.h
index d1119a3..98b10b3 100644
--- a/src/inet/InetLayerEvents.h
+++ b/src/inet/InetLayerEvents.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetTimer.cpp b/src/inet/InetTimer.cpp
index 3c38ea2..78784df 100644
--- a/src/inet/InetTimer.cpp
+++ b/src/inet/InetTimer.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetTimer.h b/src/inet/InetTimer.h
index 2a724bf..8dd63b4 100644
--- a/src/inet/InetTimer.h
+++ b/src/inet/InetTimer.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/InetUtils.cpp b/src/inet/InetUtils.cpp
index c2ad68b..aecb284 100644
--- a/src/inet/InetUtils.cpp
+++ b/src/inet/InetUtils.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/Makefile.am b/src/inet/Makefile.am
index 31055ce..e9c7ea2 100644
--- a/src/inet/Makefile.am
+++ b/src/inet/Makefile.am
@@ -1,5 +1,6 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2014-2017 Nest Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/inet/RawEndPoint.cpp b/src/inet/RawEndPoint.cpp
index 90c50ee..79cd214 100644
--- a/src/inet/RawEndPoint.cpp
+++ b/src/inet/RawEndPoint.cpp
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Google LLC.
+ * Copyright (c) 2013-2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/RawEndPoint.h b/src/inet/RawEndPoint.h
index d51fcd8..a1457e2 100644
--- a/src/inet/RawEndPoint.h
+++ b/src/inet/RawEndPoint.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Google LLC
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/TCPEndPoint.cpp b/src/inet/TCPEndPoint.cpp
index 536f1b4..90bddec 100644
--- a/src/inet/TCPEndPoint.cpp
+++ b/src/inet/TCPEndPoint.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/TCPEndPoint.h b/src/inet/TCPEndPoint.h
index 8979c8f..91cf958 100644
--- a/src/inet/TCPEndPoint.h
+++ b/src/inet/TCPEndPoint.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/TunEndPoint.cpp b/src/inet/TunEndPoint.cpp
index bf40764..e3799b9 100644
--- a/src/inet/TunEndPoint.cpp
+++ b/src/inet/TunEndPoint.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/TunEndPoint.h b/src/inet/TunEndPoint.h
index 63fce69..70646c8 100644
--- a/src/inet/TunEndPoint.h
+++ b/src/inet/TunEndPoint.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/UDPEndPoint.cpp b/src/inet/UDPEndPoint.cpp
index bb9339a..6918cd0 100644
--- a/src/inet/UDPEndPoint.cpp
+++ b/src/inet/UDPEndPoint.cpp
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Google LLC.
+ * Copyright (c) 2013-2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/UDPEndPoint.h b/src/inet/UDPEndPoint.h
index 6090c86..301c5b7 100644
--- a/src/inet/UDPEndPoint.h
+++ b/src/inet/UDPEndPoint.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Google LLC
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/inet/arpa-inet-compatibility.h b/src/inet/arpa-inet-compatibility.h
index 0dbc452..9dd2689 100644
--- a/src/inet/arpa-inet-compatibility.h
+++ b/src/inet/arpa-inet-compatibility.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index e3d417d..3323902 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,5 +1,7 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2014-2018 Nest Labs, Inc.
+# Copyright (c) 2019-2020 Google, LLC.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPConfig.h b/src/lib/core/CHIPConfig.h
index 3df4ead..74d712f 100644
--- a/src/lib/core/CHIPConfig.h
+++ b/src/lib/core/CHIPConfig.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
+ * Copyright (c) 2013-2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPCore.h b/src/lib/core/CHIPCore.h
index 8976714..1afd41b 100644
--- a/src/lib/core/CHIPCore.h
+++ b/src/lib/core/CHIPCore.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPEncoding.h b/src/lib/core/CHIPEncoding.h
index ff01ea6..dcf3cfc 100644
--- a/src/lib/core/CHIPEncoding.h
+++ b/src/lib/core/CHIPEncoding.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPError.cpp b/src/lib/core/CHIPError.cpp
index c39afe7..72e13c4 100644
--- a/src/lib/core/CHIPError.cpp
+++ b/src/lib/core/CHIPError.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPError.h b/src/lib/core/CHIPError.h
index cc16f7f..d177588 100644
--- a/src/lib/core/CHIPError.h
+++ b/src/lib/core/CHIPError.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPEventLoggingConfig.h b/src/lib/core/CHIPEventLoggingConfig.h
index 605a1df..94032ab 100644
--- a/src/lib/core/CHIPEventLoggingConfig.h
+++ b/src/lib/core/CHIPEventLoggingConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPKeyIds.cpp b/src/lib/core/CHIPKeyIds.cpp
index a080b05..2a99d48 100644
--- a/src/lib/core/CHIPKeyIds.cpp
+++ b/src/lib/core/CHIPKeyIds.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPKeyIds.h b/src/lib/core/CHIPKeyIds.h
index 59541dd..4f6e8bf 100644
--- a/src/lib/core/CHIPKeyIds.h
+++ b/src/lib/core/CHIPKeyIds.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPTLV.h b/src/lib/core/CHIPTLV.h
index ca9a4a5..ba4f01b 100644
--- a/src/lib/core/CHIPTLV.h
+++ b/src/lib/core/CHIPTLV.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPTLVData.hpp b/src/lib/core/CHIPTLVData.hpp
index 0105f82..f1a46ac 100644
--- a/src/lib/core/CHIPTLVData.hpp
+++ b/src/lib/core/CHIPTLVData.hpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2015-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPTLVDebug.cpp b/src/lib/core/CHIPTLVDebug.cpp
index 7f16236..4d43e9a 100644
--- a/src/lib/core/CHIPTLVDebug.cpp
+++ b/src/lib/core/CHIPTLVDebug.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2015-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPTLVDebug.hpp b/src/lib/core/CHIPTLVDebug.hpp
index 42f12c1..f419c2e 100644
--- a/src/lib/core/CHIPTLVDebug.hpp
+++ b/src/lib/core/CHIPTLVDebug.hpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2015-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPTLVReader.cpp b/src/lib/core/CHIPTLVReader.cpp
index 6a911fd..ee1b911 100644
--- a/src/lib/core/CHIPTLVReader.cpp
+++ b/src/lib/core/CHIPTLVReader.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPTLVTags.h b/src/lib/core/CHIPTLVTags.h
index 0c4ac80..64b5751 100644
--- a/src/lib/core/CHIPTLVTags.h
+++ b/src/lib/core/CHIPTLVTags.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPTLVTypes.h b/src/lib/core/CHIPTLVTypes.h
index da80fd4..6ac7ee8 100644
--- a/src/lib/core/CHIPTLVTypes.h
+++ b/src/lib/core/CHIPTLVTypes.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPTLVUpdater.cpp b/src/lib/core/CHIPTLVUpdater.cpp
index d4d1bd4..b39be46 100644
--- a/src/lib/core/CHIPTLVUpdater.cpp
+++ b/src/lib/core/CHIPTLVUpdater.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2015-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPTLVUtilities.cpp b/src/lib/core/CHIPTLVUtilities.cpp
index 5be2c8a..98611da 100644
--- a/src/lib/core/CHIPTLVUtilities.cpp
+++ b/src/lib/core/CHIPTLVUtilities.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2015-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPTLVUtilities.hpp b/src/lib/core/CHIPTLVUtilities.hpp
index 05d05d1..79b2bc6 100644
--- a/src/lib/core/CHIPTLVUtilities.hpp
+++ b/src/lib/core/CHIPTLVUtilities.hpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2015-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPTLVWriter.cpp b/src/lib/core/CHIPTLVWriter.cpp
index c2632e0..f389735 100644
--- a/src/lib/core/CHIPTLVWriter.cpp
+++ b/src/lib/core/CHIPTLVWriter.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPTimeConfig.h b/src/lib/core/CHIPTimeConfig.h
index 8209083..dd87bad 100644
--- a/src/lib/core/CHIPTimeConfig.h
+++ b/src/lib/core/CHIPTimeConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPTunnelConfig.h b/src/lib/core/CHIPTunnelConfig.h
index b7541b1..6de9d99 100644
--- a/src/lib/core/CHIPTunnelConfig.h
+++ b/src/lib/core/CHIPTunnelConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/core/CHIPVendorIdentifiers.hpp b/src/lib/core/CHIPVendorIdentifiers.hpp
index ef9b284..5a174c9 100644
--- a/src/lib/core/CHIPVendorIdentifiers.hpp
+++ b/src/lib/core/CHIPVendorIdentifiers.hpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/support/Base64.cpp b/src/lib/support/Base64.cpp
index bcd1232..a649096 100644
--- a/src/lib/support/Base64.cpp
+++ b/src/lib/support/Base64.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/support/Base64.h b/src/lib/support/Base64.h
index 81928e7..ac7484e 100644
--- a/src/lib/support/Base64.h
+++ b/src/lib/support/Base64.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/support/CHIPFaultInjection.cpp b/src/lib/support/CHIPFaultInjection.cpp
index 6353cd4..02d0df6 100644
--- a/src/lib/support/CHIPFaultInjection.cpp
+++ b/src/lib/support/CHIPFaultInjection.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/support/CHIPFaultInjection.h b/src/lib/support/CHIPFaultInjection.h
index 4d51e85..cb2ac15 100644
--- a/src/lib/support/CHIPFaultInjection.h
+++ b/src/lib/support/CHIPFaultInjection.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/support/CodeUtils.h b/src/lib/support/CodeUtils.h
index 1b05355..8f13ed3 100644
--- a/src/lib/support/CodeUtils.h
+++ b/src/lib/support/CodeUtils.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/support/ErrorStr.h b/src/lib/support/ErrorStr.h
index e2ef630..ab7682f 100644
--- a/src/lib/support/ErrorStr.h
+++ b/src/lib/support/ErrorStr.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/support/FibonacciUtils.cpp b/src/lib/support/FibonacciUtils.cpp
index cbdf909..5d83787 100644
--- a/src/lib/support/FibonacciUtils.cpp
+++ b/src/lib/support/FibonacciUtils.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/support/FibonacciUtils.h b/src/lib/support/FibonacciUtils.h
index 7e02adc..8fc1036 100644
--- a/src/lib/support/FibonacciUtils.h
+++ b/src/lib/support/FibonacciUtils.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/support/FlagUtils.hpp b/src/lib/support/FlagUtils.hpp
index 3061b31..51cd38b 100644
--- a/src/lib/support/FlagUtils.hpp
+++ b/src/lib/support/FlagUtils.hpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/support/RandUtils.cpp b/src/lib/support/RandUtils.cpp
index 82d52e4..24615b9 100644
--- a/src/lib/support/RandUtils.cpp
+++ b/src/lib/support/RandUtils.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/support/RandUtils.h b/src/lib/support/RandUtils.h
index 63c8e12..1a6f81d 100644
--- a/src/lib/support/RandUtils.h
+++ b/src/lib/support/RandUtils.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/support/logging/CHIPLogging.cpp b/src/lib/support/logging/CHIPLogging.cpp
index 74be001..8b31250 100644
--- a/src/lib/support/logging/CHIPLogging.cpp
+++ b/src/lib/support/logging/CHIPLogging.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lib/support/logging/CHIPLogging.h b/src/lib/support/logging/CHIPLogging.h
index e450925..9721be9 100644
--- a/src/lib/support/logging/CHIPLogging.h
+++ b/src/lib/support/logging/CHIPLogging.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lwip/Makefile.am b/src/lwip/Makefile.am
index 73b9855..79566e2 100644
--- a/src/lwip/Makefile.am
+++ b/src/lwip/Makefile.am
@@ -1,5 +1,6 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2014-2017 Nest Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/lwip/efr32/arch/cc.h b/src/lwip/efr32/arch/cc.h
index 5a0cfa2..38f88a6 100644
--- a/src/lwip/efr32/arch/cc.h
+++ b/src/lwip/efr32/arch/cc.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
*/
diff --git a/src/lwip/efr32/arch/perf.h b/src/lwip/efr32/arch/perf.h
index 4e9e83c..2df448f 100644
--- a/src/lwip/efr32/arch/perf.h
+++ b/src/lwip/efr32/arch/perf.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
*/
diff --git a/src/lwip/efr32/lwipopts.h b/src/lwip/efr32/lwipopts.h
index e6f7b9b..1aaa45c 100644
--- a/src/lwip/efr32/lwipopts.h
+++ b/src/lwip/efr32/lwipopts.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lwip/freertos/arch/sys_arch.h b/src/lwip/freertos/arch/sys_arch.h
index 39b1738..ba59613 100644
--- a/src/lwip/freertos/arch/sys_arch.h
+++ b/src/lwip/freertos/arch/sys_arch.h
@@ -1,5 +1,6 @@
/*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018-2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lwip/freertos/sys_arch.c b/src/lwip/freertos/sys_arch.c
index f437930..224e893 100644
--- a/src/lwip/freertos/sys_arch.c
+++ b/src/lwip/freertos/sys_arch.c
@@ -1,5 +1,6 @@
/*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018-2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lwip/nrf5/arch/cc.h b/src/lwip/nrf5/arch/cc.h
index bbb14e0..dec2d7d 100644
--- a/src/lwip/nrf5/arch/cc.h
+++ b/src/lwip/nrf5/arch/cc.h
@@ -1,5 +1,6 @@
/*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018-2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lwip/nrf5/arch/perf.h b/src/lwip/nrf5/arch/perf.h
index 880735b..5c15942 100644
--- a/src/lwip/nrf5/arch/perf.h
+++ b/src/lwip/nrf5/arch/perf.h
@@ -1,5 +1,6 @@
/*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018-2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lwip/nrf5/lwipopts.h b/src/lwip/nrf5/lwipopts.h
index eb7fe0e..e6314ef 100644
--- a/src/lwip/nrf5/lwipopts.h
+++ b/src/lwip/nrf5/lwipopts.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lwip/standalone/TapInterface.c b/src/lwip/standalone/TapInterface.c
index ca89a1a..6074933 100644
--- a/src/lwip/standalone/TapInterface.c
+++ b/src/lwip/standalone/TapInterface.c
@@ -1,6 +1,9 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Google LLC.
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
+ * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lwip/standalone/TapInterface.h b/src/lwip/standalone/TapInterface.h
index 0fc334b..821f9e0 100644
--- a/src/lwip/standalone/TapInterface.h
+++ b/src/lwip/standalone/TapInterface.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
+ * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lwip/standalone/arch/cc.h b/src/lwip/standalone/arch/cc.h
index 9a91c28..a8b83a8 100644
--- a/src/lwip/standalone/arch/cc.h
+++ b/src/lwip/standalone/arch/cc.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
+ * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lwip/standalone/arch/perf.h b/src/lwip/standalone/arch/perf.h
index 2c5bb56..3523819 100644
--- a/src/lwip/standalone/arch/perf.h
+++ b/src/lwip/standalone/arch/perf.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
+ * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lwip/standalone/arch/sys_arch.h b/src/lwip/standalone/arch/sys_arch.h
index 8473e36..ade18d2 100644
--- a/src/lwip/standalone/arch/sys_arch.h
+++ b/src/lwip/standalone/arch/sys_arch.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
+ * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lwip/standalone/lwipopts.h b/src/lwip/standalone/lwipopts.h
index 7d65cc5..914d17e 100644
--- a/src/lwip/standalone/lwipopts.h
+++ b/src/lwip/standalone/lwipopts.h
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
+ * Copyright (c) 2014-2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/lwip/standalone/sys_arch.c b/src/lwip/standalone/sys_arch.c
index 4d7e910..d91a7bd 100644
--- a/src/lwip/standalone/sys_arch.c
+++ b/src/lwip/standalone/sys_arch.c
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2014-2017 Nest Labs, Inc.
+ * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/EFR32/BLEManagerImpl.cpp b/src/platform/EFR32/BLEManagerImpl.cpp
index 8818d9e..5d65ad8 100644
--- a/src/platform/EFR32/BLEManagerImpl.cpp
+++ b/src/platform/EFR32/BLEManagerImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/EFR32/ConfigurationManagerImpl.cpp b/src/platform/EFR32/ConfigurationManagerImpl.cpp
index f033e80..824a894 100644
--- a/src/platform/EFR32/ConfigurationManagerImpl.cpp
+++ b/src/platform/EFR32/ConfigurationManagerImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/EFR32/ConnectivityManagerImpl.cpp b/src/platform/EFR32/ConnectivityManagerImpl.cpp
index 5f882d4..50854fb 100644
--- a/src/platform/EFR32/ConnectivityManagerImpl.cpp
+++ b/src/platform/EFR32/ConnectivityManagerImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/EFR32/EFR32Config.cpp b/src/platform/EFR32/EFR32Config.cpp
index 465eb40..2a64500 100644
--- a/src/platform/EFR32/EFR32Config.cpp
+++ b/src/platform/EFR32/EFR32Config.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/EFR32/Entropy.cpp b/src/platform/EFR32/Entropy.cpp
index 85910b4..1e277ba 100644
--- a/src/platform/EFR32/Entropy.cpp
+++ b/src/platform/EFR32/Entropy.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/EFR32/GroupKeyStoreImpl.cpp b/src/platform/EFR32/GroupKeyStoreImpl.cpp
index 49cfde7..0d1101c 100644
--- a/src/platform/EFR32/GroupKeyStoreImpl.cpp
+++ b/src/platform/EFR32/GroupKeyStoreImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/EFR32/Logging.cpp b/src/platform/EFR32/Logging.cpp
index 96087e5..947f89e 100644
--- a/src/platform/EFR32/Logging.cpp
+++ b/src/platform/EFR32/Logging.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/EFR32/NetworkProvisioningServerImpl.cpp b/src/platform/EFR32/NetworkProvisioningServerImpl.cpp
index 0d8f99d..876289e 100644
--- a/src/platform/EFR32/NetworkProvisioningServerImpl.cpp
+++ b/src/platform/EFR32/NetworkProvisioningServerImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/EFR32/PlatformManagerImpl.cpp b/src/platform/EFR32/PlatformManagerImpl.cpp
index c5528cd..97b7667 100644
--- a/src/platform/EFR32/PlatformManagerImpl.cpp
+++ b/src/platform/EFR32/PlatformManagerImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/EFR32/SoftwareUpdateManagerImpl.cpp b/src/platform/EFR32/SoftwareUpdateManagerImpl.cpp
index 9cb2daf..ac36446 100644
--- a/src/platform/EFR32/SoftwareUpdateManagerImpl.cpp
+++ b/src/platform/EFR32/SoftwareUpdateManagerImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/EFR32/ThreadStackManagerImpl.cpp b/src/platform/EFR32/ThreadStackManagerImpl.cpp
index abbfc0a..ff36584 100644
--- a/src/platform/EFR32/ThreadStackManagerImpl.cpp
+++ b/src/platform/EFR32/ThreadStackManagerImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/EFR32/freertos_bluetooth.c b/src/platform/EFR32/freertos_bluetooth.c
index 0301b9b..5a46975 100644
--- a/src/platform/EFR32/freertos_bluetooth.c
+++ b/src/platform/EFR32/freertos_bluetooth.c
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2020 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/EFR32/gatt_db.c b/src/platform/EFR32/gatt_db.c
index 89e56c7..802e56e 100644
--- a/src/platform/EFR32/gatt_db.c
+++ b/src/platform/EFR32/gatt_db.c
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2020 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/PersistedStorage.cpp b/src/platform/PersistedStorage.cpp
index 6ed064e..51f0aae 100644
--- a/src/platform/PersistedStorage.cpp
+++ b/src/platform/PersistedStorage.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/nRF5/BLEManagerImpl.cpp b/src/platform/nRF5/BLEManagerImpl.cpp
index 16fa7b7..87ccaf7 100644
--- a/src/platform/nRF5/BLEManagerImpl.cpp
+++ b/src/platform/nRF5/BLEManagerImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/nRF5/ConfigurationManagerImpl.cpp b/src/platform/nRF5/ConfigurationManagerImpl.cpp
index 5b52284..0e6d728 100644
--- a/src/platform/nRF5/ConfigurationManagerImpl.cpp
+++ b/src/platform/nRF5/ConfigurationManagerImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/nRF5/ConnectivityManagerImpl.cpp b/src/platform/nRF5/ConnectivityManagerImpl.cpp
index 3100e33..06a4e46 100644
--- a/src/platform/nRF5/ConnectivityManagerImpl.cpp
+++ b/src/platform/nRF5/ConnectivityManagerImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/nRF5/Entropy.cpp b/src/platform/nRF5/Entropy.cpp
index e4c0cb3..d877cc0 100644
--- a/src/platform/nRF5/Entropy.cpp
+++ b/src/platform/nRF5/Entropy.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/nRF5/GroupKeyStoreImpl.cpp b/src/platform/nRF5/GroupKeyStoreImpl.cpp
index 128f043..9275eb1 100644
--- a/src/platform/nRF5/GroupKeyStoreImpl.cpp
+++ b/src/platform/nRF5/GroupKeyStoreImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/nRF5/Logging.cpp b/src/platform/nRF5/Logging.cpp
index e8fc660..456c428 100644
--- a/src/platform/nRF5/Logging.cpp
+++ b/src/platform/nRF5/Logging.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/nRF5/PlatformManagerImpl.cpp b/src/platform/nRF5/PlatformManagerImpl.cpp
index 6b1bbd8..468aace 100644
--- a/src/platform/nRF5/PlatformManagerImpl.cpp
+++ b/src/platform/nRF5/PlatformManagerImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/nRF5/SoftwareUpdateManagerImpl.cpp b/src/platform/nRF5/SoftwareUpdateManagerImpl.cpp
index 32c8e73..a3e15f3 100644
--- a/src/platform/nRF5/SoftwareUpdateManagerImpl.cpp
+++ b/src/platform/nRF5/SoftwareUpdateManagerImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/nRF5/ThreadStackManagerImpl.cpp b/src/platform/nRF5/ThreadStackManagerImpl.cpp
index 3b1e420..98910f0 100644
--- a/src/platform/nRF5/ThreadStackManagerImpl.cpp
+++ b/src/platform/nRF5/ThreadStackManagerImpl.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/nRF5/nRF5Config.cpp b/src/platform/nRF5/nRF5Config.cpp
index 1cc7bc9..3100496 100644
--- a/src/platform/nRF5/nRF5Config.cpp
+++ b/src/platform/nRF5/nRF5Config.cpp
@@ -1,6 +1,8 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019-2020 Google LLC.
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/platform/nRF5/nRF5Utils.cpp b/src/platform/nRF5/nRF5Utils.cpp
index e69ebda..2b5b148 100644
--- a/src/platform/nRF5/nRF5Utils.cpp
+++ b/src/platform/nRF5/nRF5Utils.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2019 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/Makefile.am b/src/system/Makefile.am
index ea49e81..20722af 100644
--- a/src/system/Makefile.am
+++ b/src/system/Makefile.am
@@ -1,5 +1,6 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2016-2017 Nest Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/system/SystemAlignSize.h b/src/system/SystemAlignSize.h
index a1d8109..557cb13 100644
--- a/src/system/SystemAlignSize.h
+++ b/src/system/SystemAlignSize.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemClock.cpp b/src/system/SystemClock.cpp
index 4cab9ee..e9f19ab 100644
--- a/src/system/SystemClock.cpp
+++ b/src/system/SystemClock.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemClock.h b/src/system/SystemClock.h
index 0f4efad..3478fc5 100644
--- a/src/system/SystemClock.h
+++ b/src/system/SystemClock.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemConfig.h b/src/system/SystemConfig.h
index bac08c6..ac283cf 100644
--- a/src/system/SystemConfig.h
+++ b/src/system/SystemConfig.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2018 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemError.cpp b/src/system/SystemError.cpp
index d9ae3e5..9fbc4fd 100644
--- a/src/system/SystemError.cpp
+++ b/src/system/SystemError.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemError.h b/src/system/SystemError.h
index 72e1872..53ff65c 100644
--- a/src/system/SystemError.h
+++ b/src/system/SystemError.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemEvent.h b/src/system/SystemEvent.h
index d9df388..910ef44 100644
--- a/src/system/SystemEvent.h
+++ b/src/system/SystemEvent.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemFaultInjection.cpp b/src/system/SystemFaultInjection.cpp
index 87a343c..0f637ee 100644
--- a/src/system/SystemFaultInjection.cpp
+++ b/src/system/SystemFaultInjection.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemFaultInjection.h b/src/system/SystemFaultInjection.h
index 9cd4c03..eaf9beb 100644
--- a/src/system/SystemFaultInjection.h
+++ b/src/system/SystemFaultInjection.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemLayer.am b/src/system/SystemLayer.am
index f0084dc..e09867a 100644
--- a/src/system/SystemLayer.am
+++ b/src/system/SystemLayer.am
@@ -1,5 +1,6 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2016-2017 Nest Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -49,4 +50,4 @@
SystemObject.h \
SystemTimer.h \
SystemPacketBuffer.h \
- $(NULL)
\ No newline at end of file
+ $(NULL)
diff --git a/src/system/SystemLayer.cpp b/src/system/SystemLayer.cpp
index 17d393e..b6815a5 100644
--- a/src/system/SystemLayer.cpp
+++ b/src/system/SystemLayer.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemLayer.h b/src/system/SystemLayer.h
index 545af3e..2e0c2e3 100644
--- a/src/system/SystemLayer.h
+++ b/src/system/SystemLayer.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemLayerPrivate.h b/src/system/SystemLayerPrivate.h
index 09c1c7b..e7fc4e3 100644
--- a/src/system/SystemLayerPrivate.h
+++ b/src/system/SystemLayerPrivate.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemMutex.cpp b/src/system/SystemMutex.cpp
index 9a80efc..9c44886 100644
--- a/src/system/SystemMutex.cpp
+++ b/src/system/SystemMutex.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemMutex.h b/src/system/SystemMutex.h
index ab5fc94..e4e848f 100644
--- a/src/system/SystemMutex.h
+++ b/src/system/SystemMutex.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemObject.cpp b/src/system/SystemObject.cpp
index 1c78e85..d1e1b23 100644
--- a/src/system/SystemObject.cpp
+++ b/src/system/SystemObject.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemObject.h b/src/system/SystemObject.h
index 288c70f..5abf696 100644
--- a/src/system/SystemObject.h
+++ b/src/system/SystemObject.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemPacketBuffer.cpp b/src/system/SystemPacketBuffer.cpp
index 4987885..cf0392f 100644
--- a/src/system/SystemPacketBuffer.cpp
+++ b/src/system/SystemPacketBuffer.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemPacketBuffer.h b/src/system/SystemPacketBuffer.h
index 9d86798..d6404e4 100644
--- a/src/system/SystemPacketBuffer.h
+++ b/src/system/SystemPacketBuffer.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemStats.cpp b/src/system/SystemStats.cpp
index 07c9139..dc02c5a 100644
--- a/src/system/SystemStats.cpp
+++ b/src/system/SystemStats.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemStats.h b/src/system/SystemStats.h
index 0896e6b..89aafc4 100644
--- a/src/system/SystemStats.h
+++ b/src/system/SystemStats.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemTimer.cpp b/src/system/SystemTimer.cpp
index 63d4056..a4ae270 100644
--- a/src/system/SystemTimer.cpp
+++ b/src/system/SystemTimer.cpp
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/system/SystemTimer.h b/src/system/SystemTimer.h
index 02b2d38..df36e58 100644
--- a/src/system/SystemTimer.h
+++ b/src/system/SystemTimer.h
@@ -1,6 +1,7 @@
/*
*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2016-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/third_party/Makefile.am b/third_party/Makefile.am
index 60cac4e..2ca43bc 100644
--- a/third_party/Makefile.am
+++ b/third_party/Makefile.am
@@ -1,5 +1,7 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2015-2018 Nest Labs, Inc.
+# Copyright (c) 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/third_party/lwip/Makefile.am b/third_party/lwip/Makefile.am
index 0d69225..a0b7b34 100644
--- a/third_party/lwip/Makefile.am
+++ b/third_party/lwip/Makefile.am
@@ -1,5 +1,6 @@
#
-# <COPYRIGHT>
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2014-2017 Nest Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/third_party/lwip/repo/lwip/src/core/ipv6/ip6_route_table.c b/third_party/lwip/repo/lwip/src/core/ipv6/ip6_route_table.c
index fc6e1b9..2c6b17f 100644
--- a/third_party/lwip/repo/lwip/src/core/ipv6/ip6_route_table.c
+++ b/third_party/lwip/repo/lwip/src/core/ipv6/ip6_route_table.c
@@ -5,7 +5,8 @@
*/
/*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2015 Nest Labs, Inc.
*/
#include "lwip/opt.h"
diff --git a/third_party/lwip/repo/lwip/src/include/lwip/ip6_route_table.h b/third_party/lwip/repo/lwip/src/include/lwip/ip6_route_table.h
index 7c1ea39..2eec91b 100644
--- a/third_party/lwip/repo/lwip/src/include/lwip/ip6_route_table.h
+++ b/third_party/lwip/repo/lwip/src/include/lwip/ip6_route_table.h
@@ -5,7 +5,8 @@
*/
/*
- * <COPYRIGHT>
+ * Copyright (c) 2020 Project CHIP Authors
+ * Copyright (c) 2015 Nest Labs, Inc.
*/
#ifndef __LWIP_IP6_ROUTE_TABLE_H__
