diff --git a/TESTS/host_tests/reset_reason.py b/TESTS/host_tests/reset_reason.py
index c8769e22a2..23dca36ede 100644
--- a/TESTS/host_tests/reset_reason.py
+++ b/TESTS/host_tests/reset_reason.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) 2018 ARM Limited
+Copyright (c) 2018-2019 Arm Limited and affiliates.
 SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/TESTS/host_tests/sync_on_reset.py b/TESTS/host_tests/sync_on_reset.py
index de3cbc0ae3..1d509cad4e 100644
--- a/TESTS/host_tests/sync_on_reset.py
+++ b/TESTS/host_tests/sync_on_reset.py
@@ -1,6 +1,7 @@
 """
-mbed SDK
-Copyright (c) 2017 ARM Limited
+Copyright (c) 2018-2019 Arm Limited and affiliates.
+
+SPDX-License-Identifier: Apache-2.0
 
 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/TESTS/host_tests/watchdog_reset.py b/TESTS/host_tests/watchdog_reset.py
index 4f12d420f8..3f791882b9 100644
--- a/TESTS/host_tests/watchdog_reset.py
+++ b/TESTS/host_tests/watchdog_reset.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) 2018 ARM Limited
+Copyright (c) 2018-2019 Arm Limited and affiliates.
 SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/TESTS/mbed_drivers/reset_reason/ResetReason_tests.h b/TESTS/mbed_drivers/reset_reason/ResetReason_tests.h
index 7311c24f7e..ee675f1bdb 100644
--- a/TESTS/mbed_drivers/reset_reason/ResetReason_tests.h
+++ b/TESTS/mbed_drivers/reset_reason/ResetReason_tests.h
@@ -1,5 +1,5 @@
-/* Mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/TESTS/mbed_drivers/reset_reason/main.cpp b/TESTS/mbed_drivers/reset_reason/main.cpp
index 6299d86937..626fccc648 100644
--- a/TESTS/mbed_drivers/reset_reason/main.cpp
+++ b/TESTS/mbed_drivers/reset_reason/main.cpp
@@ -1,5 +1,5 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/TESTS/mbed_hal/reset_reason/main.cpp b/TESTS/mbed_hal/reset_reason/main.cpp
index 63136d3c0b..e604a4c6ad 100644
--- a/TESTS/mbed_hal/reset_reason/main.cpp
+++ b/TESTS/mbed_hal/reset_reason/main.cpp
@@ -1,5 +1,5 @@
-/* Mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/TESTS/mbed_hal/reset_reason/reset_reason_api_tests.h b/TESTS/mbed_hal/reset_reason/reset_reason_api_tests.h
index 5bf3fecdd9..80df8e06f0 100644
--- a/TESTS/mbed_hal/reset_reason/reset_reason_api_tests.h
+++ b/TESTS/mbed_hal/reset_reason/reset_reason_api_tests.h
@@ -1,5 +1,5 @@
-/* Mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/TESTS/mbed_hal/watchdog/main.cpp b/TESTS/mbed_hal/watchdog/main.cpp
index a21d2ea91f..7fec310cfe 100644
--- a/TESTS/mbed_hal/watchdog/main.cpp
+++ b/TESTS/mbed_hal/watchdog/main.cpp
@@ -1,5 +1,5 @@
-/* Mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/TESTS/mbed_hal/watchdog/watchdog_api_tests.h b/TESTS/mbed_hal/watchdog/watchdog_api_tests.h
index a01401a5ce..15e8d5ef02 100644
--- a/TESTS/mbed_hal/watchdog/watchdog_api_tests.h
+++ b/TESTS/mbed_hal/watchdog/watchdog_api_tests.h
@@ -1,5 +1,5 @@
-/* Mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/TESTS/mbed_hal/watchdog_reset/main.cpp b/TESTS/mbed_hal/watchdog_reset/main.cpp
index 34e2d81e02..dddd312186 100644
--- a/TESTS/mbed_hal/watchdog_reset/main.cpp
+++ b/TESTS/mbed_hal/watchdog_reset/main.cpp
@@ -1,5 +1,5 @@
-/* Mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/TESTS/mbed_hal/watchdog_reset/watchdog_reset_tests.h b/TESTS/mbed_hal/watchdog_reset/watchdog_reset_tests.h
index 548340aeff..18339130a3 100644
--- a/TESTS/mbed_hal/watchdog_reset/watchdog_reset_tests.h
+++ b/TESTS/mbed_hal/watchdog_reset/watchdog_reset_tests.h
@@ -1,5 +1,5 @@
-/* Mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/TESTS/mbed_hal/watchdog_timing/main.cpp b/TESTS/mbed_hal/watchdog_timing/main.cpp
index c3d151c170..a5d7578341 100644
--- a/TESTS/mbed_hal/watchdog_timing/main.cpp
+++ b/TESTS/mbed_hal/watchdog_timing/main.cpp
@@ -1,5 +1,5 @@
-/* Mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/TESTS/mbed_hal/watchdog_timing/watchdog_timing_tests.h b/TESTS/mbed_hal/watchdog_timing/watchdog_timing_tests.h
index 89672dd8f8..0e768207ee 100644
--- a/TESTS/mbed_hal/watchdog_timing/watchdog_timing_tests.h
+++ b/TESTS/mbed_hal/watchdog_timing/watchdog_timing_tests.h
@@ -1,5 +1,5 @@
-/* Mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/TESTS/mbed_platform/watchdog_mgr_reset/main.cpp b/TESTS/mbed_platform/watchdog_mgr_reset/main.cpp
index 3b6fe952e2..674abaaf4e 100644
--- a/TESTS/mbed_platform/watchdog_mgr_reset/main.cpp
+++ b/TESTS/mbed_platform/watchdog_mgr_reset/main.cpp
@@ -1,5 +1,5 @@
-/* Mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/TESTS/mbed_platform/watchdog_mgr_reset/watchdog_mgr_reset_tests.h b/TESTS/mbed_platform/watchdog_mgr_reset/watchdog_mgr_reset_tests.h
index c1b55d6b2d..364ee54a94 100644
--- a/TESTS/mbed_platform/watchdog_mgr_reset/watchdog_mgr_reset_tests.h
+++ b/TESTS/mbed_platform/watchdog_mgr_reset/watchdog_mgr_reset_tests.h
@@ -1,5 +1,5 @@
-/* Mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/UNITTESTS/platform/mbed_watchdog_mgr/Watchdog.cpp b/UNITTESTS/platform/mbed_watchdog_mgr/Watchdog.cpp
index 33ba1e9146..88eafac08f 100644
--- a/UNITTESTS/platform/mbed_watchdog_mgr/Watchdog.cpp
+++ b/UNITTESTS/platform/mbed_watchdog_mgr/Watchdog.cpp
@@ -1,5 +1,5 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/UNITTESTS/stubs/watchdog_api_stub.c b/UNITTESTS/stubs/watchdog_api_stub.c
index d04a84394a..c811b48b57 100644
--- a/UNITTESTS/stubs/watchdog_api_stub.c
+++ b/UNITTESTS/stubs/watchdog_api_stub.c
@@ -1,5 +1,5 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  *
  * 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/UNITTESTS/target_h/drivers/LowPowerTicker.h b/UNITTESTS/target_h/drivers/LowPowerTicker.h
index 8762133892..793ee0eab7 100644
--- a/UNITTESTS/target_h/drivers/LowPowerTicker.h
+++ b/UNITTESTS/target_h/drivers/LowPowerTicker.h
@@ -1,5 +1,5 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2015 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/UNITTESTS/target_h/drivers/Ticker.h b/UNITTESTS/target_h/drivers/Ticker.h
index 9749c0820f..772549060f 100644
--- a/UNITTESTS/target_h/drivers/Ticker.h
+++ b/UNITTESTS/target_h/drivers/Ticker.h
@@ -1,5 +1,5 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2006-2013 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/UNITTESTS/target_h/platform/mbed_assert.h b/UNITTESTS/target_h/platform/mbed_assert.h
index 1616fb0f85..c52a0173e2 100644
--- a/UNITTESTS/target_h/platform/mbed_assert.h
+++ b/UNITTESTS/target_h/platform/mbed_assert.h
@@ -5,8 +5,8 @@
  * \defgroup platform_Assert Assert macros
  * @{
  */
-/* mbed Microcontroller Library
- * Copyright (c) 2006-2013 ARM Limited
+/*
+ * Copyright (c) 2018--2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/drivers/ResetReason.cpp b/drivers/ResetReason.cpp
index 9614fb8262..8e48aad0f7 100644
--- a/drivers/ResetReason.cpp
+++ b/drivers/ResetReason.cpp
@@ -1,5 +1,5 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/drivers/ResetReason.h b/drivers/ResetReason.h
index 7bc74255b3..09ca85d825 100644
--- a/drivers/ResetReason.h
+++ b/drivers/ResetReason.h
@@ -1,5 +1,5 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/drivers/Watchdog.cpp b/drivers/Watchdog.cpp
index 6be0e0f7d0..2b7a99416d 100644
--- a/drivers/Watchdog.cpp
+++ b/drivers/Watchdog.cpp
@@ -1,5 +1,5 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/drivers/Watchdog.h b/drivers/Watchdog.h
index ce3a58c35d..e866f55380 100644
--- a/drivers/Watchdog.h
+++ b/drivers/Watchdog.h
@@ -1,5 +1,5 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/hal/reset_reason_api.h b/hal/reset_reason_api.h
index b43b2fbcab..c46372fb0c 100644
--- a/hal/reset_reason_api.h
+++ b/hal/reset_reason_api.h
@@ -1,7 +1,8 @@
 /** \addtogroup hal */
 /** @{*/
-/* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
  *
  * 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/hal/watchdog_api.h b/hal/watchdog_api.h
index fcd9f369bf..b59e2a7a7e 100644
--- a/hal/watchdog_api.h
+++ b/hal/watchdog_api.h
@@ -1,7 +1,7 @@
 /** \addtogroup hal */
 /** @{*/
-/* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+/* 
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/platform/mbed_watchdog_mgr.cpp b/platform/mbed_watchdog_mgr.cpp
index ed297fb450..28ef2c1633 100644
--- a/platform/mbed_watchdog_mgr.cpp
+++ b/platform/mbed_watchdog_mgr.cpp
@@ -1,6 +1,5 @@
-
-/* mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/platform/mbed_watchdog_mgr.h b/platform/mbed_watchdog_mgr.h
index 6d06dda0fb..c4b52a2048 100644
--- a/platform/mbed_watchdog_mgr.h
+++ b/platform/mbed_watchdog_mgr.h
@@ -1,5 +1,5 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2018 ARM Limited
+/*
+ * Copyright (c) 2018-2019 Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");