From b2c810402c5ee16bb5d6a5488ceb4a34284e3133 Mon Sep 17 00:00:00 2001
From: Arto Kinnunen <Arto.Kinnunen@arm.com>
Date: Thu, 15 Apr 2021 14:07:48 +0300
Subject: [PATCH 01/43] CHANGELOG for Nanostack v13.0.0 (#2615)

---
 CHANGELOG.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b19f399c5a4..1e6101c89d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,24 @@
 # Changelog for Nanostack
 
+## Release vXX.X.X
 
+### Features
+*
 
-## Release vXX.X.X
+### Changes
+* 
+
+### Bug fixes
+* 
+
+
+## Release v13.0.0 (15-04-2021)
+
+Mesh stack ready for Wi-SUN FAN and PHY certification tests.
 
 ### Features
 * Added support for Anonymous address generation in DHCPv6 server for Wi-SUN Border router
-* Improved Wi-SUN Async messaging statics. Time spent in different states and neighbor management changes.
+* Improved Wi-SUN asynchronous messaging statistics. Time spent in different states and neighbor management changes.
 * Created API to get the Wi-SUN Neighbor table with basic information from the neighbor.
 * Added support for set MAC and MPX Data Request priority.
 

From 7802c7ee977020da264ee9f57a48a6aea9e1f830 Mon Sep 17 00:00:00 2001
From: Arto Kinnunen <Arto.Kinnunen@arm.com>
Date: Thu, 15 Apr 2021 14:11:32 +0300
Subject: [PATCH 02/43] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e6101c89d6..f4e44b44594 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ Mesh stack ready for Wi-SUN FAN and PHY certification tests.
 * Improved Wi-SUN asynchronous messaging statistics. Time spent in different states and neighbor management changes.
 * Created API to get the Wi-SUN Neighbor table with basic information from the neighbor.
 * Added support for set MAC and MPX Data Request priority.
+* Implemented Last Gasp support for Wi-SUN devices using Expedite Forward Traffic class packets.
 
 ### Changes
 * Added throttling of number of simultaneous EAPOL authentications based on Border Router TX queue size

From 4371462d6667a3cc5a14ca4e7cb7ff553152e045 Mon Sep 17 00:00:00 2001
From: Mika Tervonen <mika.tervonen@arm.com>
Date: Wed, 14 Apr 2021 19:09:33 +0300
Subject: [PATCH 03/43] Fix NULL read from RPL header addition

There is a possibility that the function rpl_data_exthdr_provider_hbh
was called with NULL Neighbor info causing an NULL pointer read
when adding headers to routed packets
---
 source/RPL/rpl_upward.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/RPL/rpl_upward.c b/source/RPL/rpl_upward.c
index 496313a08a3..e25c4a675f6 100644
--- a/source/RPL/rpl_upward.c
+++ b/source/RPL/rpl_upward.c
@@ -533,6 +533,9 @@ bool rpl_neighbour_update_dtsn(rpl_neighbour_t *neighbour, uint8_t dtsn)
 
 rpl_instance_t *rpl_neighbour_instance(const rpl_neighbour_t *neighbour)
 {
+    if (!neighbour || !neighbour->dodag_version || !neighbour->dodag_version->dodag) {
+        return NULL;
+    }
     return neighbour->dodag_version->dodag->instance;
 }
 

From 618a19192cf39f48442ffcbcbb5aef0bc9e15a4b Mon Sep 17 00:00:00 2001
From: Juha Heiskanen <juha.heiskanen@arm.com>
Date: Tue, 20 Apr 2021 09:08:30 +0300
Subject: [PATCH 04/43] Wi-SUN Expedite forward state update

At Expedite forward state ETX update, NUD and Probe process are blocked.
---
 source/6LoWPAN/adaptation_interface.c                    | 9 +++++++++
 source/6LoWPAN/lowpan_adaptation_interface.h             | 2 ++
 source/6LoWPAN/ws/ws_bootstrap.c                         | 5 +++++
 source/6LoWPAN/ws/ws_llc_data_service.c                  | 7 +++++--
 test/nanostack/unittest/stub/adaptation_interface_stub.c | 5 +++++
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/source/6LoWPAN/adaptation_interface.c b/source/6LoWPAN/adaptation_interface.c
index 0374731751f..2c288347213 100644
--- a/source/6LoWPAN/adaptation_interface.c
+++ b/source/6LoWPAN/adaptation_interface.c
@@ -1242,6 +1242,15 @@ void lowpan_adaptation_expedite_forward_enable(protocol_interface_info_entry_t *
     lowpan_adaptation_high_priority_state_enable(cur, interface_ptr);
 }
 
+bool lowpan_adaptation_expedite_forward_state_get(protocol_interface_info_entry_t *cur)
+{
+    fragmenter_interface_t *interface_ptr = lowpan_adaptation_interface_discover(cur->id);
+    if (!interface_ptr || !interface_ptr->last_rx_high_priority) {
+        return false;
+    }
+    return true;
+}
+
 void lowpan_adaptation_interface_slow_timer(protocol_interface_info_entry_t *cur)
 {
     fragmenter_interface_t *interface_ptr = lowpan_adaptation_interface_discover(cur->id);
diff --git a/source/6LoWPAN/lowpan_adaptation_interface.h b/source/6LoWPAN/lowpan_adaptation_interface.h
index 5b88e287231..0ea712ec40e 100644
--- a/source/6LoWPAN/lowpan_adaptation_interface.h
+++ b/source/6LoWPAN/lowpan_adaptation_interface.h
@@ -64,6 +64,8 @@ int8_t lowpan_adaptation_indirect_queue_params_set(struct protocol_interface_inf
 
 void lowpan_adaptation_expedite_forward_enable(struct protocol_interface_info_entry *cur);
 
+bool lowpan_adaptation_expedite_forward_state_get(struct protocol_interface_info_entry *cur);
+
 void lowpan_adaptation_interface_slow_timer(struct protocol_interface_info_entry *cur);
 
 #endif /* LOWPAN_ADAPTATION_INTERFACE_H_ */
diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
index 013c3c6e993..ca924863802 100644
--- a/source/6LoWPAN/ws/ws_bootstrap.c
+++ b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -2204,6 +2204,11 @@ static bool ws_neighbor_entry_nud_notify(mac_neighbor_table_entry_t *entry_ptr,
         return false;
     }
 
+    if (lowpan_adaptation_expedite_forward_state_get(cur)) {
+        //Do not send any probe or NUD when Expedite forward state is enabled
+        return false;
+    }
+
     ws_bootsrap_create_ll_address(ll_address, entry_ptr->mac64);
 
     if (time_from_start > WS_NEIGHBOR_NUD_TIMEOUT) {
diff --git a/source/6LoWPAN/ws/ws_llc_data_service.c b/source/6LoWPAN/ws/ws_llc_data_service.c
index c83f9b89b15..9726ce2baa7 100644
--- a/source/6LoWPAN/ws/ws_llc_data_service.c
+++ b/source/6LoWPAN/ws/ws_llc_data_service.c
@@ -490,8 +490,11 @@ static void ws_llc_mac_confirm_cb(const mac_api_t *api, const mcps_data_conf_t *
                 }
 
                 if (neighbor_info.ws_neighbor && neighbor_info.neighbor && neighbor_info.neighbor->link_lifetime == WS_NEIGHBOR_LINK_TIMEOUT) {
-                    etx_transm_attempts_update(interface->id, 1 + data->tx_retries, success, neighbor_info.neighbor->index, neighbor_info.neighbor->mac64);
-                    //TODO discover RSL from Enchanced ACK Header IE elements
+
+                    if (!base->high_priority_mode) {
+                        //Update ETX only when High priority state is not activated
+                        etx_transm_attempts_update(interface->id, 1 + data->tx_retries, success, neighbor_info.neighbor->index, neighbor_info.neighbor->mac64);
+                    }
                     ws_utt_ie_t ws_utt;
                     if (ws_wh_utt_read(conf_data->headerIeList, conf_data->headerIeListLength, &ws_utt)) {
                         //UTT header
diff --git a/test/nanostack/unittest/stub/adaptation_interface_stub.c b/test/nanostack/unittest/stub/adaptation_interface_stub.c
index fb798cf592c..44279ff1778 100644
--- a/test/nanostack/unittest/stub/adaptation_interface_stub.c
+++ b/test/nanostack/unittest/stub/adaptation_interface_stub.c
@@ -121,3 +121,8 @@ void lowpan_adaptation_expedite_forward_enable(struct protocol_interface_info_en
 {
 
 }
+
+bool lowpan_adaptation_expedite_forward_state_get(protocol_interface_info_entry_t *cur)
+{
+    return false;
+}

From 7e47889111e773ffa5bd01e459eb51e2f0d1dad2 Mon Sep 17 00:00:00 2001
From: Mika Tervonen <mika.tervonen@arm.com>
Date: Mon, 26 Apr 2021 15:12:12 +0300
Subject: [PATCH 05/43] support filtering of EAPOL parents based
 device-min-sens configuration

Filter EAPOL parents with DEVICE_MIN_SENS with CAND_PARENT_THRESHOLD and CAND_PARENT_HYSTERESIS configuration.

Only neighbours that have THRESHOLD + HYSTERESIS are accepted for EAPOL candidates.
If candidate signal level drops below the THRESHOLD - HYSTERESIS it is removed.

Change Parent list handling to be more consistent between functions
---
 CHANGELOG.md                     |  2 +-
 nanostack/ws_management_api.h    |  6 ++++--
 source/6LoWPAN/ws/ws_bootstrap.c | 33 +++++++++++++++++++++++---------
 source/6LoWPAN/ws/ws_common.h    |  7 ++++---
 4 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4e44b44594..2e6dfe7b1f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## Release vXX.X.X
 
 ### Features
-*
+* Filter EAPOL parents based on DEVICE_MIN_SENS configuration with Threshold and Hysteresis to prevent EAPOL failures caused by bad signal levels
 
 ### Changes
 * 
diff --git a/nanostack/ws_management_api.h b/nanostack/ws_management_api.h
index 7094d090771..92f7cb1bd8d 100644
--- a/nanostack/ws_management_api.h
+++ b/nanostack/ws_management_api.h
@@ -857,8 +857,10 @@ int ws_neighbor_info_get(
  *
  * Setting a value that is not suitable for Radio might prevent the device joining to the network.
  *
- * NOTE: Currently lower EAPOL parents are accepted if there is no parents higher than
- *       DEVICE_MIN_SENS + CAND_PARENT_THRESHOLD + CAND_PARENT_HYSTERESIS
+ * This configuration limits the EAPOL parents accepted for Authentication and device must hear signal
+ * level higher than device_min_sens + CAND_PARENT_THRESHOLD + CAND_PARENT_HYSTERESIS
+ * to start authentication.
+ *
  * NOTE: Currently not using this value to limit parents as it is only RECOMENDED in specification.
  *
  * \param interface_id Network interface ID.
diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
index ca924863802..19f4aed8e5e 100644
--- a/source/6LoWPAN/ws/ws_bootstrap.c
+++ b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -1387,6 +1387,12 @@ static void ws_bootstrap_candidate_parent_store(parent_info_t *parent, const str
     parent->signal_dbm = data->signal_dbm;
     memcpy(parent->addr, data->SrcAddr, 8);
 
+    if (ws_neighbor_class_rsl_from_dbm_calculate(parent->signal_dbm) > (DEVICE_MIN_SENS + CAND_PARENT_THRESHOLD + CAND_PARENT_HYSTERISIS)) {
+        parent->link_acceptable = true;
+    }
+    if (ws_neighbor_class_rsl_from_dbm_calculate(parent->signal_dbm) < (DEVICE_MIN_SENS + CAND_PARENT_THRESHOLD - CAND_PARENT_HYSTERISIS)) {
+        parent->link_acceptable = false;
+    }
     parent->age = protocol_core_monotonic_time;
 }
 
@@ -1421,6 +1427,7 @@ static parent_info_t *ws_bootstrap_candidate_parent_allocate(protocol_interface_
     }
     if (entry) {
         entry->tx_fail = 0;
+        entry->link_acceptable = false;
     }
     return entry;
 }
@@ -1442,13 +1449,11 @@ static void ws_bootstrap_candidate_parent_mark_failure(protocol_interface_info_e
 {
     parent_info_t *entry = ws_bootstrap_candidate_parent_get(cur, addr, false);
     if (entry) {
-        ns_list_remove(&cur->ws_info->parent_list_reserved, entry);
         if (entry->tx_fail >= 2) {
+            ns_list_remove(&cur->ws_info->parent_list_reserved, entry);
             ns_list_add_to_end(&cur->ws_info->parent_list_free, entry);
         } else {
             entry->tx_fail++;
-            //New last
-            ns_list_add_to_end(&cur->ws_info->parent_list_reserved, entry);
             ws_bootstrap_candidate_parent_sort(cur, entry);
         }
 
@@ -1466,14 +1471,12 @@ static bool ws_bootstrap_candidate_parent_compare(parent_info_t *p1, parent_info
         return false;
     }
 
-    if (ws_neighbor_class_rsl_from_dbm_calculate(p1->signal_dbm) < (DEVICE_MIN_SENS + CAND_PARENT_THRESHOLD + CAND_PARENT_HYSTERISIS) &&
-            ws_neighbor_class_rsl_from_dbm_calculate(p2->signal_dbm) > (DEVICE_MIN_SENS + CAND_PARENT_THRESHOLD + CAND_PARENT_HYSTERISIS)) {
-        // above threshold is always better than not.
+    if (p1->link_acceptable && !p2->link_acceptable) {
+        // Link acceptable is always better than not
         return true;
     }
-    if (ws_neighbor_class_rsl_from_dbm_calculate(p2->signal_dbm) < (DEVICE_MIN_SENS + CAND_PARENT_THRESHOLD + CAND_PARENT_HYSTERISIS) &&
-            ws_neighbor_class_rsl_from_dbm_calculate(p1->signal_dbm) > (DEVICE_MIN_SENS + CAND_PARENT_THRESHOLD + CAND_PARENT_HYSTERISIS)) {
-        // P2 is less than threshold and P1 is larger so P1 is always better.
+    if (!p1->link_acceptable && p2->link_acceptable) {
+        // Link acceptable is always better than not
         return false;
     }
 
@@ -1498,6 +1501,7 @@ static void ws_bootstrap_candidate_list_clean(struct protocol_interface_info_ent
     int pan_count = 0;
 
     ns_list_foreach_safe(parent_info_t, entry, &cur->ws_info->parent_list_reserved) {
+
         if ((current_time - entry->age) > WS_PARENT_LIST_MAX_AGE) {
             ns_list_remove(&cur->ws_info->parent_list_reserved, entry);
             ns_list_add_to_end(&cur->ws_info->parent_list_free, entry);
@@ -1534,6 +1538,9 @@ static void ws_bootstrap_candidate_parent_sort(struct protocol_interface_info_en
             return;
         }
     }
+    // This is the last entry
+    ns_list_remove(&cur->ws_info->parent_list_reserved, new_entry);
+    ns_list_add_to_end(&cur->ws_info->parent_list_reserved, new_entry);
 }
 
 static void ws_bootstrap_pan_information_store(struct protocol_interface_info_entry *cur, const struct mcps_data_ind_s *data, ws_utt_ie_t *ws_utt, ws_us_ie_t *ws_us, ws_pan_information_t *pan_information)
@@ -1560,6 +1567,14 @@ static void ws_bootstrap_pan_information_store(struct protocol_interface_info_en
     }
     // Safe the information
     ws_bootstrap_candidate_parent_store(new_entry, data, ws_utt, ws_us, pan_information);
+    if (!new_entry->link_acceptable) {
+        // This entry is either poor quality or changed to poor quality link so we will remove this
+        // Todo in future possibility to try poor link parents if we have not found any good link parents
+        tr_info("neighbour not accepted: addr:%s panid:%x rsl:%d device_min_sens: %d", trace_array(new_entry->addr, 8), new_entry->pan_id, ws_neighbor_class_rsl_from_dbm_calculate(new_entry->signal_dbm), DEVICE_MIN_SENS);
+        ns_list_remove(&cur->ws_info->parent_list_reserved, new_entry);
+        ns_list_add_to_end(&cur->ws_info->parent_list_free, new_entry);
+        return;
+    }
     // set to the correct place in list
     ws_bootstrap_candidate_parent_sort(cur, new_entry);
 
diff --git a/source/6LoWPAN/ws/ws_common.h b/source/6LoWPAN/ws/ws_common.h
index 2dda3beac82..e6a354fb181 100644
--- a/source/6LoWPAN/ws/ws_common.h
+++ b/source/6LoWPAN/ws/ws_common.h
@@ -47,9 +47,10 @@ typedef struct parent_info_s {
     ws_pan_information_t pan_information;
     ws_utt_ie_t          ws_utt;
     ws_us_ie_t           ws_us;
-    uint32_t             timestamp;          /**< Timestamp when packet was received */
-    uint32_t             age;          /**< Age of entry in 100ms ticks */
-    uint8_t              excluded_channel_data[32]; //Channel mask Max length and it accept 8 different range
+    uint32_t             timestamp;                 /**< Timestamp when packet was received */
+    uint32_t             age;                       /**< Age of entry in 100ms ticks */
+    uint8_t              excluded_channel_data[32]; /**< Channel mask Max length and it accept 8 different range*/
+    bool                 link_acceptable: 1;        /**< True when Link quality is in acceptable level*/
     ns_list_link_t       link;
 } parent_info_t;
 

From 77229eefa6e04e0bfecef4e6184595228b4f18dc Mon Sep 17 00:00:00 2001
From: Mika Tervonen <mika.tervonen@arm.com>
Date: Tue, 27 Apr 2021 12:32:56 +0300
Subject: [PATCH 06/43] Fix CPP error from domain prefix check

Address unspecifed read 16 bytes from the domain prefix which is only
8 bytes
---
 source/6LoWPAN/Thread/thread_bbr_commercial.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/6LoWPAN/Thread/thread_bbr_commercial.c b/source/6LoWPAN/Thread/thread_bbr_commercial.c
index 17eb7096c9c..6bab9b0c8a4 100644
--- a/source/6LoWPAN/Thread/thread_bbr_commercial.c
+++ b/source/6LoWPAN/Thread/thread_bbr_commercial.c
@@ -1351,7 +1351,7 @@ void thread_bbr_commercial_route_update(protocol_interface_info_entry_t *cur)
     // remove with info and add valid domain prefix again to back bone interface
     ipv6_route_table_remove_info(this->backbone_interface_id, ROUTE_THREAD_BBR, NULL);
 
-    if (!addr_is_ipv6_unspecified(this->domain_prefix)) {
+    if (memcmp(this->domain_prefix, ADDR_UNSPECIFIED, 8) != 0) {
         // add dua route to backbone, delete dua from on-mesh route
         ipv6_route_add_with_info(this->domain_prefix, 64, this->backbone_interface_id, NULL, ROUTE_THREAD_BBR, NULL, 0, 0xffffffff, 0);
         tr_info("Hosting pBBR for DUA prefix");

From c05e1da7573e9afba7af9c25319a63b37a914796 Mon Sep 17 00:00:00 2001
From: Mika Tervonen <mika.tervonen@arm.com>
Date: Tue, 27 Apr 2021 14:33:57 +0300
Subject: [PATCH 07/43] Fix DHCP server Uninitialized memory read

Removed not needed boolean and structure
Fixed the length calculation when address allocation fails
---
 source/DHCPv6_Server/DHCPv6_Server_service.c | 24 ++++++++------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/source/DHCPv6_Server/DHCPv6_Server_service.c b/source/DHCPv6_Server/DHCPv6_Server_service.c
index 7443f30507a..86dcdf09a32 100644
--- a/source/DHCPv6_Server/DHCPv6_Server_service.c
+++ b/source/DHCPv6_Server/DHCPv6_Server_service.c
@@ -88,36 +88,32 @@ static void DHCP_server_service_timer_stop(void)
 int DHCPv6_server_respond_client(dhcpv6_gua_server_entry_s *serverBase, dhcpv6_reply_packet_s *replyPacket, dhcp_ia_non_temporal_params_t *dhcp_ia_non_temporal_params, dhcpv6_gua_response_t *response, bool allocateNew)
 {
     dhcpv6_allocated_address_t *dhcp_allocated_address = NULL;
-    dhcpv6_ia_non_temporal_address_s nonTemporalAddress;
-    bool address_allocated = false;
     //Validate Client DUID
     dhcp_link_options_params_t clientDUID;
+
     if (libdhcpv6_get_link_address_from_duid(replyPacket->clientDUID.duid, replyPacket->clientDUID.duid_length, replyPacket->clientDUID.type, &clientDUID) == 0) {
         dhcp_allocated_address = libdhcpv6_address_allocate(serverBase, clientDUID.link_id, clientDUID.link_type, dhcp_ia_non_temporal_params->iaId, dhcp_ia_non_temporal_params->T0, dhcp_ia_non_temporal_params->T1, allocateNew);
     }
     if (dhcp_allocated_address) {
-        address_allocated = true;
-        nonTemporalAddress.requestedAddress = dhcp_allocated_address->nonTemporalAddress;
-        nonTemporalAddress.validLifeTime = dhcp_allocated_address->lifetime;
-        nonTemporalAddress.preferredLifeTime = dhcp_allocated_address->preferredLifetime;
-
         if (serverBase->addCb) {
             dhcp_address_cache_update_t update_info;
             update_info.allocatedAddress = dhcp_allocated_address->nonTemporalAddress;
             update_info.allocatedNewAddress = allocateNew;
-            update_info.validLifeTime = nonTemporalAddress.validLifeTime;
+            update_info.validLifeTime = dhcp_allocated_address->lifetime;
 
             if (!serverBase->addCb(serverBase->interfaceId, &update_info, serverBase->guaPrefix)) {
-                address_allocated = false;
                 libdhcpv6_address_delete(serverBase, dhcp_allocated_address->nonTemporalAddress);
+                dhcp_allocated_address = NULL;
             }
         }
     }
 
-    response->responseLength = libdhcpv6_address_reply_message_len(replyPacket->clientDUID.duid_length, replyPacket->serverDUID.duid_length, 0, replyPacket->rapidCommit, address_allocated);
+    response->responseLength = libdhcpv6_address_reply_message_len(replyPacket->clientDUID.duid_length, replyPacket->serverDUID.duid_length, 0, replyPacket->rapidCommit, (dhcp_allocated_address != NULL));
     //Calculate DNS LIST and Vendor data lengths here
-    response->responseLength += libdhcpv6_dns_server_message_sizes(serverBase);
-    response->responseLength += libdhcpv6_vendor_data_message_sizes(serverBase);
+    if (dhcp_allocated_address) {
+        response->responseLength += libdhcpv6_dns_server_message_sizes(serverBase);
+        response->responseLength += libdhcpv6_vendor_data_message_sizes(serverBase);
+    }
 
     response->responsePtr = ns_dyn_mem_temporary_alloc(response->responseLength);
     if (response->responsePtr) {
@@ -126,9 +122,9 @@ int DHCPv6_server_respond_client(dhcpv6_gua_server_entry_s *serverBase, dhcpv6_r
         ptr = libdhcpv6_header_write(ptr, DHCPV6_REPLY_TYPE, replyPacket->transaction_ID);
         ptr = libdhcpv6_duid_option_write(ptr, DHCPV6_SERVER_ID_OPTION, &replyPacket->serverDUID); //16
         ptr = libdhcpv6_duid_option_write(ptr, DHCPV6_CLIENT_ID_OPTION, &replyPacket->clientDUID); //16
-        if (address_allocated) {
+        if (dhcp_allocated_address) {
             ptr = libdhcpv6_identity_association_option_write(ptr, replyPacket->iaId, replyPacket->T0, replyPacket->T1, true);
-            ptr = libdhcpv6_ia_address_option_write(ptr, nonTemporalAddress.requestedAddress, nonTemporalAddress.preferredLifeTime, nonTemporalAddress.validLifeTime);
+            ptr = libdhcpv6_ia_address_option_write(ptr, dhcp_allocated_address->nonTemporalAddress, dhcp_allocated_address->preferredLifetime, dhcp_allocated_address->lifetime);
             //Write DNS LIST and Vendor data here
             ptr = libdhcpv6_dns_server_message_writes(serverBase, ptr);
             ptr = libdhcpv6_vendor_data_message_writes(serverBase, ptr);

From 8a8b407c47d88e438ccb59e14a9280d704d464ea Mon Sep 17 00:00:00 2001
From: Mika Tervonen <mika.tervonen@arm.com>
Date: Wed, 28 Apr 2021 16:16:49 +0300
Subject: [PATCH 08/43] Add RSL check for ETX Calculation for RPL parent
 selection

Separate Wi-SUN ETX function so that all ETX checks have same validation
Remove all direct calls to etx_local_etx_read function and replace with
Wi-SUN version.

Remove check for 0 ack from etx_local_etx_read as it is ok to run the
ETX Calculation through even if first probe fails
---
 CHANGELOG.md                     |  1 +
 nanostack/ws_management_api.h    |  4 +++-
 source/6LoWPAN/ws/ws_bootstrap.c | 35 +++++++++++++++++++++++---------
 source/Service_Libs/etx/etx.c    |  5 -----
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e6dfe7b1f6..dc6cb1e17c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Release vXX.X.X
 
 ### Features
+* Filter RPL parents based on DEVICE_MIN_SENS configuration with Threshold and Hysteresis.
 * Filter EAPOL parents based on DEVICE_MIN_SENS configuration with Threshold and Hysteresis to prevent EAPOL failures caused by bad signal levels
 
 ### Changes
diff --git a/nanostack/ws_management_api.h b/nanostack/ws_management_api.h
index 92f7cb1bd8d..0d2d75c99bb 100644
--- a/nanostack/ws_management_api.h
+++ b/nanostack/ws_management_api.h
@@ -861,7 +861,9 @@ int ws_neighbor_info_get(
  * level higher than device_min_sens + CAND_PARENT_THRESHOLD + CAND_PARENT_HYSTERESIS
  * to start authentication.
  *
- * NOTE: Currently not using this value to limit parents as it is only RECOMENDED in specification.
+ * ETX Calculation gives a maximum ETX if two way EWMA RSL is less than
+ * device_min_sens + CAND_PARENT_THRESHOLD + CAND_PARENT_HYSTERESIS to
+ * prevent selecting parents with poor signal quality
  *
  * \param interface_id Network interface ID.
  * \param device_min_sens value used in the parent selections.
diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
index 19f4aed8e5e..830e839c5af 100644
--- a/source/6LoWPAN/ws/ws_bootstrap.c
+++ b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -909,17 +909,17 @@ static void ws_bootstrap_ll_address_validate(struct protocol_interface_info_entr
  * \return 0x0000 address unknown or other error
  * \return 0x0001 no ETX statistics on this interface
  */
-uint16_t ws_etx_read(protocol_interface_info_entry_t *interface, addrtype_t addr_type, const uint8_t *addr_ptr)
+uint16_t ws_local_etx_read(protocol_interface_info_entry_t *interface, addrtype_t addr_type, const uint8_t *mac_adddress)
 {
     uint16_t etx;
 
-    if (!addr_ptr || !interface) {
+    if (!mac_adddress || !interface) {
         return 0;
     }
 
     uint8_t attribute_index;
 
-    mac_neighbor_table_entry_t *mac_neighbor = mac_neighbor_table_address_discover(mac_neighbor_info(interface), addr_ptr + PAN_ID_LEN, addr_type);
+    mac_neighbor_table_entry_t *mac_neighbor = mac_neighbor_table_address_discover(mac_neighbor_info(interface), mac_adddress, addr_type);
     if (!mac_neighbor) {
         return 0xffff;
     }
@@ -933,6 +933,12 @@ uint16_t ws_etx_read(protocol_interface_info_entry_t *interface, addrtype_t addr
 
     etx = etx_local_etx_read(interface->id, attribute_index);
 
+    // if we have a measurement ready then we will check the RSL validity
+    if (etx != 0xffff && !ws_neighbour->candidate_parent) {
+        // RSL value measured is lower than acceptable ETX will be given as MAX
+        return WS_ETX_MAX << 1; // We use 8 bit fraction and ETX is usually 7 bit fraction
+    }
+
     // If we dont have valid ETX for children we assume good ETX.
     // After enough packets is sent to children real calculated ETX is given.
     // This might result in ICMP source route errors returned to Border router causing secondary route uses
@@ -942,6 +948,15 @@ uint16_t ws_etx_read(protocol_interface_info_entry_t *interface, addrtype_t addr
 
     return etx;
 }
+
+uint16_t ws_etx_read(protocol_interface_info_entry_t *interface, addrtype_t addr_type, const uint8_t *addr_ptr)
+{
+    if (!addr_ptr || !interface) {
+        return 0;
+    }
+    return ws_local_etx_read(interface, addr_type, addr_ptr + PAN_ID_LEN);
+}
+
 bool ws_bootstrap_nd_ns_transmit(protocol_interface_info_entry_t *cur, ipv6_neighbour_t *entry,  bool unicast, uint8_t seq)
 {
     (void)cur;
@@ -3001,17 +3016,17 @@ static bool ws_rpl_new_parent_callback(uint8_t *ll_parent_address, void *handle,
             return false;
         }
         // +2 Is for PAN ID space
-        memcpy(mac64 + 2, replacing + 8, 8);
-        mac64[2] ^= 2;
+        memcpy(mac64, replacing + 8, 8);
+        mac64[0] ^= 2;
 
-        if (ws_etx_read(cur, ADDR_802_15_4_LONG, mac64) == 0xffff) {
-            //Not proped yet because ETX is 0xffff
+        if (ws_local_etx_read(cur, ADDR_802_15_4_LONG, mac64) == 0xffff) {
+            //Not probed yet because ETX is 0xffff
             return false;
         }
 
         uint16_t etx = 0;
         if (neigh_buffer.neighbor) {
-            etx = etx_local_etx_read(cur->id, neigh_buffer.neighbor->index);
+            etx = ws_local_etx_read(cur, ADDR_802_15_4_LONG, neigh_buffer.neighbor->mac64);
         }
 
         // Accept now only better one's when max candidates selected and max candidate list size is reached
@@ -3554,7 +3569,7 @@ static uint16_t ws_bootstrap_routing_cost_calculate(protocol_interface_info_entr
         return 0xffff;
     }
 
-    uint16_t etx = etx_local_etx_read(cur->id, mac_neighbor->index);
+    uint16_t etx = ws_local_etx_read(cur, ADDR_802_15_4_LONG, mac_neighbor->mac64);
     if (etx == 0) {
         etx = WS_ETX_MAX; //SET maximum value here if ETX is unknown
     } else {
@@ -4254,7 +4269,7 @@ int ws_bootstrap_neighbor_info_get(protocol_interface_info_entry_t *cur, ws_neig
             neighbor_ptr[count].rsl_out = ws_neighbor_class_rsl_out_get(ws_neighbor);
 
             // ETX is shown calculated as 8 bit integer, but more common way is to use 7 bit such that 128 means ETX:1.0
-            neighbor_ptr[count].etx = etx_local_etx_read(cur->id, mac_entry->index);
+            neighbor_ptr[count].etx = ws_local_etx_read(cur, ADDR_802_15_4_LONG, mac_entry->mac64);
             if (neighbor_ptr[count].etx != 0xffff) {
                 neighbor_ptr[count].etx = neighbor_ptr[count].etx >> 1;
             }
diff --git a/source/Service_Libs/etx/etx.c b/source/Service_Libs/etx/etx.c
index 22a86f1cca1..64a878bd85c 100644
--- a/source/Service_Libs/etx/etx.c
+++ b/source/Service_Libs/etx/etx.c
@@ -439,11 +439,6 @@ uint16_t etx_local_etx_read(int8_t interface_id, uint8_t attribute_index)
     }
 
     if (etx_info.cache_sample_requested && entry->etx_samples < etx_info.init_etx_sample_count) {
-        etx_sample_storage_t *storage = etx_info.etx_cache_storage_list + attribute_index;
-        if (storage->received_acks == 0 && storage->attempts_count) {
-            //No ack so return max value
-            return etx_info.max_etx;
-        }
         //Not ready yet
         return 0xffff;
     }

From 20f1f6492f4591441f7ce35822a8933edd290799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=20Lepp=C3=A4nen?= <mika.leppanen@arm.com>
Date: Fri, 30 Apr 2021 12:51:35 +0300
Subject: [PATCH 09/43] Added ignoring of retry messages from RADIUS server
 when waiting EAP-TLS

Retry messages were not ignored correcly and caused memory corruption.
---
 CHANGELOG.md                                  |  2 +-
 .../radius_sec_prot/radius_client_sec_prot.c  | 20 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc6cb1e17c6..e891b6f93fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
 * 
 
 ### Bug fixes
-* 
+* Added ignoring of retry messages from RADIUS server when waiting EAP-TLS
 
 
 ## Release v13.0.0 (15-04-2021)
diff --git a/source/Security/protocols/radius_sec_prot/radius_client_sec_prot.c b/source/Security/protocols/radius_sec_prot/radius_client_sec_prot.c
index 882df678fd0..b75cfecf35e 100644
--- a/source/Security/protocols/radius_sec_prot/radius_client_sec_prot.c
+++ b/source/Security/protocols/radius_sec_prot/radius_client_sec_prot.c
@@ -71,6 +71,7 @@ typedef enum {
 #define RADIUS_ACCESS_ACCEPT          2
 #define RADIUS_ACCESS_REJECT          3
 #define RADIUS_ACCESS_CHALLENGE       11
+#define RADIUS_MESSAGE_NONE           0
 
 #define MS_MPPE_RECV_KEY_SALT_LEN     2
 #define MS_MPPE_RECV_KEY_BLOCK_LEN    16
@@ -239,7 +240,7 @@ static int8_t radius_client_sec_prot_init(sec_prot_t *prot)
     data->send_radius_msg = NULL;
     data->identity_len = 0;
     data->identity = NULL;
-    data->radius_code = 0;
+    data->radius_code = RADIUS_MESSAGE_NONE;
     data->radius_identifier = 0;
     memset(data->request_authenticator, 0, 16);
     data->state_len = 0;
@@ -247,6 +248,7 @@ static int8_t radius_client_sec_prot_init(sec_prot_t *prot)
     memset(data->remote_eui_64_hash, 0, 8);
     data->remote_eui_64_hash_set = false;
     data->new_pmk_set = false;
+    data->radius_id_range_set = false;
 
     if (!shared_data) {
         shared_data = ns_dyn_mem_alloc(sizeof(radius_client_sec_prot_shared_t));
@@ -379,6 +381,10 @@ static int8_t radius_client_sec_prot_receive(sec_prot_t *prot, void *pdu, uint16
     uint8_t *radius_msg_ptr = pdu;
 
     uint8_t code = *radius_msg_ptr++;
+    if (code != RADIUS_ACCESS_ACCEPT && code != RADIUS_ACCESS_REJECT && code != RADIUS_ACCESS_CHALLENGE) {
+        return -1;
+    }
+
     uint8_t identifier = *radius_msg_ptr++;
     /* If identifier does not match to sent identifier, silently ignore message,
        already checked on socket if before routing the request to receive, so
@@ -430,6 +436,7 @@ static int8_t radius_client_sec_prot_receive(sec_prot_t *prot, void *pdu, uint16
         // Message does not have radius EAP-TLS specific fields
         data->radius_code = code;
         prot->state_machine(prot);
+        data->radius_code = RADIUS_MESSAGE_NONE;
 
         return 0;
     }
@@ -519,6 +526,7 @@ static int8_t radius_client_sec_prot_receive(sec_prot_t *prot, void *pdu, uint16
     data->radius_code = code;
     data->recv_eap_msg_len += data->radius_eap_tls_header_size;
     prot->state_machine(prot);
+    data->radius_code = RADIUS_MESSAGE_NONE;
 
     return 0;
 }
@@ -1127,6 +1135,16 @@ static void radius_client_sec_prot_state_machine(sec_prot_t *prot)
                 return;
             }
 
+            if (data->radius_code != RADIUS_MESSAGE_NONE) {
+                // Received retry for already handled message from RADIUS server, ignore
+                if (data->recv_eap_msg) {
+                    ns_dyn_mem_free(data->recv_eap_msg);
+                }
+                data->recv_eap_msg = NULL;
+                data->recv_eap_msg_len = 0;
+                return;
+            }
+
             tr_info("Radius: send access request, eui-64: %s", trace_array(sec_prot_remote_eui_64_addr_get(prot), 8));
 
             radius_client_sec_prot_allocate_and_create_radius_message(prot);

From 4f9e3d12ab770b9b5eee24143945400c185b691b Mon Sep 17 00:00:00 2001
From: Mika Tervonen <mika.tervonen@arm.com>
Date: Tue, 4 May 2021 15:43:13 +0300
Subject: [PATCH 10/43] Adaptation layer to remove oldest packet first

When running out of memory or reducing traffic adaptation
will remove the oldest packets first instead of newest

Also it needs to first remove all Lower priority packets before
remove the next level of priorities
---
 CHANGELOG.md                          |   1 +
 source/6LoWPAN/adaptation_interface.c | 125 +++++++++++++++-----------
 2 files changed, 74 insertions(+), 52 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e891b6f93fb..7d6eb9ddf49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 * Filter RPL parents based on DEVICE_MIN_SENS configuration with Threshold and Hysteresis.
 * Filter EAPOL parents based on DEVICE_MIN_SENS configuration with Threshold and Hysteresis to prevent EAPOL failures caused by bad signal levels
+* Adaptation layer removes oldest packets first when stack needs to release memory or reduce traffic
 
 ### Changes
 * 
diff --git a/source/6LoWPAN/adaptation_interface.c b/source/6LoWPAN/adaptation_interface.c
index 2c288347213..eb6341e6502 100644
--- a/source/6LoWPAN/adaptation_interface.c
+++ b/source/6LoWPAN/adaptation_interface.c
@@ -128,8 +128,8 @@ static NS_LIST_DEFINE(fragmenter_interface_list, fragmenter_interface_t, link);
 static fragmenter_interface_t *lowpan_adaptation_interface_discover(int8_t interfaceId);
 
 /* Interface direct message pending queue functions */
-static void lowpan_adaptation_tx_queue_write(fragmenter_interface_t *interface_ptr, buffer_t *buf);
-static buffer_t *lowpan_adaptation_tx_queue_read(fragmenter_interface_t *interface_ptr);
+static void lowpan_adaptation_tx_queue_write(protocol_interface_info_entry_t *cur, fragmenter_interface_t *interface_ptr, buffer_t *buf);
+static buffer_t *lowpan_adaptation_tx_queue_read(protocol_interface_info_entry_t *cur, fragmenter_interface_t *interface_ptr);
 
 /* Data direction and message length validation */
 static bool lowpan_adaptation_indirect_data_request(mac_neighbor_table_entry_t *mle_entry);
@@ -223,8 +223,11 @@ static struct protocol_interface_info_entry *lowpan_adaptation_network_interface
 }
 
 
-static void lowpan_adaptation_tx_queue_level_update(fragmenter_interface_t *interface_ptr)
+static void lowpan_adaptation_tx_queue_level_update(protocol_interface_info_entry_t *cur, fragmenter_interface_t *interface_ptr)
 {
+    random_early_detetction_aq_calc(cur->random_early_detection, interface_ptr->directTxQueue_size);
+    protocol_stats_update(STATS_AL_TX_QUEUE_SIZE, interface_ptr->directTxQueue_size);
+
     if (interface_ptr->directTxQueue_size == interface_ptr->directTxQueue_level + ADAPTION_DIRECT_TX_QUEUE_SIZE_THRESHOLD_TRACE ||
             interface_ptr->directTxQueue_size == interface_ptr->directTxQueue_level - ADAPTION_DIRECT_TX_QUEUE_SIZE_THRESHOLD_TRACE) {
         interface_ptr->directTxQueue_level = interface_ptr->directTxQueue_size;
@@ -233,14 +236,14 @@ static void lowpan_adaptation_tx_queue_level_update(fragmenter_interface_t *inte
 }
 
 
-static void lowpan_adaptation_tx_queue_write(fragmenter_interface_t *interface_ptr, buffer_t *buf)
+static void lowpan_adaptation_tx_queue_write(protocol_interface_info_entry_t *cur, fragmenter_interface_t *interface_ptr, buffer_t *buf)
 {
     buffer_t *lower_priority_buf = NULL;
 
-    ns_list_foreach(buffer_t, cur, &interface_ptr->directTxQueue) {
+    ns_list_foreach(buffer_t, entry, &interface_ptr->directTxQueue) {
 
-        if (cur->priority < buf->priority) {
-            lower_priority_buf = cur;
+        if (entry->priority < buf->priority) {
+            lower_priority_buf = entry;
             break;
         }
     }
@@ -251,18 +254,17 @@ static void lowpan_adaptation_tx_queue_write(fragmenter_interface_t *interface_p
         ns_list_add_to_end(&interface_ptr->directTxQueue, buf);
     }
     interface_ptr->directTxQueue_size++;
-    lowpan_adaptation_tx_queue_level_update(interface_ptr);
-    protocol_stats_update(STATS_AL_TX_QUEUE_SIZE, interface_ptr->directTxQueue_size);
+    lowpan_adaptation_tx_queue_level_update(cur, interface_ptr);
 }
 
-static void lowpan_adaptation_tx_queue_write_to_front(fragmenter_interface_t *interface_ptr, buffer_t *buf)
+static void lowpan_adaptation_tx_queue_write_to_front(protocol_interface_info_entry_t *cur, fragmenter_interface_t *interface_ptr, buffer_t *buf)
 {
     buffer_t *lower_priority_buf = NULL;
 
-    ns_list_foreach(buffer_t, cur, &interface_ptr->directTxQueue) {
+    ns_list_foreach(buffer_t, entry, &interface_ptr->directTxQueue) {
 
-        if (cur->priority <= buf->priority) {
-            lower_priority_buf = cur;
+        if (entry->priority <= buf->priority) {
+            lower_priority_buf = entry;
             break;
         }
     }
@@ -273,11 +275,10 @@ static void lowpan_adaptation_tx_queue_write_to_front(fragmenter_interface_t *in
         ns_list_add_to_end(&interface_ptr->directTxQueue, buf);
     }
     interface_ptr->directTxQueue_size++;
-    lowpan_adaptation_tx_queue_level_update(interface_ptr);
-    protocol_stats_update(STATS_AL_TX_QUEUE_SIZE, interface_ptr->directTxQueue_size);
+    lowpan_adaptation_tx_queue_level_update(cur, interface_ptr);
 }
 
-static buffer_t *lowpan_adaptation_tx_queue_read(fragmenter_interface_t *interface_ptr)
+static buffer_t *lowpan_adaptation_tx_queue_read(protocol_interface_info_entry_t *cur, fragmenter_interface_t *interface_ptr)
 {
     // Currently this function is called only when data confirm is received for previously sent packet.
     if (!interface_ptr->directTxQueue_size) {
@@ -293,8 +294,7 @@ static buffer_t *lowpan_adaptation_tx_queue_read(fragmenter_interface_t *interfa
         if (lowpan_buffer_tx_allowed(interface_ptr, buf)) {
             ns_list_remove(&interface_ptr->directTxQueue, buf);
             interface_ptr->directTxQueue_size--;
-            lowpan_adaptation_tx_queue_level_update(interface_ptr);
-            protocol_stats_update(STATS_AL_TX_QUEUE_SIZE, interface_ptr->directTxQueue_size);
+            lowpan_adaptation_tx_queue_level_update(cur, interface_ptr);
             return buf;
         }
     }
@@ -561,12 +561,24 @@ void lowpan_adaptation_free_heap(bool full_gc)
         lowpan_adaptation_free_low_priority_packets(interface_ptr->interface_id, priority, amount);
     }
 }
+buffer_t *lowpan_adaptation_get_oldest_packet(fragmenter_interface_t *interface_ptr, buffer_priority_t priority)
+{
+    ns_list_foreach(buffer_t, entry, &interface_ptr->directTxQueue) {
+        if (entry->priority == priority) {
+            // Only Higher priority packets left no need to go through list anymore
+            return entry;
+        }
+    }
+    return NULL;
+
+}
 
 int8_t lowpan_adaptation_free_low_priority_packets(int8_t interface_id, buffer_priority_t max_priority, uint32_t requested_amount)
 {
     fragmenter_interface_t *interface_ptr = lowpan_adaptation_interface_discover(interface_id);
+    protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(interface_id);
 
-    if (!interface_ptr) {
+    if (!interface_ptr || !cur) {
         return -1;
     }
     uint32_t adaptation_memory = 0;
@@ -592,21 +604,36 @@ int8_t lowpan_adaptation_free_low_priority_packets(int8_t interface_id, buffer_p
         requested_amount = adaptation_memory - LOWPAN_MEM_LIMIT_MIN_MEMORY;
     }
 
-    //Only remove last entries from TX queue with low priority
-    ns_list_foreach_reverse_safe(buffer_t, entry, &interface_ptr->directTxQueue) {
-        if (entry->priority <= max_priority) {
-            memory_freed += sizeof(buffer_t) + entry->size;
-            packets_freed++;
-            ns_list_remove(&interface_ptr->directTxQueue, entry);
-            interface_ptr->directTxQueue_size--;
-            lowpan_adaptation_tx_queue_level_update(interface_ptr);
-            socket_tx_buffer_event_and_free(entry, SOCKET_TX_FAIL);
-        }
-        if (memory_freed > requested_amount) {
-            // Enough memory freed
+    /* Order of packets is
+     * priority 4 oldest to newest
+     * priority 3 oldest to newest
+     * priority 2 oldest to newest
+     * priority 1 oldest to newest
+     * priority 0 oldest to newest
+     * So we search oldest for lowest priority and delete that until that priority is empty
+     * and then start deleting one higher priority packets from oldest first
+     */
+
+    buffer_priority_t priority = QOS_NORMAL;
+    do {
+        buffer_t *entry = lowpan_adaptation_get_oldest_packet(interface_ptr, priority);
+        if (!entry) {
+            if (priority < max_priority) {
+                priority++;
+                continue;
+            }
+            // No more packets available
             break;
         }
-    }
+        // This packet can be deleted
+        memory_freed += sizeof(buffer_t) + entry->size;
+        packets_freed++;
+        ns_list_remove(&interface_ptr->directTxQueue, entry);
+        interface_ptr->directTxQueue_size--;
+        lowpan_adaptation_tx_queue_level_update(cur, interface_ptr);
+        socket_tx_buffer_event_and_free(entry, SOCKET_TX_FAIL);
+    } while (memory_freed < requested_amount);
+
     tr_info("Adaptation Free low priority packets memory: %" PRIi32 " queue: %d deallocated %" PRIi32 " bytes, %d packets, %" PRIi32 " requested", adaptation_memory, adaptation_packets, memory_freed, packets_freed, requested_amount);
     return 0;
 }
@@ -1210,8 +1237,7 @@ static void lowpan_adaptation_high_priority_state_enable(protocol_interface_info
                     interface_ptr->activeTxList_size--;
                     ns_dyn_mem_free(entry);
                     //Add message to tx queue front based on priority. Now same priority at buf is prioritised at order
-                    lowpan_adaptation_tx_queue_write_to_front(interface_ptr, buf);
-                    random_early_detetction_aq_calc(cur->random_early_detection, interface_ptr->directTxQueue_size);
+                    lowpan_adaptation_tx_queue_write_to_front(cur, interface_ptr, buf);
                 }
             }
         }
@@ -1260,13 +1286,11 @@ void lowpan_adaptation_interface_slow_timer(protocol_interface_info_entry_t *cur
 
     if (lowpan_adaptation_high_priority_state_exit(interface_ptr)) {
         //Activate Packets from TX queue
-        buffer_t *buf_from_queue = lowpan_adaptation_tx_queue_read(interface_ptr);
+        buffer_t *buf_from_queue = lowpan_adaptation_tx_queue_read(cur, interface_ptr);
         while (buf_from_queue) {
             lowpan_adaptation_interface_tx(cur, buf_from_queue);
-            buf_from_queue = lowpan_adaptation_tx_queue_read(interface_ptr);
+            buf_from_queue = lowpan_adaptation_tx_queue_read(cur, interface_ptr);
         }
-        //Update Average QUEUE
-        random_early_detetction_aq_calc(cur->random_early_detection, interface_ptr->directTxQueue_size);
     }
 }
 
@@ -1319,17 +1343,17 @@ int8_t lowpan_adaptation_interface_tx(protocol_interface_info_entry_t *cur, buff
 
     if (!lowpan_buffer_tx_allowed(interface_ptr, buf)) {
 
-        if (buf->priority == QOS_NORMAL) {
-
-            if (random_early_detection_congestion_check(cur->random_early_detection)) {
-                random_early_detetction_aq_calc(cur->random_early_detection, interface_ptr->directTxQueue_size);
+        if (random_early_detection_congestion_check(cur->random_early_detection)) {
+            // If we need to drop packet we drop oldest normal Priority packet.
+            buffer_t *dropped = lowpan_adaptation_get_oldest_packet(interface_ptr, QOS_NORMAL);
+            if (dropped) {
+                ns_list_remove(&interface_ptr->directTxQueue, dropped);
+                interface_ptr->directTxQueue_size--;
+                socket_tx_buffer_event_and_free(dropped, SOCKET_TX_FAIL);
                 protocol_stats_update(STATS_AL_TX_CONGESTION_DROP, 1);
-                goto tx_error_handler;
             }
         }
-
-        lowpan_adaptation_tx_queue_write(interface_ptr, buf);
-        random_early_detetction_aq_calc(cur->random_early_detection, interface_ptr->directTxQueue_size);
+        lowpan_adaptation_tx_queue_write(cur, interface_ptr, buf);
         return 0;
     }
 
@@ -1605,13 +1629,11 @@ int8_t lowpan_adaptation_interface_tx_confirm(protocol_interface_info_entry_t *c
     if (active_direct_confirm == true) {
         //Check Possibility for exit from High Priority state
         lowpan_adaptation_high_priority_state_exit(interface_ptr);
-        buffer_t *buf_from_queue = lowpan_adaptation_tx_queue_read(interface_ptr);
+        buffer_t *buf_from_queue = lowpan_adaptation_tx_queue_read(cur, interface_ptr);
         while (buf_from_queue) {
             lowpan_adaptation_interface_tx(cur, buf_from_queue);
-            buf_from_queue = lowpan_adaptation_tx_queue_read(interface_ptr);
+            buf_from_queue = lowpan_adaptation_tx_queue_read(cur, interface_ptr);
         }
-        //Update Average QUEUE
-        random_early_detetction_aq_calc(cur->random_early_detection, interface_ptr->directTxQueue_size);
     }
     return 0;
 }
@@ -1815,8 +1837,7 @@ int8_t lowpan_adaptation_free_messages_from_queues_by_address(struct protocol_in
             ns_list_remove(&interface_ptr->directTxQueue, entry);
             interface_ptr->directTxQueue_size--;
             //Update Average QUEUE
-            random_early_detetction_aq_calc(cur->random_early_detection, interface_ptr->directTxQueue_size);
-            lowpan_adaptation_tx_queue_level_update(interface_ptr);
+            lowpan_adaptation_tx_queue_level_update(cur, interface_ptr);
             socket_tx_buffer_event_and_free(entry, SOCKET_TX_FAIL);
         }
     }

From 99be7783ec5166207f9b406af0f5ad4ff5b1dd48 Mon Sep 17 00:00:00 2001
From: Juha Heiskanen <juha.heiskanen@arm.com>
Date: Thu, 11 Mar 2021 09:01:30 +0200
Subject: [PATCH 11/43] EAPOL temp neighbour update

Static EAPOL entries from 20->5 for reduce static RAM usage.
Dynamic EAPOL temp neighbour entry is now allocated 1 by 1 after static end.
Dynamic EAPOL max entry isdefined by dynamic heap size.
---
 source/6LoWPAN/ws/ws_bootstrap.c        |   8 +-
 source/6LoWPAN/ws/ws_llc_data_service.c | 193 +++++++++++++++++-------
 2 files changed, 142 insertions(+), 59 deletions(-)

diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
index 830e839c5af..e4b4cbde2af 100644
--- a/source/6LoWPAN/ws/ws_bootstrap.c
+++ b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -203,8 +203,7 @@ static void ws_bootstap_eapol_neigh_entry_allocate(struct protocol_interface_inf
 {
     uint8_t mac_64[8];
     memset(mac_64, 0, sizeof(mac_64));
-
-    mac_neighbor_table_entry_t *mac_entry = ws_bootstrap_mac_neighbor_add(interface, mac_64);
+    mac_neighbor_table_entry_t *mac_entry = ws_bootstrap_mac_neighbor_allocate(interface, mac_64);
 
     if (!mac_entry) {
         return;
@@ -229,7 +228,7 @@ ws_neighbor_class_entry_t *ws_bootstrap_eapol_tx_temporary_set(struct protocol_i
 
     memcpy(mac_entry->mac64, src64, 8);
     mac_helper_device_description_write(interface, &device_desc, src64, 0xffff, 0, false);
-    mac_helper_devicetable_direct_set(interface->mac_api, &device_desc, interface->ws_info->eapol_tx_index);
+    mac_helper_devicetable_direct_set(interface->mac_api, &device_desc, mac_entry->index);
     return ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, mac_entry->index);
 }
 
@@ -248,7 +247,7 @@ static void ws_bootstrap_neighbor_list_clean(struct protocol_interface_info_entr
 {
 
     mac_neighbor_table_neighbor_list_clean(mac_neighbor_info(interface));
-    //Allocate EAPOL TX temporary neigh entry
+    //Allocate EAPOL TX temporary neigh entries
     ws_bootstap_eapol_neigh_entry_allocate(interface);
 }
 
@@ -2083,6 +2082,7 @@ static void ws_bootstrap_neighbor_table_clean(struct protocol_interface_info_ent
         ws_neighbor_class_entry_t *ws_neighbor = ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, cur->index);
 
         if (cur->index == interface->ws_info->eapol_tx_index) {
+            //Skip EAPOL temp entries
             continue;
         }
 
diff --git a/source/6LoWPAN/ws/ws_llc_data_service.c b/source/6LoWPAN/ws/ws_llc_data_service.c
index 9726ce2baa7..9004e4002f2 100644
--- a/source/6LoWPAN/ws/ws_llc_data_service.c
+++ b/source/6LoWPAN/ws/ws_llc_data_service.c
@@ -102,9 +102,24 @@ typedef struct {
 typedef NS_LIST_HEAD(llc_message_t, link) llc_message_list_t;
 
 #define MAX_NEIGH_TEMPORARY_MULTICAST_SIZE 5
-#define MAX_NEIGH_TEMPORRY_EAPOL_SIZE 20
+#define MAX_NEIGH_TEMPORRY_EAPOL_SIZE 5
 #define MAX_NEIGH_TEMPORAY_LIST_SIZE (MAX_NEIGH_TEMPORARY_MULTICAST_SIZE + MAX_NEIGH_TEMPORRY_EAPOL_SIZE)
 
+#define WS_LLC_EAPOL_DYNAMIC_ALLOCATE_MIN 10
+#define WS_LLC_EAPOL_DYNAMIC_ALLOCATE_MAX 100
+#define WS_LLC_EAPOL_DYNAMIC_HEAP_PERCENT 7
+/**
+ *  7 % from total heap take about
+ *
+ *  How to max entry is defined: (Total heap / 100 * 7) / size of temporary entry
+ *
+ *  32 kBytes define 14 entry
+ *  64 kBytes define 29 entry
+ *  128 kBytes define 58 entry
+ *
+ */
+
+
 typedef struct {
     ws_neighbor_temp_class_t        neighbour_temporary_table[MAX_NEIGH_TEMPORAY_LIST_SIZE];
     ws_neighbor_temp_list_t         active_multicast_temp_neigh;
@@ -112,6 +127,7 @@ typedef struct {
     ws_neighbor_temp_list_t         free_temp_neigh;
     llc_message_list_t              llc_eap_pending_list;           /**< Active Message list */
     uint16_t                        llc_eap_pending_list_size;      /**< EAPOL active Message list size */
+    uint16_t                        dynamic_alloc_max;              /**< How big EAPOL temp entry list can be extend */
     bool                            active_eapol_session: 1;        /**< Indicating active EAPOL message */
 } temp_entriest_t;
 
@@ -171,9 +187,11 @@ static void ws_llc_mpx_init(mpx_class_t *mpx_class);
 
 static void ws_llc_temp_neigh_info_table_reset(temp_entriest_t *base);
 static ws_neighbor_temp_class_t *ws_allocate_multicast_temp_entry(temp_entriest_t *base, const uint8_t *mac64);
-static ws_neighbor_temp_class_t *ws_llc_discover_eapol_temp_entry(temp_entriest_t *base, const uint8_t *mac64);
-static void ws_llc_release_eapol_temp_entry(temp_entriest_t *base, const uint8_t *mac64);
 static ws_neighbor_temp_class_t *ws_allocate_eapol_temp_entry(temp_entriest_t *base, const uint8_t *mac64);
+static void ws_llc_temp_entry_free(temp_entriest_t *base, ws_neighbor_temp_class_t *entry);
+static ws_neighbor_temp_class_t *ws_llc_discover_temp_entry(ws_neighbor_temp_list_t *list, const uint8_t *mac64);
+static void ws_llc_release_eapol_temp_entry(temp_entriest_t *base, const uint8_t *mac64);
+
 
 static void ws_llc_mpx_eapol_send(llc_data_base_t *base, llc_message_t *message);
 
@@ -432,6 +450,11 @@ static llc_data_base_t *ws_llc_base_allocate(void)
     ns_list_init(&temp_entries->active_eapol_temp_neigh);
     ns_list_init(&temp_entries->free_temp_neigh);
     ns_list_init(&temp_entries->llc_eap_pending_list);
+
+    //Add to free list to full from static
+    for (int i = 0; i < MAX_NEIGH_TEMPORAY_LIST_SIZE; i++) {
+        ns_list_add_to_end(&temp_entries->free_temp_neigh, &temp_entries->neighbour_temporary_table[i]);
+    }
     base->temp_entries = temp_entries;
 
     ns_list_init(&base->llc_message_list);
@@ -440,6 +463,20 @@ static llc_data_base_t *ws_llc_base_allocate(void)
     return base;
 }
 
+static void ws_llc_mac_eapol_clear(llc_data_base_t *base, llc_message_t *message)
+{
+    //Clear active EAPOL Session Count
+    if (base->temp_entries->active_eapol_session) {
+        base->temp_entries->active_eapol_session = false;
+    }
+
+    if (message->eapol_temporary) {
+        //Clear
+        ws_bootstrap_eapol_tx_temporary_clear(base->interface_ptr);
+    }
+}
+
+
 /** WS LLC MAC data extension confirmation  */
 static void ws_llc_mac_confirm_cb(const mac_api_t *api, const mcps_data_conf_t *data, const mcps_data_conf_payload_t *conf_data)
 {
@@ -463,7 +500,7 @@ static void ws_llc_mac_confirm_cb(const mac_api_t *api, const mcps_data_conf_t *
 
         if (data->status == MLME_SUCCESS || data->status == MLME_NO_DATA) {
             //Update timeout
-            ws_neighbor_temp_class_t *temp_entry = ws_llc_discover_eapol_temp_entry(base->temp_entries, message->dst_address);
+            ws_neighbor_temp_class_t *temp_entry = ws_llc_discover_temp_entry(&base->temp_entries->active_eapol_temp_neigh, message->dst_address);
             if (temp_entry) {
                 //Update Temporary Lifetime
                 temp_entry->eapol_temp_info.eapol_timeout = interface->ws_info->cfg->timing.temp_eapol_min_timeout + 1;
@@ -1113,24 +1150,6 @@ static void ws_llc_lowpan_mpx_data_request(llc_data_base_t *base, mpx_user_t *us
     base->interface_ptr->mac_api->mcps_data_req_ext(base->interface_ptr->mac_api, &data_req, &message->ie_ext, NULL, message->priority);
 }
 
-static bool ws_llc_eapol_temp_entry_set(llc_data_base_t *base, const uint8_t *mac64)
-{
-    //Discover Temporary entry
-    ws_neighbor_temp_class_t *temp_neigh = ws_llc_discover_eapol_temp_entry(base->temp_entries, mac64);
-
-    if (!temp_neigh) {
-        return false;
-    }
-    ws_neighbor_class_entry_t *entry = ws_bootstrap_eapol_tx_temporary_set(base->interface_ptr, mac64);
-    if (!entry) {
-        return false;
-    }
-    *entry = temp_neigh->neigh_info_list;
-    return true;
-
-}
-
-
 static void ws_llc_eapol_data_req_init(mcps_data_req_t *data_req, llc_message_t *message)
 {
     memset(data_req, 0, sizeof(mcps_data_req_t));
@@ -1158,11 +1177,32 @@ static void ws_llc_eapol_data_req_init(mcps_data_req_t *data_req, llc_message_t
 static void ws_llc_mpx_eapol_send(llc_data_base_t *base, llc_message_t *message)
 {
     mcps_data_req_t data_req;
+
+    //Discover Temporary entry
+    ws_neighbor_temp_class_t *temp_neigh = ws_llc_discover_temp_entry(&base->temp_entries->active_eapol_temp_neigh, message->dst_address);
+
+    if (temp_neigh) {
+        //Discover Free MAC &Wi-sun tx entry
+        ws_neighbor_class_entry_t *entry = ws_bootstrap_eapol_tx_temporary_set(base->interface_ptr, message->dst_address);
+        if (!entry) {
+            //No temp entry add to pending list
+            //Move to pending list
+            ns_list_add_to_end(&base->temp_entries->llc_eap_pending_list, message);
+            base->temp_entries->llc_eap_pending_list_size++;
+            random_early_detetction_aq_calc(base->interface_ptr->llc_eapol_random_early_detection, base->temp_entries->llc_eap_pending_list_size);
+            return;
+        }
+        *entry = temp_neigh->neigh_info_list;
+        message->eapol_temporary = true;
+    } else {
+        message->eapol_temporary = false;
+    }
+
+    //Allocate message ID
     llc_message_id_allocate(message, base, true);
     base->llc_message_list_size++;
     random_early_detetction_aq_calc(base->interface_ptr->llc_random_early_detection, base->llc_message_list_size);
     ns_list_add_to_end(&base->llc_message_list, message);
-    message->eapol_temporary = ws_llc_eapol_temp_entry_set(base, message->dst_address);
     ws_llc_eapol_data_req_init(&data_req, message);
     base->temp_entries->active_eapol_session = true;
     base->interface_ptr->mac_api->mcps_data_req_ext(base->interface_ptr->mac_api, &data_req, &message->ie_ext, NULL, message->priority);
@@ -1345,6 +1385,9 @@ static uint8_t ws_llc_mpx_data_purge_request(const mpx_api_t *api, struct mcps_p
     purge_req.msduHandle = message->msg_handle;
     purge_status = base->interface_ptr->mac_api->mcps_purge_req(base->interface_ptr->mac_api, &purge_req);
     if (purge_status == 0) {
+        if (message->messsage_type == WS_FT_EAPOL) {
+            ws_llc_mac_eapol_clear(base, message);
+        }
         llc_message_free(message, base);
     }
 
@@ -1379,6 +1422,9 @@ static void ws_llc_clean(llc_data_base_t *base)
     mcps_purge_t purge_req;
     ns_list_foreach_safe(llc_message_t, message, &base->llc_message_list) {
         purge_req.msduHandle = message->msg_handle;
+        if (message->messsage_type == WS_FT_EAPOL) {
+            ws_llc_mac_eapol_clear(base, message);
+        }
         llc_message_free(message, base);
         base->interface_ptr->mac_api->mcps_purge_req(base->interface_ptr->mac_api, &purge_req);
 
@@ -1397,32 +1443,34 @@ static void ws_llc_clean(llc_data_base_t *base)
     base->high_priority_mode = false;
 }
 
-static void ws_llc_temp_neigh_info_table_reset(temp_entriest_t *base)
+static void ws_llc_temp_entry_free(temp_entriest_t *base, ws_neighbor_temp_class_t *entry)
 {
-    //Empty active list
-    ns_list_init(&base->active_multicast_temp_neigh);
-    ns_list_init(&base->active_eapol_temp_neigh);
-    ns_list_init(&base->free_temp_neigh);
-
-    //Add to free list to full
-    for (int i = 0; i < MAX_NEIGH_TEMPORAY_LIST_SIZE; i++) {
-        ns_list_add_to_end(&base->free_temp_neigh, &base->neighbour_temporary_table[i]);
+    //Pointer is static add to free list
+    if (entry >= &base->neighbour_temporary_table[0] && entry <= &base->neighbour_temporary_table[MAX_NEIGH_TEMPORAY_LIST_SIZE - 1]) {
+        ns_list_add_to_end(&base->free_temp_neigh, entry);
+    } else {
+        ns_dyn_mem_free(entry);
     }
 }
 
-static ws_neighbor_temp_class_t *ws_llc_discover_mc_temp_entry(temp_entriest_t *base, const uint8_t *mac64)
+
+static void ws_llc_temp_neigh_info_table_reset(temp_entriest_t *base)
 {
-    ns_list_foreach(ws_neighbor_temp_class_t, entry, &base->active_multicast_temp_neigh) {
-        if (memcmp(entry->mac64, mac64, 8) == 0) {
-            return entry;
-        }
+    //Empty active list eapol list
+    ns_list_foreach_safe(ws_neighbor_temp_class_t, entry, &base->active_eapol_temp_neigh) {
+        ns_list_remove(&base->active_eapol_temp_neigh, entry);
+        ws_llc_temp_entry_free(base, entry);
+    }
+
+    ns_list_foreach_safe(ws_neighbor_temp_class_t, entry, &base->active_multicast_temp_neigh) {
+        ns_list_remove(&base->active_multicast_temp_neigh, entry);
+        ws_llc_temp_entry_free(base, entry);
     }
-    return NULL;
 }
 
-static ws_neighbor_temp_class_t *ws_llc_discover_eapol_temp_entry(temp_entriest_t *base, const uint8_t *mac64)
+static ws_neighbor_temp_class_t *ws_llc_discover_temp_entry(ws_neighbor_temp_list_t *list, const uint8_t *mac64)
 {
-    ns_list_foreach(ws_neighbor_temp_class_t, entry, &base->active_eapol_temp_neigh) {
+    ns_list_foreach(ws_neighbor_temp_class_t, entry, list) {
         if (memcmp(entry->mac64, mac64, 8) == 0) {
             return entry;
         }
@@ -1432,13 +1480,14 @@ static ws_neighbor_temp_class_t *ws_llc_discover_eapol_temp_entry(temp_entriest_
 
 static void ws_llc_release_eapol_temp_entry(temp_entriest_t *base, const uint8_t *mac64)
 {
-    ws_neighbor_temp_class_t *neighbor = ws_llc_discover_eapol_temp_entry(base, mac64);
+    ws_neighbor_temp_class_t *neighbor = ws_llc_discover_temp_entry(&base->active_eapol_temp_neigh, mac64);
     if (!neighbor) {
         return;
     }
 
     ns_list_remove(&base->active_eapol_temp_neigh, neighbor);
-    ns_list_add_to_end(&base->free_temp_neigh, neighbor);
+    ws_llc_temp_entry_free(base, neighbor);
+
 }
 
 ws_neighbor_temp_class_t *ws_llc_get_multicast_temp_entry(protocol_interface_info_entry_t *interface, const uint8_t *mac64)
@@ -1448,7 +1497,7 @@ ws_neighbor_temp_class_t *ws_llc_get_multicast_temp_entry(protocol_interface_inf
         return NULL;
     }
 
-    return ws_llc_discover_mc_temp_entry(base->temp_entries, mac64);
+    return ws_llc_discover_temp_entry(&base->temp_entries->active_multicast_temp_neigh, mac64);
 }
 
 
@@ -1467,7 +1516,7 @@ static void ws_init_temporary_neigh_data(ws_neighbor_temp_class_t *entry, const
 static ws_neighbor_temp_class_t *ws_allocate_multicast_temp_entry(temp_entriest_t *base, const uint8_t *mac64)
 {
 
-    ws_neighbor_temp_class_t *entry = ws_llc_discover_mc_temp_entry(base, mac64);
+    ws_neighbor_temp_class_t *entry = ws_llc_discover_temp_entry(&base->active_multicast_temp_neigh, mac64);
     if (entry) {
         ns_list_remove(&base->active_multicast_temp_neigh, entry);
         ns_list_add_to_start(&base->active_multicast_temp_neigh, entry);
@@ -1495,25 +1544,30 @@ static ws_neighbor_temp_class_t *ws_allocate_multicast_temp_entry(temp_entriest_
 static ws_neighbor_temp_class_t *ws_allocate_eapol_temp_entry(temp_entriest_t *base, const uint8_t *mac64)
 {
 
-    ws_neighbor_temp_class_t *entry = ws_llc_discover_eapol_temp_entry(base, mac64);
+    ws_neighbor_temp_class_t *entry = ws_llc_discover_temp_entry(&base->active_eapol_temp_neigh, mac64);
     if (entry) {
         //TODO referesh Timer here
         return entry;
     }
 
-    if (ns_list_count(&base->active_eapol_temp_neigh) < MAX_NEIGH_TEMPORRY_EAPOL_SIZE) {
+    //Take static if there is still space for multicast
+    if (ns_list_count(&base->free_temp_neigh) > (MAX_NEIGH_TEMPORARY_MULTICAST_SIZE - ns_list_count(&base->active_multicast_temp_neigh))) {
         entry = ns_list_get_first(&base->free_temp_neigh);
+        ns_list_remove(&base->free_temp_neigh, entry);
+    } else {
+        //Allocate Dynamic entry
+        //validate Can we allocate more
+        if (ns_list_count(&base->active_eapol_temp_neigh) < base->dynamic_alloc_max) {
+            entry = ns_dyn_mem_temporary_alloc(sizeof(ws_neighbor_temp_class_t));
+        }
     }
 
-    if (!entry) {
-        return NULL;
-    }
-
-    ns_list_remove(&base->free_temp_neigh, entry);
     //Add to list
-    ns_list_add_to_start(&base->active_eapol_temp_neigh, entry);
-    //Clear Old data
-    ws_init_temporary_neigh_data(entry, mac64);
+    if (entry) {
+        ns_list_add_to_start(&base->active_eapol_temp_neigh, entry);
+        //Clear Old data
+        ws_init_temporary_neigh_data(entry, mac64);
+    }
     return entry;
 }
 
@@ -1625,12 +1679,40 @@ static void ws_llc_mcps_edfe_handler(const mac_api_t *api, mcps_edfe_response_t
 }
 
 
+static uint16_t ws_llc_calculate_dynamic_entries_max(uint16_t min_entry, uint16_t max_entry, uint8_t dynamic_heap_percent)
+{
+    const mem_stat_t *mem_stats = ns_dyn_mem_get_mem_stat();
+    if (!mem_stats) {
+        return min_entry;
+    }
+
+    uint32_t total_heap_size = mem_stats->heap_sector_size;
+    total_heap_size = (total_heap_size / 100) * dynamic_heap_percent;
+
+    uint16_t sizeof_entry = sizeof(ws_neighbor_temp_class_t) + 2 * sizeof(int);
+
+    if (total_heap_size > (sizeof_entry * max_entry)) {
+        //Use given MAX entry size
+        return max_entry;
+    }
+
+    if (total_heap_size < (sizeof_entry * min_entry)) {
+        //Use given Min entry size
+        return min_entry;
+    }
+
+    uint16_t max_entry_possible = (uint16_t)total_heap_size / sizeof_entry;
+    tr_debug("Dynamic EAPOL entry max %d", max_entry_possible);
+    return max_entry_possible;
+}
+
 
 int8_t ws_llc_create(struct protocol_interface_info_entry *interface, ws_asynch_ind *asynch_ind_cb, ws_asynch_confirm *asynch_cnf_cb, ws_neighbor_info_request *ws_neighbor_info_request_cb)
 {
     llc_data_base_t *base = ws_llc_discover_by_interface(interface);
     if (base) {
         ws_llc_clean(base);
+        base->temp_entries->dynamic_alloc_max = ws_llc_calculate_dynamic_entries_max(WS_LLC_EAPOL_DYNAMIC_ALLOCATE_MIN, WS_LLC_EAPOL_DYNAMIC_ALLOCATE_MAX, WS_LLC_EAPOL_DYNAMIC_HEAP_PERCENT);
         return 0;
     }
 
@@ -1650,6 +1732,7 @@ int8_t ws_llc_create(struct protocol_interface_info_entry *interface, ws_asynch_
     //Init MPX class
     ws_llc_mpx_init(&base->mpx_data_base);
     ws_llc_temp_neigh_info_table_reset(base->temp_entries);
+    base->temp_entries->dynamic_alloc_max = ws_llc_calculate_dynamic_entries_max(WS_LLC_EAPOL_DYNAMIC_ALLOCATE_MIN, WS_LLC_EAPOL_DYNAMIC_ALLOCATE_MAX, WS_LLC_EAPOL_DYNAMIC_HEAP_PERCENT);
     return 0;
 }
 
@@ -1951,7 +2034,7 @@ bool ws_llc_eapol_relay_forward_filter(struct protocol_interface_info_entry *int
         return false;
     }
 
-    ws_neighbor_temp_class_t *neighbor = ws_llc_discover_eapol_temp_entry(base->temp_entries, joiner_eui64);
+    ws_neighbor_temp_class_t *neighbor = ws_llc_discover_temp_entry(&base->temp_entries->active_eapol_temp_neigh, joiner_eui64);
     if (!neighbor) {
         llc_neighbour_req_t neighbor_info;
         //Discover here Normal Neighbour

From 283f2ee68581dc7c845e5b79ec60bafbfc0af239 Mon Sep 17 00:00:00 2001
From: Juha Heiskanen <juha.heiskanen@arm.com>
Date: Wed, 5 May 2021 14:43:09 +0300
Subject: [PATCH 12/43] DHCPv6 update:

DHCPv6 send support delay send.

DHCP client support now randomized Solication delay.
---
 nanostack/dhcp_service_api.h                  |  3 +-
 source/6LoWPAN/ws/ws_bootstrap.c              |  3 +-
 source/6LoWPAN/ws/ws_config.h                 |  1 +
 source/DHCPv6_client/dhcpv6_client_api.h      |  3 +-
 source/DHCPv6_client/dhcpv6_client_service.c  | 14 +++++--
 source/libDHCPv6/dhcp_service_api.c           | 37 +++++++++++++++----
 .../unittest/stub/dhcp_service_api_stub.c     |  2 +-
 unittest/thread_dhcp_servers/Test.c           |  2 +-
 8 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/nanostack/dhcp_service_api.h b/nanostack/dhcp_service_api.h
index 88a51504587..869344192a0 100644
--- a/nanostack/dhcp_service_api.h
+++ b/nanostack/dhcp_service_api.h
@@ -197,11 +197,12 @@ int dhcp_service_send_resp(uint32_t msg_tr_id, uint8_t options, uint8_t *msg_ptr
  * \param msg_ptr An allocated message pointer. This pointer is the responsibility of the service after this call.
  * \param msg_len The length of the message.
  * \param receive_resp_cb Callback pointer
+ * \param delay_tx Transmit may be delayed and this parameter define that
  *
  * \return Transaction ID of the DHCP transaction
  * \return 0, if error occurred.
  */
-uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr, const uint8_t addr[static 16], uint8_t *msg_ptr, uint16_t msg_len, dhcp_service_receive_resp_cb *receive_resp_cb);
+uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr, const uint8_t addr[static 16], uint8_t *msg_ptr, uint16_t msg_len, dhcp_service_receive_resp_cb *receive_resp_cb, uint16_t delay_tx);
 
 /**
  * \brief Setting retransmission parameters.
diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
index e4b4cbde2af..d1bd3f3f1da 100644
--- a/source/6LoWPAN/ws/ws_bootstrap.c
+++ b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -1140,7 +1140,8 @@ static int8_t ws_bootstrap_up(protocol_interface_info_entry_t *cur)
     dhcp_client_init(cur->id, DHCPV6_DUID_HARDWARE_IEEE_802_NETWORKS_TYPE);
     dhcp_service_link_local_rx_cb_set(cur->id, ws_bootstrap_dhcp_neighbour_update_cb);
     dhcp_client_configure(cur->id, true, true, true); //RENEW uses SOLICIT, Interface will use 1 instance for address get, IAID address hint is not used.
-    dhcp_client_solicit_timeout_set(cur->id, WS_DHCP_SOLICIT_TIMEOUT, WS_DHCP_SOLICIT_MAX_RT, WS_DHCP_SOLICIT_MAX_RC);
+
+    dhcp_client_solicit_timeout_set(cur->id, WS_DHCP_SOLICIT_TIMEOUT, WS_DHCP_SOLICIT_MAX_RT, WS_DHCP_SOLICIT_MAX_RC, WS_DHCP_SOLICIT_MAX_DELAY);
     dhcp_client_option_notification_cb_set(cur->id, ws_bootstrap_dhcp_info_notify_cb);
 
     // Configure memory limits and garbage collection values;
diff --git a/source/6LoWPAN/ws/ws_config.h b/source/6LoWPAN/ws/ws_config.h
index fb2e23ca275..b18d0fe493d 100644
--- a/source/6LoWPAN/ws/ws_config.h
+++ b/source/6LoWPAN/ws/ws_config.h
@@ -173,6 +173,7 @@ extern uint8_t DEVICE_MIN_SENS;
 #define WS_DHCP_SOLICIT_TIMEOUT         60
 #define WS_DHCP_SOLICIT_MAX_RT          900
 #define WS_DHCP_SOLICIT_MAX_RC          0
+#define WS_DHCP_SOLICIT_MAX_DELAY       5
 
 
 /* Neighbour table configuration
diff --git a/source/DHCPv6_client/dhcpv6_client_api.h b/source/DHCPv6_client/dhcpv6_client_api.h
index b7429c61258..566d3e7e3ae 100644
--- a/source/DHCPv6_client/dhcpv6_client_api.h
+++ b/source/DHCPv6_client/dhcpv6_client_api.h
@@ -51,8 +51,9 @@ void dhcp_client_configure(int8_t interface, bool renew_uses_solicit, bool one_c
  * /param timeout SOLICIT timeout initial value. 0 means use defaults
  * /param max_rt SOLICIT timeout max value.
  * /param max_rc SOLICIT re-transmission count. 0 means infinite.
+ * /param max_delay Max delay of first Solicit
  */
-void dhcp_client_solicit_timeout_set(int8_t interface, uint16_t timeout, uint16_t max_rt, uint8_t max_rc);
+void dhcp_client_solicit_timeout_set(int8_t interface, uint16_t timeout, uint16_t max_rt, uint8_t max_rc, uint8_t max_delay);
 
 /* Delete dhcp client.
  *
diff --git a/source/DHCPv6_client/dhcpv6_client_service.c b/source/DHCPv6_client/dhcpv6_client_service.c
index 758ce3977ba..264e7ab0529 100644
--- a/source/DHCPv6_client/dhcpv6_client_service.c
+++ b/source/DHCPv6_client/dhcpv6_client_service.c
@@ -20,6 +20,7 @@
 #include <ns_types.h>
 #include <ns_trace.h>
 #include "nsdynmemLIB.h"
+#include "randLIB.h"
 #include "ns_list.h"
 #include "common_functions.h"
 
@@ -36,6 +37,7 @@ typedef struct {
     dhcp_client_options_notify_cb *option_information_cb;
     uint16_t service_instance;
     uint16_t relay_instance;
+    uint16_t sol_max_delay;
     uint16_t sol_timeout;
     uint16_t sol_max_rt;
     uint8_t sol_max_rc;
@@ -104,6 +106,7 @@ void dhcp_client_init(int8_t interface, uint16_t link_type)
         dhcp_client->sol_timeout = 0;
         dhcp_client->sol_max_rt = 0;
         dhcp_client->sol_max_rc = 0;
+        dhcp_client->sol_max_delay = 0;
         dhcp_client->renew_uses_solicit = false;
         dhcp_client->one_instance_interface = false;
         dhcp_client->no_address_hint = false;
@@ -139,13 +142,14 @@ void dhcp_client_configure(int8_t interface, bool renew_uses_solicit, bool one_c
     dhcp_client->no_address_hint = no_address_hint;
 }
 
-void dhcp_client_solicit_timeout_set(int8_t interface, uint16_t timeout, uint16_t max_rt, uint8_t max_rc)
+void dhcp_client_solicit_timeout_set(int8_t interface, uint16_t timeout, uint16_t max_rt, uint8_t max_rc, uint8_t max_delay)
 {
     // Set the default retry values for SOLICIT and RENEW messages.
     dhcp_client_class_t *dhcp_client = dhcpv6_client_entry_discover(interface);
     if (!dhcp_client) {
         return;
     }
+    dhcp_client->sol_max_delay = max_delay * 10; //Convert to ticks
     dhcp_client->sol_timeout = timeout;
     dhcp_client->sol_max_rt = max_rt;
     dhcp_client->sol_max_rc = max_rc;
@@ -498,8 +502,12 @@ int dhcp_client_get_global_address(int8_t interface, uint8_t dhcp_addr[static 16
         libdhcpv6_generic_nontemporal_address_message_write(payload_ptr, &solPacket, NULL, NULL);
     }
 
+    uint16_t delay_tx = 0;
+    if (dhcp_client->sol_max_delay) {
+        delay_tx = randLIB_get_random_in_range(0, dhcp_client->sol_max_delay);
+    }
     // send solicit
-    srv_data_ptr->transActionId = dhcp_service_send_req(dhcp_client->service_instance, 0, srv_data_ptr, dhcp_addr, payload_ptr, payload_len, dhcp_solicit_resp_cb);
+    srv_data_ptr->transActionId = dhcp_service_send_req(dhcp_client->service_instance, 0, srv_data_ptr, dhcp_addr, payload_ptr, payload_len, dhcp_solicit_resp_cb, delay_tx);
     if (srv_data_ptr->transActionId == 0) {
         ns_dyn_mem_free(payload_ptr);
         libdhcvp6_nontemporalAddress_server_data_free(srv_data_ptr);
@@ -657,7 +665,7 @@ void dhcpv6_renew(protocol_interface_info_entry_t *interface, if_address_entry_t
         server_address = srv_data_ptr->server_address;
     }
 
-    srv_data_ptr->transActionId = dhcp_service_send_req(dhcp_client->service_instance, 0, srv_data_ptr, server_address, payload_ptr, payload_len, dhcp_solicit_resp_cb);
+    srv_data_ptr->transActionId = dhcp_service_send_req(dhcp_client->service_instance, 0, srv_data_ptr, server_address, payload_ptr, payload_len, dhcp_solicit_resp_cb, 0);
     if (srv_data_ptr->transActionId == 0) {
         ns_dyn_mem_free(payload_ptr);
         if (addr) {
diff --git a/source/libDHCPv6/dhcp_service_api.c b/source/libDHCPv6/dhcp_service_api.c
index 78dddce5ad6..14b34c479d7 100644
--- a/source/libDHCPv6/dhcp_service_api.c
+++ b/source/libDHCPv6/dhcp_service_api.c
@@ -76,6 +76,7 @@ typedef struct {
     uint32_t msg_tr_id;
     uint32_t message_tr_id;
     uint32_t first_transmit_time;
+    uint16_t delayed_tx;
     uint16_t timeout;
     uint16_t timeout_init;
     uint16_t timeout_max;
@@ -768,7 +769,7 @@ int dhcp_service_send_resp(uint32_t msg_tr_id, uint8_t options, uint8_t *msg_ptr
     dhcp_tr_delete(msg_tr_ptr);
     return 0;
 }
-uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr, const uint8_t addr[static 16], uint8_t *msg_ptr, uint16_t msg_len, dhcp_service_receive_resp_cb *receive_resp_cb)
+uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr, const uint8_t addr[static 16], uint8_t *msg_ptr, uint16_t msg_len, dhcp_service_receive_resp_cb *receive_resp_cb, uint16_t delay_tx)
 {
     tr_debug("Send DHCPv6 request");
     msg_tr_t *msg_tr_ptr;
@@ -792,7 +793,8 @@ uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr,
     msg_tr_ptr->instance_id = instance_id;
     msg_tr_ptr->socket = dhcp_service->dhcp_client_socket;
     msg_tr_ptr->recv_resp_cb = receive_resp_cb;
-    msg_tr_ptr->first_transmit_time = protocol_core_monotonic_time;
+    msg_tr_ptr->delayed_tx = delay_tx;
+    msg_tr_ptr->first_transmit_time = protocol_core_monotonic_time + delay_tx;
     dhcp_tr_set_retry_timers(msg_tr_ptr, msg_tr_ptr->msg_ptr[0]);
     common_write_24_bit(msg_tr_ptr->msg_tr_id, &msg_tr_ptr->msg_ptr[1]);
 
@@ -911,12 +913,20 @@ void dhcp_service_send_message(msg_tr_t *msg_tr_ptr)
 
         uint8_t *ptr = msg_tr_ptr->relay_start;
         *ptr = DHCPV6_RELAY_REPLY;
-        retval = socket_sendmsg(msg_tr_ptr->socket, &msghdr, NS_MSG_LEGACY0);
+        if (msg_tr_ptr->delayed_tx) {
+            retval = 0;
+        } else {
+            retval = socket_sendmsg(msg_tr_ptr->socket, &msghdr, NS_MSG_LEGACY0);
+        }
 
     } else {
-        int16_t tc = 0;
-        socket_setsockopt(msg_tr_ptr->socket, SOCKET_IPPROTO_IPV6, SOCKET_IPV6_TCLASS, &tc, sizeof(tc));
-        retval = socket_sendto(msg_tr_ptr->socket, &msg_tr_ptr->addr, msg_tr_ptr->msg_ptr, msg_tr_ptr->msg_len);
+        if (msg_tr_ptr->delayed_tx) {
+            retval = 0;
+        } else {
+            int16_t tc = 0;
+            socket_setsockopt(msg_tr_ptr->socket, SOCKET_IPPROTO_IPV6, SOCKET_IPV6_TCLASS, &tc, sizeof(tc));
+            retval = socket_sendto(msg_tr_ptr->socket, &msg_tr_ptr->addr, msg_tr_ptr->msg_ptr, msg_tr_ptr->msg_len);
+        }
     }
     if (retval != 0) {
         tr_warn("dhcp service socket_sendto fails: %i", retval);
@@ -928,6 +938,18 @@ bool dhcp_service_timer_tick(uint16_t ticks)
 {
     bool activeTimerNeed = false;
     ns_list_foreach_safe(msg_tr_t, cur_ptr, &dhcp_service->tr_list) {
+
+        if (cur_ptr->delayed_tx) {
+            activeTimerNeed = true;
+            if (cur_ptr->delayed_tx <= ticks) {
+                cur_ptr->delayed_tx = 0;
+                dhcp_service_send_message(cur_ptr);
+            } else {
+                cur_ptr->delayed_tx -= ticks;
+            }
+            continue;
+        }
+
         if (cur_ptr->timeout == 0) {
             continue;
         }
@@ -1023,7 +1045,7 @@ int dhcp_service_send_resp(uint32_t msg_tr_id, uint8_t options, uint8_t *msg_ptr
     return -1;
 }
 
-uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr, const uint8_t addr[static 16], uint8_t *msg_ptr, uint16_t msg_len, dhcp_service_receive_resp_cb *receive_resp_cb)
+uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr, const uint8_t addr[static 16], uint8_t *msg_ptr, uint16_t msg_len, dhcp_service_receive_resp_cb *receive_resp_cb, uint16_t delay_tx)
 {
     (void)instance_id;
     (void)options;
@@ -1032,6 +1054,7 @@ uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr,
     (void)msg_ptr;
     (void)msg_len;
     (void)receive_resp_cb;
+    (void)delay_tx;
     return 0;
 }
 
diff --git a/test/nanostack/unittest/stub/dhcp_service_api_stub.c b/test/nanostack/unittest/stub/dhcp_service_api_stub.c
index ce32100d4e9..bb43a188991 100644
--- a/test/nanostack/unittest/stub/dhcp_service_api_stub.c
+++ b/test/nanostack/unittest/stub/dhcp_service_api_stub.c
@@ -147,7 +147,7 @@ int dhcp_service_send_resp(uint32_t msg_tr_id, uint8_t options, uint8_t *msg_ptr
     return 0;
 }
 
-uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr, const uint8_t addr[static 16], uint8_t *msg_ptr, uint16_t msg_len, dhcp_service_receive_resp_cb *receive_resp_cb)
+uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr, const uint8_t addr[static 16], uint8_t *msg_ptr, uint16_t msg_len, dhcp_service_receive_resp_cb *receive_resp_cb, uint16_t delay_tx)
 {
     return 0;
 }
diff --git a/unittest/thread_dhcp_servers/Test.c b/unittest/thread_dhcp_servers/Test.c
index 7f8e1b622eb..6fbd47e4745 100644
--- a/unittest/thread_dhcp_servers/Test.c
+++ b/unittest/thread_dhcp_servers/Test.c
@@ -358,7 +358,7 @@ void test_service_server_multi_client_test_2(void)
     instance1 = dhcp_service_init(1, sim_dhcp_service_receive_req_cb);
     instance2 = dhcp_service_init(1, sim_dhcp_service_receive_req_cb);
 
-    dhcp_service_send_req(1, 0, (void *)3333, gua_dhcp_addr, router_solicit_req, sizeof(router_solicit_req), test_dhcp_service_receive_resp_cb_a);
+    dhcp_service_send_req(1, 0, (void *)3333, gua_dhcp_addr, router_solicit_req, sizeof(router_solicit_req), test_dhcp_service_receive_resp_cb_a, 0);
     lt_test_socket_sendto(2, gua_dhcp_addr, router_solicit_req, sizeof(router_solicit_req));
 
     lt_test_socket_recv_data(1, 1, clt_addr1, router_solicit_req, sizeof(router_solicit_req));

From 8a2a683aef5d059f180818babd77db87602d3188 Mon Sep 17 00:00:00 2001
From: Juha Heiskanen <juha.heiskanen@arm.com>
Date: Tue, 11 May 2021 09:06:17 +0300
Subject: [PATCH 13/43] Fixed DHCP wrong time elapsed value write.

---
 source/libDHCPv6/dhcp_service_api.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libDHCPv6/dhcp_service_api.c b/source/libDHCPv6/dhcp_service_api.c
index 14b34c479d7..91e2b4c880f 100644
--- a/source/libDHCPv6/dhcp_service_api.c
+++ b/source/libDHCPv6/dhcp_service_api.c
@@ -794,7 +794,7 @@ uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr,
     msg_tr_ptr->socket = dhcp_service->dhcp_client_socket;
     msg_tr_ptr->recv_resp_cb = receive_resp_cb;
     msg_tr_ptr->delayed_tx = delay_tx;
-    msg_tr_ptr->first_transmit_time = protocol_core_monotonic_time + delay_tx;
+    msg_tr_ptr->first_transmit_time = protocol_core_monotonic_time;
     dhcp_tr_set_retry_timers(msg_tr_ptr, msg_tr_ptr->msg_ptr[0]);
     common_write_24_bit(msg_tr_ptr->msg_tr_id, &msg_tr_ptr->msg_ptr[1]);
 

From 0536874f6422d912c233a78ebb6a7e3125feda74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=20Lepp=C3=A4nen?= <mika.leppanen@arm.com>
Date: Fri, 7 May 2021 16:36:28 +0300
Subject: [PATCH 14/43] Removed empty EAPOL-key message send after 4WH
 completion to nodes on relay

---
 CHANGELOG.md                            | 1 +
 source/6LoWPAN/ws/ws_eapol_auth_relay.c | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d6eb9ddf49..b1cab509dbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Bug fixes
 * Added ignoring of retry messages from RADIUS server when waiting EAP-TLS
+* Removed empty EAPOL-key message send after 4WH completion to nodes on relay
 
 
 ## Release v13.0.0 (15-04-2021)
diff --git a/source/6LoWPAN/ws/ws_eapol_auth_relay.c b/source/6LoWPAN/ws/ws_eapol_auth_relay.c
index 76f6221a74b..da121c33d93 100644
--- a/source/6LoWPAN/ws/ws_eapol_auth_relay.c
+++ b/source/6LoWPAN/ws/ws_eapol_auth_relay.c
@@ -165,6 +165,13 @@ static void ws_eapol_auth_relay_socket_cb(void *cb)
         eui_64 = ptr;
         ptr += 8;
         uint16_t data_len = cb_data->d_len - 26;
+        /* If EAPOL PDU data length is zero (message contains only supplicant EUI-64 and KMP ID)
+         * i.e. is purge message and is not going to authenticator local relay then ignores message
+         */
+        if (data_len == 1 && !addr_ipv6_equal(relay_ip_addr.address, eapol_auth_relay->relay_addr.address)) {
+            ns_dyn_mem_free(socket_pdu);
+            return;
+        }
         ws_eapol_relay_lib_send_to_relay(eapol_auth_relay->socket_id, eui_64, &relay_ip_addr,
                                          ptr, data_len);
         ns_dyn_mem_free(socket_pdu);

From 5200b666e7209e3e2c5045398059c32e649928f7 Mon Sep 17 00:00:00 2001
From: Juha Heiskanen <juha.heiskanen@arm.com>
Date: Tue, 11 May 2021 14:19:18 +0300
Subject: [PATCH 15/43] DHCP time elapsed time write fix.

---
 source/libDHCPv6/dhcp_service_api.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/source/libDHCPv6/dhcp_service_api.c b/source/libDHCPv6/dhcp_service_api.c
index 91e2b4c880f..13bfaf62db1 100644
--- a/source/libDHCPv6/dhcp_service_api.c
+++ b/source/libDHCPv6/dhcp_service_api.c
@@ -794,7 +794,7 @@ uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr,
     msg_tr_ptr->socket = dhcp_service->dhcp_client_socket;
     msg_tr_ptr->recv_resp_cb = receive_resp_cb;
     msg_tr_ptr->delayed_tx = delay_tx;
-    msg_tr_ptr->first_transmit_time = protocol_core_monotonic_time;
+    msg_tr_ptr->first_transmit_time = 0;
     dhcp_tr_set_retry_timers(msg_tr_ptr, msg_tr_ptr->msg_ptr[0]);
     common_write_24_bit(msg_tr_ptr->msg_tr_id, &msg_tr_ptr->msg_ptr[1]);
 
@@ -852,8 +852,9 @@ void dhcp_service_send_message(msg_tr_t *msg_tr_ptr)
     const uint32_t address_pref = SOCKET_IPV6_PREFER_SRC_6LOWPAN_SHORT;
     dhcp_options_msg_t elapsed_time;
 
-    if (libdhcpv6_message_option_discover((msg_tr_ptr->msg_ptr + 4), (msg_tr_ptr->msg_len - 4), DHCPV6_ELAPSED_TIME_OPTION, &elapsed_time) == 0 &&
+    if (msg_tr_ptr->first_transmit_time && libdhcpv6_message_option_discover((msg_tr_ptr->msg_ptr + 4), (msg_tr_ptr->msg_len - 4), DHCPV6_ELAPSED_TIME_OPTION, &elapsed_time) == 0 &&
             elapsed_time.len == 2) {
+
         uint32_t t = protocol_core_monotonic_time - msg_tr_ptr->first_transmit_time; // time in 1/10s ticks
         uint16_t cs;
         if (t > 0xffff / 10) {
@@ -926,6 +927,10 @@ void dhcp_service_send_message(msg_tr_t *msg_tr_ptr)
             int16_t tc = 0;
             socket_setsockopt(msg_tr_ptr->socket, SOCKET_IPPROTO_IPV6, SOCKET_IPV6_TCLASS, &tc, sizeof(tc));
             retval = socket_sendto(msg_tr_ptr->socket, &msg_tr_ptr->addr, msg_tr_ptr->msg_ptr, msg_tr_ptr->msg_len);
+            if (msg_tr_ptr->first_transmit_time == 0 && retval == 0) {
+                //Mark first pushed message timestamp
+                msg_tr_ptr->first_transmit_time = protocol_core_monotonic_time ? protocol_core_monotonic_time : 1;
+            }
         }
     }
     if (retval != 0) {

From 3f7eae64ef8ce8ffb9606b87152653f8cbb4881f Mon Sep 17 00:00:00 2001
From: Juha Heiskanen <juha.heiskanen@arm.com>
Date: Mon, 10 May 2021 21:05:03 +0300
Subject: [PATCH 16/43] EAPOL FHSS temp entry discover

Extented Wi-SUN FHSS neighbour data discovery with EAPOL temp entry discovery.

Remoived Temp MAC neighbour usage for EAPOL temp neighbour.
---
 source/6LoWPAN/ws/ws_bootstrap.c              | 66 +++----------------
 source/6LoWPAN/ws/ws_bootstrap.h              |  4 --
 source/6LoWPAN/ws/ws_common.h                 |  1 -
 source/6LoWPAN/ws/ws_llc.h                    |  4 ++
 source/6LoWPAN/ws/ws_llc_data_service.c       | 36 ++++------
 .../unittest/stub/ws_bootstrap_stub.c         | 10 ---
 6 files changed, 28 insertions(+), 93 deletions(-)

diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
index d1bd3f3f1da..7c455e2e6fa 100644
--- a/source/6LoWPAN/ws/ws_bootstrap.c
+++ b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -199,56 +199,10 @@ static void ws_bootstrap_neighbor_delete(struct protocol_interface_info_entry *i
     ws_neighbor_class_entry_remove(&interface->ws_info->neighbor_storage, entry_ptr->index);
 }
 
-static void ws_bootstap_eapol_neigh_entry_allocate(struct protocol_interface_info_entry *interface)
-{
-    uint8_t mac_64[8];
-    memset(mac_64, 0, sizeof(mac_64));
-    mac_neighbor_table_entry_t *mac_entry = ws_bootstrap_mac_neighbor_allocate(interface, mac_64);
-
-    if (!mac_entry) {
-        return;
-    }
-    mac_entry->lifetime = 0xffffffff;
-    mac_entry->link_lifetime = 0xffffffff;
-    ws_neighbor_class_entry_t *ws_neigh = ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, mac_entry->index);
-    if (!ws_neigh) {
-        return;
-    }
-
-    interface->ws_info->eapol_tx_index = mac_entry->index;
-}
-
-ws_neighbor_class_entry_t *ws_bootstrap_eapol_tx_temporary_set(struct protocol_interface_info_entry *interface, const uint8_t *src64)
-{
-    mlme_device_descriptor_t device_desc;
-    mac_neighbor_table_entry_t *mac_entry = mac_neighbor_table_attribute_discover(mac_neighbor_info(interface), interface->ws_info->eapol_tx_index);
-    if (!mac_entry) {
-        return NULL;
-    }
-
-    memcpy(mac_entry->mac64, src64, 8);
-    mac_helper_device_description_write(interface, &device_desc, src64, 0xffff, 0, false);
-    mac_helper_devicetable_direct_set(interface->mac_api, &device_desc, mac_entry->index);
-    return ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, mac_entry->index);
-}
-
-void ws_bootstrap_eapol_tx_temporary_clear(struct protocol_interface_info_entry *interface)
-{
-    mac_neighbor_table_entry_t *mac_entry = mac_neighbor_table_attribute_discover(mac_neighbor_info(interface), interface->ws_info->eapol_tx_index);
-    if (!mac_entry) {
-        return;
-    }
-
-    memset(mac_entry->mac64, 0xff, 8);
-    mac_helper_devicetable_remove(interface->mac_api, interface->ws_info->eapol_tx_index, NULL);
-}
-
 static void ws_bootstrap_neighbor_list_clean(struct protocol_interface_info_entry *interface)
 {
 
     mac_neighbor_table_neighbor_list_clean(mac_neighbor_info(interface));
-    //Allocate EAPOL TX temporary neigh entries
-    ws_bootstap_eapol_neigh_entry_allocate(interface);
 }
 
 static void ws_address_reregister_trig(struct protocol_interface_info_entry *interface)
@@ -560,14 +514,19 @@ static fhss_ws_neighbor_timing_info_t *ws_get_neighbor_info(const fhss_api_t *ap
         return NULL;
     }
     mac_neighbor_table_entry_t *mac_neighbor = mac_neighbor_table_address_discover(mac_neighbor_info(cur), eui64, MAC_ADDR_MODE_64_BIT);
-    if (!mac_neighbor) {
-        return NULL;
+    if (mac_neighbor) {
+        ws_neighbor_class_entry_t *ws_neighbor =  ws_neighbor_class_entry_get(&cur->ws_info->neighbor_storage, mac_neighbor->index);
+        if (!ws_neighbor) {
+            return NULL;
+        }
+        return &ws_neighbor->fhss_data;
     }
-    ws_neighbor_class_entry_t *ws_neighbor =  ws_neighbor_class_entry_get(&cur->ws_info->neighbor_storage, mac_neighbor->index);
-    if (!ws_neighbor) {
+    //Discover temporary entry
+    ws_neighbor_temp_class_t *temp_entry = ws_llc_get_eapol_temp_entry(cur, eui64);
+    if (!temp_entry) {
         return NULL;
     }
-    return &ws_neighbor->fhss_data;
+    return &temp_entry->neigh_info_list.fhss_data;
 }
 static void ws_bootstrap_llc_hopping_update(struct protocol_interface_info_entry *cur, const fhss_ws_configuration_t *fhss_configuration)
 {
@@ -2082,11 +2041,6 @@ static void ws_bootstrap_neighbor_table_clean(struct protocol_interface_info_ent
     ns_list_foreach_safe(mac_neighbor_table_entry_t, cur, &mac_neighbor_info(interface)->neighbour_list) {
         ws_neighbor_class_entry_t *ws_neighbor = ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, cur->index);
 
-        if (cur->index == interface->ws_info->eapol_tx_index) {
-            //Skip EAPOL temp entries
-            continue;
-        }
-
         if (cur->link_role == PRIORITY_PARENT_NEIGHBOUR) {
             //This is our primary parent we cannot delete
             continue;
diff --git a/source/6LoWPAN/ws/ws_bootstrap.h b/source/6LoWPAN/ws/ws_bootstrap.h
index 535092501d3..a1a5451e8dc 100644
--- a/source/6LoWPAN/ws/ws_bootstrap.h
+++ b/source/6LoWPAN/ws/ws_bootstrap.h
@@ -91,10 +91,6 @@ bool ws_bootstrap_validate_channel_plan(struct ws_us_ie *ws_us, struct protocol_
 
 bool ws_bootstrap_validate_channel_function(struct ws_us_ie *ws_us, struct ws_bs_ie *ws_bs);
 
-struct ws_neighbor_class_entry *ws_bootstrap_eapol_tx_temporary_set(struct protocol_interface_info_entry *interface, const uint8_t *src64);
-
-void ws_bootstrap_eapol_tx_temporary_clear(struct protocol_interface_info_entry *interface);
-
 void ws_bootstrap_neighbor_set_stable(struct protocol_interface_info_entry *interface, const uint8_t *src64);
 
 int ws_bootstrap_stack_info_get(protocol_interface_info_entry_t *cur, struct ws_stack_info *info_ptr);
diff --git a/source/6LoWPAN/ws/ws_common.h b/source/6LoWPAN/ws/ws_common.h
index e6a354fb181..c93ba400ebe 100644
--- a/source/6LoWPAN/ws/ws_common.h
+++ b/source/6LoWPAN/ws/ws_common.h
@@ -89,7 +89,6 @@ typedef struct ws_info_s {
     trickle_params_t trickle_params_pan_discovery;
     uint8_t rpl_state; // state from rpl_event_t
     uint8_t pas_requests; // Amount of PAN solicits sent
-    uint8_t eapol_tx_index;
     uint8_t device_min_sens; // Device min sensitivity set by the application
     int8_t weakest_received_rssi; // Weakest received signal (dBm)
     parent_info_t parent_info[WS_PARENT_LIST_SIZE];
diff --git a/source/6LoWPAN/ws/ws_llc.h b/source/6LoWPAN/ws/ws_llc.h
index e7df162ae49..3fc2a195527 100644
--- a/source/6LoWPAN/ws/ws_llc.h
+++ b/source/6LoWPAN/ws/ws_llc.h
@@ -232,6 +232,10 @@ bool ws_llc_eapol_relay_forward_filter(struct protocol_interface_info_entry *int
 
 ws_neighbor_temp_class_t *ws_llc_get_multicast_temp_entry(struct protocol_interface_info_entry *interface, const uint8_t *mac64);
 
+ws_neighbor_temp_class_t *ws_llc_get_eapol_temp_entry(struct protocol_interface_info_entry *interface, const uint8_t *mac64);
+
+
+
 void ws_llc_free_multicast_temp_entry(struct protocol_interface_info_entry *interface, ws_neighbor_temp_class_t *neighbor);
 
 #endif /* WS_LLC_H_ */
diff --git a/source/6LoWPAN/ws/ws_llc_data_service.c b/source/6LoWPAN/ws/ws_llc_data_service.c
index 9004e4002f2..3ec99557331 100644
--- a/source/6LoWPAN/ws/ws_llc_data_service.c
+++ b/source/6LoWPAN/ws/ws_llc_data_service.c
@@ -463,17 +463,12 @@ static llc_data_base_t *ws_llc_base_allocate(void)
     return base;
 }
 
-static void ws_llc_mac_eapol_clear(llc_data_base_t *base, llc_message_t *message)
+static void ws_llc_mac_eapol_clear(llc_data_base_t *base)
 {
-    //Clear active EAPOL Session Count
+    //Clear active EAPOL Session
     if (base->temp_entries->active_eapol_session) {
         base->temp_entries->active_eapol_session = false;
     }
-
-    if (message->eapol_temporary) {
-        //Clear
-        ws_bootstrap_eapol_tx_temporary_clear(base->interface_ptr);
-    }
 }
 
 
@@ -495,8 +490,6 @@ static void ws_llc_mac_confirm_cb(const mac_api_t *api, const mcps_data_conf_t *
     uint8_t messsage_type = message->messsage_type;
     uint8_t mpx_user_handle = message->mpx_user_handle;
     if (message->eapol_temporary) {
-        //Clear
-        ws_bootstrap_eapol_tx_temporary_clear(interface);
 
         if (data->status == MLME_SUCCESS || data->status == MLME_NO_DATA) {
             //Update timeout
@@ -1182,17 +1175,6 @@ static void ws_llc_mpx_eapol_send(llc_data_base_t *base, llc_message_t *message)
     ws_neighbor_temp_class_t *temp_neigh = ws_llc_discover_temp_entry(&base->temp_entries->active_eapol_temp_neigh, message->dst_address);
 
     if (temp_neigh) {
-        //Discover Free MAC &Wi-sun tx entry
-        ws_neighbor_class_entry_t *entry = ws_bootstrap_eapol_tx_temporary_set(base->interface_ptr, message->dst_address);
-        if (!entry) {
-            //No temp entry add to pending list
-            //Move to pending list
-            ns_list_add_to_end(&base->temp_entries->llc_eap_pending_list, message);
-            base->temp_entries->llc_eap_pending_list_size++;
-            random_early_detetction_aq_calc(base->interface_ptr->llc_eapol_random_early_detection, base->temp_entries->llc_eap_pending_list_size);
-            return;
-        }
-        *entry = temp_neigh->neigh_info_list;
         message->eapol_temporary = true;
     } else {
         message->eapol_temporary = false;
@@ -1386,7 +1368,7 @@ static uint8_t ws_llc_mpx_data_purge_request(const mpx_api_t *api, struct mcps_p
     purge_status = base->interface_ptr->mac_api->mcps_purge_req(base->interface_ptr->mac_api, &purge_req);
     if (purge_status == 0) {
         if (message->messsage_type == WS_FT_EAPOL) {
-            ws_llc_mac_eapol_clear(base, message);
+            ws_llc_mac_eapol_clear(base);
         }
         llc_message_free(message, base);
     }
@@ -1423,7 +1405,7 @@ static void ws_llc_clean(llc_data_base_t *base)
     ns_list_foreach_safe(llc_message_t, message, &base->llc_message_list) {
         purge_req.msduHandle = message->msg_handle;
         if (message->messsage_type == WS_FT_EAPOL) {
-            ws_llc_mac_eapol_clear(base, message);
+            ws_llc_mac_eapol_clear(base);
         }
         llc_message_free(message, base);
         base->interface_ptr->mac_api->mcps_purge_req(base->interface_ptr->mac_api, &purge_req);
@@ -1500,6 +1482,16 @@ ws_neighbor_temp_class_t *ws_llc_get_multicast_temp_entry(protocol_interface_inf
     return ws_llc_discover_temp_entry(&base->temp_entries->active_multicast_temp_neigh, mac64);
 }
 
+ws_neighbor_temp_class_t *ws_llc_get_eapol_temp_entry(struct protocol_interface_info_entry *interface, const uint8_t *mac64)
+{
+    llc_data_base_t *base = ws_llc_discover_by_interface(interface);
+    if (!base) {
+        return NULL;
+    }
+
+    return ws_llc_discover_temp_entry(&base->temp_entries->active_eapol_temp_neigh, mac64);
+}
+
 
 static void ws_init_temporary_neigh_data(ws_neighbor_temp_class_t *entry, const uint8_t *mac64)
 {
diff --git a/test/nanostack/unittest/stub/ws_bootstrap_stub.c b/test/nanostack/unittest/stub/ws_bootstrap_stub.c
index c108e8f4090..a7f07aaade2 100644
--- a/test/nanostack/unittest/stub/ws_bootstrap_stub.c
+++ b/test/nanostack/unittest/stub/ws_bootstrap_stub.c
@@ -136,16 +136,6 @@ bool ws_bootstrap_validate_channel_function(ws_us_ie_t *ws_us, ws_bs_ie_t *ws_bs
     return true;
 }
 
-struct ws_neighbor_class_entry *ws_bootstrap_eapol_tx_temporary_set(struct protocol_interface_info_entry *interface, const uint8_t *src64)
-{
-    return NULL;
-}
-
-void ws_bootstrap_eapol_tx_temporary_clear(struct protocol_interface_info_entry *interface)
-{
-
-}
-
 int ws_bootstrap_stack_info_get(protocol_interface_info_entry_t *cur, struct ws_stack_info *info_ptr)
 {
     return 0;

From 3aeb2af77c9b3e2489c8b0ea0868715f20040470 Mon Sep 17 00:00:00 2001
From: Jarkko Paso <jarkko.paso@arm.com>
Date: Fri, 14 May 2021 09:53:49 +0300
Subject: [PATCH 17/43] Statistics for data request latencies (#2629)

* Adaptation layer TX latency statistics

* MAC data request TX latency statistics

* Updated change log
---
 CHANGELOG.md                                  |  2 +-
 nanostack/mac_api.h                           |  1 +
 nanostack/nwk_stats_api.h                     |  1 +
 source/6LoWPAN/adaptation_interface.c         | 14 ++++++++++++--
 source/Core/include/ns_buffer.h               |  1 +
 source/MAC/IEEE802_15_4/mac_data_buffer.h     |  1 +
 source/MAC/IEEE802_15_4/mac_mcps_sap.c        |  7 +++++++
 source/MAC/IEEE802_15_4/sw_mac.c              |  5 +++++
 source/MAC/IEEE802_15_4/sw_mac_internal.h     |  1 +
 source/NWK_INTERFACE/Include/protocol_stats.h |  3 ++-
 source/NWK_INTERFACE/protocol_stats.c         |  5 +++++
 11 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1cab509dbb..634048781ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@
 * Adaptation layer removes oldest packets first when stack needs to release memory or reduce traffic
 
 ### Changes
-* 
+* Statistics for MAC data request latencies. Separated to adaptation layer and MAC queueing delays.
 
 ### Bug fixes
 * Added ignoring of retry messages from RADIUS server when waiting EAP-TLS
diff --git a/nanostack/mac_api.h b/nanostack/mac_api.h
index bc5b13fcef5..8f49a79d711 100644
--- a/nanostack/mac_api.h
+++ b/nanostack/mac_api.h
@@ -325,6 +325,7 @@ typedef struct mac_statistics_s {
     uint32_t mac_retry_count;           /**< MAC TX retry count. */
     uint32_t mac_cca_attempts_count;    /**< MAC CCA attempts count. */
     uint32_t mac_failed_cca_count;      /**< MAC failed CCA count. */
+    uint32_t mac_tx_latency_max;        /**< MAC data request max latency. */
 } mac_statistics_t;
 
 #ifdef __cplusplus
diff --git a/nanostack/nwk_stats_api.h b/nanostack/nwk_stats_api.h
index a59d062e430..d1c71cfd7bf 100644
--- a/nanostack/nwk_stats_api.h
+++ b/nanostack/nwk_stats_api.h
@@ -74,6 +74,7 @@ typedef struct nwk_stats_t {
     uint16_t adapt_layer_tx_queue_size; /**< Adaptation layer direct TX queue size. */
     uint16_t adapt_layer_tx_queue_peak; /**< Adaptation layer direct TX queue size peak. */
     uint32_t adapt_layer_tx_congestion_drop; /**< Adaptation layer direct TX randon early detection drop packet. */
+    uint16_t adapt_layer_tx_latency_max; /**< Adaptation layer latency between TX request and TX ready in seconds (MAX). */
 } nwk_stats_t;
 
 /**
diff --git a/source/6LoWPAN/adaptation_interface.c b/source/6LoWPAN/adaptation_interface.c
index eb6341e6502..e2e3ce6f97e 100644
--- a/source/6LoWPAN/adaptation_interface.c
+++ b/source/6LoWPAN/adaptation_interface.c
@@ -1309,7 +1309,13 @@ int8_t lowpan_adaptation_interface_tx(protocol_interface_info_entry_t *cur, buff
     if (!interface_ptr) {
         goto tx_error_handler;
     }
-
+    // Set TX start timestamp
+    if (!buf->adaptation_timestamp) {
+        buf->adaptation_timestamp = protocol_core_monotonic_time;
+        if (!buf->adaptation_timestamp) {
+            buf->adaptation_timestamp--;
+        }
+    }
     uint8_t traffic_class = buf->options.traffic_class >> IP_TCLASS_DSCP_SHIFT;
 
     if (traffic_class == IP_DSCP_EF) {
@@ -1549,9 +1555,13 @@ int8_t lowpan_adaptation_interface_tx_confirm(protocol_interface_info_entry_t *c
         tr_error("No data request for this confirmation %u", confirm->msduHandle);
         return -1;
     }
-    //Check status for
     buffer_t *buf = tx_ptr->buf;
 
+    // Update adaptation layer latency for unicast packets. Given as seconds.
+    if (buf->link_specific.ieee802_15_4.requestAck && buf->adaptation_timestamp) {
+        protocol_stats_update(STATS_AL_TX_LATENCY, ((protocol_core_monotonic_time - buf->adaptation_timestamp) + 5) / 10);
+    }
+
     //Indirect data expiration
     if (confirm->status == MLME_TRANSACTION_EXPIRED && !active_direct_confirm) {
         if (buf->link_specific.ieee802_15_4.indirectTTL > 7000) {
diff --git a/source/Core/include/ns_buffer.h b/source/Core/include/ns_buffer.h
index 42defbc3cde..0447aa1a997 100644
--- a/source/Core/include/ns_buffer.h
+++ b/source/Core/include/ns_buffer.h
@@ -218,6 +218,7 @@ typedef struct buffer {
     bool                rpl_instance_known: 1;
     bool                ip_routed_up: 1;
     uint8_t             rpl_flag_error;
+    uint32_t            adaptation_timestamp;   /*!< Timestamp when buffer pushed to adaptation interface. Unit 100ms */
     //uint8_t             bc_sending_superframe;  /*FHSS uses this randomly chosen superframe to send this packet (if broadcast)*/
     //uint8_t             fhss_channel_retries_left;
     //uint8_t             ip_transmission_prev_seq;  /*!< XXX: this stores the data packet seq. number, which is needed for re-transmission. */
diff --git a/source/MAC/IEEE802_15_4/mac_data_buffer.h b/source/MAC/IEEE802_15_4/mac_data_buffer.h
index ec694540da0..80f36b6b2c1 100644
--- a/source/MAC/IEEE802_15_4/mac_data_buffer.h
+++ b/source/MAC/IEEE802_15_4/mac_data_buffer.h
@@ -100,6 +100,7 @@ typedef struct mac_pre_build_frame {
     uint16_t blacklist_period_ms;
     uint16_t initial_tx_channel;
     uint32_t tx_time;
+    uint32_t request_start_time_us;
     bool upper_layer_request: 1;
     bool mac_allocated_payload_ptr: 1;
     bool asynch_request: 1;
diff --git a/source/MAC/IEEE802_15_4/mac_mcps_sap.c b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
index 9d65c24e6fa..12d8979fae7 100644
--- a/source/MAC/IEEE802_15_4/mac_mcps_sap.c
+++ b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
@@ -383,6 +383,8 @@ void mcps_sap_data_req_handler_ext(protocol_interface_rf_mac_setup_s *rf_mac_set
     buffer->tx_request_restart_cnt = rf_mac_setup->tx_failure_restart_max;
     //check that header + payload length is not bigger than MAC MTU
 
+    buffer->request_start_time_us = mac_mcps_sap_get_phy_timestamp(rf_mac_setup);
+
     if (data_req->InDirectTx) {
         mac_indirect_queue_write(rf_mac_setup, buffer);
     } else {
@@ -1630,6 +1632,11 @@ static void mcps_data_confirm_handle(protocol_interface_rf_mac_setup_s *rf_ptr,
         confirm.timestamp = 0;
     }
 
+    if (buffer->fcf_dsn.ackRequested) {
+        // Update latency for unicast packets. Given as milliseconds.
+        sw_mac_stats_update(rf_ptr, STAT_MAC_TX_LATENCY, ((mac_mcps_sap_get_phy_timestamp(rf_ptr) - buffer->request_start_time_us) + 500) / 1000);
+    }
+
     if (buffer->upper_layer_request) {
         //Check tunnel
         mcps_sap_prebuild_frame_buffer_free(buffer);
diff --git a/source/MAC/IEEE802_15_4/sw_mac.c b/source/MAC/IEEE802_15_4/sw_mac.c
index 7e287ee5148..46c65021d05 100644
--- a/source/MAC/IEEE802_15_4/sw_mac.c
+++ b/source/MAC/IEEE802_15_4/sw_mac.c
@@ -765,6 +765,11 @@ void sw_mac_stats_update(protocol_interface_rf_mac_setup_s *setup, mac_stats_typ
             case STAT_MAC_TX_CCA_FAIL:
                 setup->mac_statistics->mac_failed_cca_count++;
                 break;
+            case STAT_MAC_TX_LATENCY:
+                if (update_val > setup->mac_statistics->mac_tx_latency_max) {
+                    setup->mac_statistics->mac_tx_latency_max = update_val;
+                }
+                break;
         }
     }
 }
diff --git a/source/MAC/IEEE802_15_4/sw_mac_internal.h b/source/MAC/IEEE802_15_4/sw_mac_internal.h
index b661c9628ce..44877527fb7 100644
--- a/source/MAC/IEEE802_15_4/sw_mac_internal.h
+++ b/source/MAC/IEEE802_15_4/sw_mac_internal.h
@@ -35,6 +35,7 @@ typedef enum {
     STAT_MAC_TX_RETRY,
     STAT_MAC_TX_CCA_ATT,
     STAT_MAC_TX_CCA_FAIL,
+    STAT_MAC_TX_LATENCY
 } mac_stats_type_t;
 
 typedef enum arm_nwk_timer_id {
diff --git a/source/NWK_INTERFACE/Include/protocol_stats.h b/source/NWK_INTERFACE/Include/protocol_stats.h
index 193a9538e9a..00f6c508e79 100644
--- a/source/NWK_INTERFACE/Include/protocol_stats.h
+++ b/source/NWK_INTERFACE/Include/protocol_stats.h
@@ -45,7 +45,8 @@ typedef enum {
     STATS_ETX_1ST_PARENT,
     STATS_ETX_2ND_PARENT,
     STATS_AL_TX_QUEUE_SIZE,
-    STATS_AL_TX_CONGESTION_DROP
+    STATS_AL_TX_CONGESTION_DROP,
+    STATS_AL_TX_LATENCY
 
 } nwk_stats_type_t;
 
diff --git a/source/NWK_INTERFACE/protocol_stats.c b/source/NWK_INTERFACE/protocol_stats.c
index 074dc079519..6ef7ea7ecff 100644
--- a/source/NWK_INTERFACE/protocol_stats.c
+++ b/source/NWK_INTERFACE/protocol_stats.c
@@ -155,6 +155,11 @@ void protocol_stats_update(nwk_stats_type_t type, uint16_t update_val)
             case STATS_AL_TX_CONGESTION_DROP:
                 nwk_stats_ptr->adapt_layer_tx_congestion_drop++;
                 break;
+            case STATS_AL_TX_LATENCY:
+                if (update_val > nwk_stats_ptr->adapt_layer_tx_latency_max) {
+                    nwk_stats_ptr->adapt_layer_tx_latency_max = update_val;
+                }
+                break;
         }
     }
 }

From 933c0bbf0a6b18d60b67e787a0a0975b71a6b011 Mon Sep 17 00:00:00 2001
From: Arto Kinnunen <arto.kinnunen@arm.com>
Date: Fri, 14 May 2021 12:48:33 +0300
Subject: [PATCH 18/43] Update copyright

Change company name from ARM to Pelion.
---
 nanostack/cca_api.h                           |  2 +-
 nanostack/ccmLIB.h                            |  2 +-
 nanostack/dhcp_service_api.h                  |  2 +-
 nanostack/ethernet_mac_api.h                  |  2 +-
 nanostack/fhss_api.h                          |  2 +-
 nanostack/fhss_config.h                       |  2 +-
 nanostack/fhss_test_api.h                     |  2 +-
 nanostack/fhss_ws_extension.h                 |  2 +-
 nanostack/mac_api.h                           |  2 +-
 nanostack/mac_common_defines.h                |  2 +-
 nanostack/mac_filter_api.h                    |  2 +-
 nanostack/mac_mcps.h                          |  2 +-
 nanostack/mlme.h                              |  2 +-
 nanostack/multicast_api.h                     |  2 +-
 nanostack/net_6lowpan_parameter_api.h         |  2 +-
 nanostack/net_address_extension.h             |  2 +-
 nanostack/net_fhss.h                          |  2 +-
 nanostack/net_interface.h                     |  2 +-
 nanostack/net_ipv6_api.h                      |  2 +-
 nanostack/net_load_balance_api.h              |  2 +-
 nanostack/net_mle_api.h                       |  2 +-
 nanostack/net_nvm_api.h                       |  2 +-
 nanostack/net_nwk_scan.h                      |  2 +-
 nanostack/net_pana_parameters_api.h           |  2 +-
 nanostack/net_polling_api.h                   |  2 +-
 nanostack/net_rpl.h                           |  2 +-
 nanostack/net_sleep.h                         |  2 +-
 nanostack/net_test_api.h                      |  2 +-
 nanostack/net_thread_test.h                   |  2 +-
 nanostack/net_ws_test.h                       |  2 +-
 nanostack/ns_address.h                        |  2 +-
 nanostack/ns_conf.h                           |  2 +-
 nanostack/ns_file_system.h                    |  2 +-
 nanostack/ns_mdns_api.h                       |  2 +-
 nanostack/ns_sha256.h                         |  2 +-
 nanostack/ns_time_api.h                       |  2 +-
 nanostack/ns_virtual_rf_api.h                 |  2 +-
 nanostack/nwk_stats_api.h                     |  2 +-
 nanostack/platform/arm_hal_aes.h              |  2 +-
 nanostack/platform/arm_hal_phy.h              |  2 +-
 nanostack/platform/os_whiteboard.h            |  2 +-
 nanostack/platform/topo_trace.h               |  2 +-
 nanostack/serial_mac_api.h                    |  2 +-
 nanostack/shalib.h                            |  2 +-
 nanostack/socket_api.h                        |  2 +-
 nanostack/sw_mac.h                            |  2 +-
 nanostack/thread_bbr_api.h                    |  2 +-
 nanostack/thread_border_router_api.h          |  2 +-
 nanostack/thread_commissioning_api.h          |  2 +-
 nanostack/thread_dhcpv6_server.h              |  2 +-
 nanostack/thread_diagcop_lib.h                |  2 +-
 nanostack/thread_lowpower_api.h               |  2 +-
 nanostack/thread_management_api.h             |  2 +-
 nanostack/thread_management_if.h              |  2 +-
 nanostack/thread_meshcop_lib.h                |  2 +-
 nanostack/thread_net_config_api.h             |  2 +-
 nanostack/whiteboard_api.h                    |  2 +-
 nanostack/ws_bbr_api.h                        |  2 +-
 nanostack/ws_management_api.h                 |  2 +-
 .../6LoWPAN/Bootstraps/Generic/network_lib.c  |  2 +-
 .../Bootstraps/Generic/protocol_6lowpan.c     |  2 +-
 .../Generic/protocol_6lowpan_bootstrap.c      |  2 +-
 .../Generic/protocol_6lowpan_interface.c      |  2 +-
 source/6LoWPAN/Bootstraps/network_lib.h       |  2 +-
 source/6LoWPAN/Bootstraps/protocol_6lowpan.h  |  2 +-
 .../Bootstraps/protocol_6lowpan_bootstrap.h   |  2 +-
 .../Bootstraps/protocol_6lowpan_interface.h   |  2 +-
 .../6LoWPAN/Fragmentation/cipv6_fragmenter.c  |  2 +-
 .../6LoWPAN/Fragmentation/cipv6_fragmenter.h  |  2 +-
 source/6LoWPAN/IPHC_Decode/6lowpan_iphc.c     |  2 +-
 source/6LoWPAN/IPHC_Decode/cipv6.h            |  2 +-
 source/6LoWPAN/IPHC_Decode/iphc_compress.c    |  2 +-
 source/6LoWPAN/IPHC_Decode/iphc_compress.h    |  2 +-
 source/6LoWPAN/IPHC_Decode/iphc_decompress.c  |  2 +-
 source/6LoWPAN/IPHC_Decode/iphc_decompress.h  |  2 +-
 source/6LoWPAN/IPHC_Decode/lowpan_context.c   |  2 +-
 source/6LoWPAN/IPHC_Decode/lowpan_context.h   |  2 +-
 source/6LoWPAN/MAC/beacon_handler.c           |  2 +-
 source/6LoWPAN/MAC/beacon_handler.h           |  2 +-
 source/6LoWPAN/MAC/mac_data_poll.c            |  2 +-
 source/6LoWPAN/MAC/mac_data_poll.h            |  2 +-
 source/6LoWPAN/MAC/mac_helper.c               |  2 +-
 source/6LoWPAN/MAC/mac_helper.h               |  2 +-
 source/6LoWPAN/MAC/mac_ie_lib.c               |  2 +-
 source/6LoWPAN/MAC/mac_ie_lib.h               |  2 +-
 source/6LoWPAN/MAC/mac_pairwise_key.c         |  2 +-
 source/6LoWPAN/MAC/mac_pairwise_key.h         |  2 +-
 source/6LoWPAN/MAC/mac_response_handler.c     |  2 +-
 source/6LoWPAN/MAC/mac_response_handler.h     |  2 +-
 source/6LoWPAN/MAC/mpx_api.h                  |  2 +-
 source/6LoWPAN/Mesh/mesh.c                    |  2 +-
 source/6LoWPAN/Mesh/mesh.h                    |  2 +-
 source/6LoWPAN/ND/nd_defines.h                |  2 +-
 source/6LoWPAN/ND/nd_router_object.c          |  2 +-
 source/6LoWPAN/ND/nd_router_object.h          |  2 +-
 source/6LoWPAN/NVM/nwk_nvm.c                  |  2 +-
 source/6LoWPAN/NVM/nwk_nvm.h                  |  2 +-
 source/6LoWPAN/Thread/thread_bbr_api.c        |  2 +-
 .../6LoWPAN/Thread/thread_bbr_api_internal.h  |  2 +-
 source/6LoWPAN/Thread/thread_bbr_commercial.c |  2 +-
 source/6LoWPAN/Thread/thread_bbr_commercial.h |  2 +-
 source/6LoWPAN/Thread/thread_beacon.c         |  2 +-
 source/6LoWPAN/Thread/thread_beacon.h         |  2 +-
 source/6LoWPAN/Thread/thread_bootstrap.c      |  2 +-
 source/6LoWPAN/Thread/thread_bootstrap.h      |  2 +-
 .../6LoWPAN/Thread/thread_border_router_api.c |  2 +-
 .../thread_border_router_api_internal.h       |  2 +-
 source/6LoWPAN/Thread/thread_ccm.c            |  2 +-
 source/6LoWPAN/Thread/thread_ccm.h            |  2 +-
 .../6LoWPAN/Thread/thread_commissioning_api.c |  2 +-
 .../6LoWPAN/Thread/thread_commissioning_if.c  |  2 +-
 .../6LoWPAN/Thread/thread_commissioning_if.h  |  2 +-
 source/6LoWPAN/Thread/thread_common.c         |  2 +-
 source/6LoWPAN/Thread/thread_common.h         |  2 +-
 source/6LoWPAN/Thread/thread_config.h         |  2 +-
 source/6LoWPAN/Thread/thread_constants.h      |  2 +-
 source/6LoWPAN/Thread/thread_dhcpv6_server.c  |  2 +-
 source/6LoWPAN/Thread/thread_dhcpv6_server.h  |  2 +-
 source/6LoWPAN/Thread/thread_diagnostic.c     |  2 +-
 source/6LoWPAN/Thread/thread_diagnostic.h     |  2 +-
 source/6LoWPAN/Thread/thread_discovery.c      |  2 +-
 source/6LoWPAN/Thread/thread_discovery.h      |  2 +-
 source/6LoWPAN/Thread/thread_host_bootstrap.c |  2 +-
 source/6LoWPAN/Thread/thread_host_bootstrap.h |  2 +-
 .../Thread/thread_joiner_application.c        |  2 +-
 .../Thread/thread_joiner_application.h        |  2 +-
 source/6LoWPAN/Thread/thread_leader_service.c |  2 +-
 source/6LoWPAN/Thread/thread_leader_service.h |  2 +-
 source/6LoWPAN/Thread/thread_lowpower_api.c   |  2 +-
 .../Thread/thread_lowpower_private_api.c      |  2 +-
 .../Thread/thread_lowpower_private_api.h      |  2 +-
 source/6LoWPAN/Thread/thread_management_api.c |  2 +-
 .../6LoWPAN/Thread/thread_management_client.c |  2 +-
 .../6LoWPAN/Thread/thread_management_client.h |  2 +-
 source/6LoWPAN/Thread/thread_management_if.c  |  2 +-
 .../Thread/thread_management_internal.h       |  2 +-
 .../6LoWPAN/Thread/thread_management_server.c |  2 +-
 .../6LoWPAN/Thread/thread_management_server.h |  2 +-
 source/6LoWPAN/Thread/thread_mdns.c           |  2 +-
 source/6LoWPAN/Thread/thread_mdns.h           |  2 +-
 source/6LoWPAN/Thread/thread_meshcop_lib.c    |  2 +-
 .../Thread/thread_mle_message_handler.c       |  2 +-
 .../Thread/thread_mle_message_handler.h       |  2 +-
 source/6LoWPAN/Thread/thread_nd.c             |  2 +-
 source/6LoWPAN/Thread/thread_nd.h             |  2 +-
 source/6LoWPAN/Thread/thread_neighbor_class.c |  2 +-
 source/6LoWPAN/Thread/thread_neighbor_class.h |  2 +-
 source/6LoWPAN/Thread/thread_net_config_api.c |  2 +-
 .../6LoWPAN/Thread/thread_network_data_lib.c  |  2 +-
 .../6LoWPAN/Thread/thread_network_data_lib.h  |  2 +-
 .../Thread/thread_network_data_storage.c      |  2 +-
 .../Thread/thread_network_data_storage.h      |  2 +-
 source/6LoWPAN/Thread/thread_network_synch.c  |  2 +-
 source/6LoWPAN/Thread/thread_network_synch.h  |  2 +-
 source/6LoWPAN/Thread/thread_nvm_store.c      |  2 +-
 source/6LoWPAN/Thread/thread_nvm_store.h      |  2 +-
 .../6LoWPAN/Thread/thread_resolution_client.c |  2 +-
 .../6LoWPAN/Thread/thread_resolution_client.h |  2 +-
 .../6LoWPAN/Thread/thread_resolution_server.c |  2 +-
 .../6LoWPAN/Thread/thread_resolution_server.h |  2 +-
 .../6LoWPAN/Thread/thread_router_bootstrap.c  |  2 +-
 .../6LoWPAN/Thread/thread_router_bootstrap.h  |  2 +-
 source/6LoWPAN/Thread/thread_routing.c        |  2 +-
 source/6LoWPAN/Thread/thread_routing.h        |  2 +-
 source/6LoWPAN/Thread/thread_test_api.c       |  2 +-
 source/6LoWPAN/Thread/thread_tmfcop_lib.h     |  2 +-
 source/6LoWPAN/adaptation_interface.c         |  2 +-
 source/6LoWPAN/lowpan_adaptation_interface.h  |  2 +-
 source/6LoWPAN/ws/ws_bbr_api.c                |  2 +-
 source/6LoWPAN/ws/ws_bbr_api_internal.h       |  2 +-
 source/6LoWPAN/ws/ws_bootstrap.c              |  2 +-
 source/6LoWPAN/ws/ws_bootstrap.h              |  2 +-
 source/6LoWPAN/ws/ws_cfg_settings.c           |  2 +-
 source/6LoWPAN/ws/ws_cfg_settings.h           |  2 +-
 source/6LoWPAN/ws/ws_common.c                 |  2 +-
 source/6LoWPAN/ws/ws_common.h                 |  2 +-
 source/6LoWPAN/ws/ws_common_defines.h         |  2 +-
 source/6LoWPAN/ws/ws_config.h                 |  2 +-
 source/6LoWPAN/ws/ws_eapol_auth_relay.c       |  2 +-
 source/6LoWPAN/ws/ws_eapol_auth_relay.h       |  2 +-
 source/6LoWPAN/ws/ws_eapol_pdu.c              |  2 +-
 source/6LoWPAN/ws/ws_eapol_pdu.h              |  2 +-
 source/6LoWPAN/ws/ws_eapol_relay.c            |  2 +-
 source/6LoWPAN/ws/ws_eapol_relay.h            |  2 +-
 source/6LoWPAN/ws/ws_eapol_relay_lib.c        |  2 +-
 source/6LoWPAN/ws/ws_eapol_relay_lib.h        |  2 +-
 source/6LoWPAN/ws/ws_empty_functions.c        |  2 +-
 source/6LoWPAN/ws/ws_ie_lib.c                 |  2 +-
 source/6LoWPAN/ws/ws_ie_lib.h                 |  2 +-
 source/6LoWPAN/ws/ws_llc.h                    |  2 +-
 source/6LoWPAN/ws/ws_llc_data_service.c       |  2 +-
 source/6LoWPAN/ws/ws_management_api.c         |  2 +-
 source/6LoWPAN/ws/ws_mpx_header.c             |  2 +-
 source/6LoWPAN/ws/ws_mpx_header.h             |  2 +-
 source/6LoWPAN/ws/ws_neighbor_class.c         |  2 +-
 source/6LoWPAN/ws/ws_neighbor_class.h         |  2 +-
 source/6LoWPAN/ws/ws_pae_auth.c               |  2 +-
 source/6LoWPAN/ws/ws_pae_auth.h               |  2 +-
 source/6LoWPAN/ws/ws_pae_controller.c         |  2 +-
 source/6LoWPAN/ws/ws_pae_controller.h         |  2 +-
 source/6LoWPAN/ws/ws_pae_key_storage.c        |  2 +-
 source/6LoWPAN/ws/ws_pae_key_storage.h        |  2 +-
 source/6LoWPAN/ws/ws_pae_lib.c                |  2 +-
 source/6LoWPAN/ws/ws_pae_lib.h                |  2 +-
 source/6LoWPAN/ws/ws_pae_nvm_data.c           |  2 +-
 source/6LoWPAN/ws/ws_pae_nvm_data.h           |  2 +-
 source/6LoWPAN/ws/ws_pae_nvm_store.c          |  2 +-
 source/6LoWPAN/ws/ws_pae_nvm_store.h          |  2 +-
 source/6LoWPAN/ws/ws_pae_supp.c               |  2 +-
 source/6LoWPAN/ws/ws_pae_supp.h               |  2 +-
 source/6LoWPAN/ws/ws_pae_time.c               |  2 +-
 source/6LoWPAN/ws/ws_pae_time.h               |  2 +-
 source/6LoWPAN/ws/ws_pae_timers.c             |  2 +-
 source/6LoWPAN/ws/ws_pae_timers.h             |  2 +-
 source/6LoWPAN/ws/ws_stats.c                  |  2 +-
 source/6LoWPAN/ws/ws_stats.h                  |  2 +-
 source/6LoWPAN/ws/ws_test_api.c               |  2 +-
 source/BorderRouter/border_router.c           |  2 +-
 source/BorderRouter/border_router.h           |  2 +-
 source/Common_Protocols/icmpv6.c              |  2 +-
 source/Common_Protocols/icmpv6.h              |  2 +-
 source/Common_Protocols/icmpv6_prefix.c       |  2 +-
 source/Common_Protocols/icmpv6_prefix.h       |  2 +-
 source/Common_Protocols/icmpv6_radv.c         |  2 +-
 source/Common_Protocols/icmpv6_radv.h         |  2 +-
 source/Common_Protocols/ip.h                  |  2 +-
 source/Common_Protocols/ipv6.c                |  2 +-
 source/Common_Protocols/ipv6.h                |  2 +-
 source/Common_Protocols/ipv6_constants.h      |  2 +-
 source/Common_Protocols/ipv6_flow.c           |  2 +-
 source/Common_Protocols/ipv6_flow.h           |  2 +-
 source/Common_Protocols/ipv6_fragmentation.c  |  2 +-
 source/Common_Protocols/ipv6_fragmentation.h  |  2 +-
 source/Common_Protocols/ipv6_resolution.c     |  2 +-
 source/Common_Protocols/ipv6_resolution.h     |  2 +-
 source/Common_Protocols/mld.c                 |  2 +-
 source/Common_Protocols/mld.h                 |  2 +-
 source/Common_Protocols/tcp.c                 |  2 +-
 source/Common_Protocols/tcp.h                 |  2 +-
 source/Common_Protocols/udp.c                 |  2 +-
 source/Common_Protocols/udp.h                 |  2 +-
 source/Core/buffer_dyn.c                      |  2 +-
 source/Core/include/ns_address_internal.h     |  2 +-
 source/Core/include/ns_buffer.h               |  2 +-
 source/Core/include/ns_error_types.h          |  2 +-
 source/Core/include/ns_monitor.h              |  2 +-
 source/Core/include/ns_socket.h               |  2 +-
 source/Core/include/sockbuf.h                 |  2 +-
 source/Core/ns_address_internal.c             |  2 +-
 source/Core/ns_monitor.c                      |  2 +-
 source/Core/ns_socket.c                       |  2 +-
 source/Core/sockbuf.c                         |  2 +-
 source/DHCPv6_Server/DHCPv6_Server_service.c  |  2 +-
 source/DHCPv6_Server/DHCPv6_server_service.h  |  2 +-
 source/DHCPv6_client/dhcpv6_client_api.h      |  2 +-
 source/DHCPv6_client/dhcpv6_client_service.c  |  2 +-
 source/MAC/IEEE802_15_4/mac_cca_threshold.c   |  2 +-
 source/MAC/IEEE802_15_4/mac_cca_threshold.h   |  2 +-
 source/MAC/IEEE802_15_4/mac_data_buffer.h     |  2 +-
 source/MAC/IEEE802_15_4/mac_defines.h         |  2 +-
 source/MAC/IEEE802_15_4/mac_fhss_callbacks.c  |  2 +-
 source/MAC/IEEE802_15_4/mac_fhss_callbacks.h  |  2 +-
 source/MAC/IEEE802_15_4/mac_filter.c          |  2 +-
 source/MAC/IEEE802_15_4/mac_filter.h          |  2 +-
 .../mac_header_helper_functions.c             |  2 +-
 .../mac_header_helper_functions.h             |  2 +-
 source/MAC/IEEE802_15_4/mac_indirect_data.c   |  2 +-
 source/MAC/IEEE802_15_4/mac_indirect_data.h   |  2 +-
 source/MAC/IEEE802_15_4/mac_mcps_sap.c        |  2 +-
 source/MAC/IEEE802_15_4/mac_mcps_sap.h        |  2 +-
 source/MAC/IEEE802_15_4/mac_mlme.c            |  2 +-
 source/MAC/IEEE802_15_4/mac_mlme.h            |  2 +-
 source/MAC/IEEE802_15_4/mac_pd_sap.c          |  2 +-
 source/MAC/IEEE802_15_4/mac_pd_sap.h          |  2 +-
 source/MAC/IEEE802_15_4/mac_security_mib.c    |  2 +-
 source/MAC/IEEE802_15_4/mac_security_mib.h    |  2 +-
 source/MAC/IEEE802_15_4/mac_timer.c           |  2 +-
 source/MAC/IEEE802_15_4/mac_timer.h           |  2 +-
 source/MAC/IEEE802_15_4/sw_mac.c              |  2 +-
 source/MAC/IEEE802_15_4/sw_mac_internal.h     |  2 +-
 source/MAC/ethernet/ethernet_mac_api.c        |  2 +-
 source/MAC/rf_driver_storage.c                |  2 +-
 source/MAC/rf_driver_storage.h                |  2 +-
 source/MAC/serial/serial_mac_api.c            |  2 +-
 source/MAC/virtual_rf/virtual_rf_client.c     |  2 +-
 source/MAC/virtual_rf/virtual_rf_defines.h    |  2 +-
 source/MAC/virtual_rf/virtual_rf_driver.c     |  2 +-
 source/MLE/mle.c                              |  2 +-
 source/MLE/mle.h                              |  2 +-
 source/MLE/mle_tlv.c                          |  2 +-
 source/MLE/mle_tlv.h                          |  2 +-
 source/MPL/mpl.c                              |  2 +-
 source/MPL/mpl.h                              |  2 +-
 source/NWK_INTERFACE/Include/protocol.h       |  2 +-
 .../NWK_INTERFACE/Include/protocol_abstract.h |  2 +-
 source/NWK_INTERFACE/Include/protocol_stats.h |  2 +-
 source/NWK_INTERFACE/Include/protocol_timer.h |  2 +-
 source/NWK_INTERFACE/protocol_core.c          |  2 +-
 source/NWK_INTERFACE/protocol_core_sleep.c    |  2 +-
 source/NWK_INTERFACE/protocol_stats.c         |  2 +-
 source/NWK_INTERFACE/protocol_timer.c         |  2 +-
 source/RPL/rpl_control.c                      |  2 +-
 source/RPL/rpl_control.h                      |  2 +-
 source/RPL/rpl_data.c                         |  2 +-
 source/RPL/rpl_data.h                         |  2 +-
 source/RPL/rpl_downward.c                     |  2 +-
 source/RPL/rpl_downward.h                     |  2 +-
 source/RPL/rpl_mrhof.c                        |  2 +-
 source/RPL/rpl_mrhof.h                        |  2 +-
 source/RPL/rpl_objective.c                    |  2 +-
 source/RPL/rpl_objective.h                    |  2 +-
 source/RPL/rpl_of0.c                          |  2 +-
 source/RPL/rpl_of0.h                          |  2 +-
 source/RPL/rpl_policy.c                       |  2 +-
 source/RPL/rpl_policy.h                       |  2 +-
 source/RPL/rpl_protocol.h                     |  2 +-
 source/RPL/rpl_structures.h                   |  2 +-
 source/RPL/rpl_upward.c                       |  2 +-
 source/RPL/rpl_upward.h                       |  2 +-
 source/Security/Common/sec_lib.h              |  2 +-
 source/Security/Common/sec_lib_definitions.h  |  2 +-
 source/Security/Common/security_lib.c         |  2 +-
 source/Security/PANA/eap_protocol.c           |  2 +-
 source/Security/PANA/eap_protocol.h           |  2 +-
 source/Security/PANA/pana.c                   |  2 +-
 source/Security/PANA/pana.h                   |  2 +-
 source/Security/PANA/pana_avp.c               |  2 +-
 source/Security/PANA/pana_avp.h               |  2 +-
 source/Security/PANA/pana_client.c            |  2 +-
 source/Security/PANA/pana_eap_header.c        |  2 +-
 source/Security/PANA/pana_eap_header.h        |  2 +-
 source/Security/PANA/pana_header.c            |  2 +-
 source/Security/PANA/pana_header.h            |  2 +-
 source/Security/PANA/pana_internal_api.h      |  2 +-
 source/Security/PANA/pana_nvm.h               |  2 +-
 source/Security/PANA/pana_relay_table.c       |  2 +-
 source/Security/PANA/pana_relay_table.h       |  2 +-
 source/Security/PANA/pana_server.c            |  2 +-
 source/Security/TLS/tls_ccm_crypt.c           |  2 +-
 source/Security/TLS/tls_ccm_crypt.h           |  2 +-
 source/Security/TLS/tls_lib.c                 |  2 +-
 source/Security/TLS/tls_lib.h                 |  2 +-
 source/Security/eapol/eapol_helper.c          |  2 +-
 source/Security/eapol/eapol_helper.h          |  2 +-
 source/Security/eapol/kde_helper.c            |  2 +-
 source/Security/eapol/kde_helper.h            |  2 +-
 source/Security/kmp/kmp_addr.c                |  2 +-
 source/Security/kmp/kmp_addr.h                |  2 +-
 source/Security/kmp/kmp_api.c                 |  2 +-
 source/Security/kmp/kmp_api.h                 |  2 +-
 source/Security/kmp/kmp_eapol_pdu_if.c        |  2 +-
 source/Security/kmp/kmp_eapol_pdu_if.h        |  2 +-
 source/Security/kmp/kmp_socket_if.c           |  2 +-
 source/Security/kmp/kmp_socket_if.h           |  2 +-
 .../eap_tls_sec_prot/auth_eap_tls_sec_prot.c  |  2 +-
 .../eap_tls_sec_prot/auth_eap_tls_sec_prot.h  |  2 +-
 .../eap_tls_sec_prot/eap_tls_sec_prot_lib.c   |  2 +-
 .../eap_tls_sec_prot/eap_tls_sec_prot_lib.h   |  2 +-
 .../radius_eap_tls_sec_prot.c                 |  2 +-
 .../radius_eap_tls_sec_prot.h                 |  2 +-
 .../eap_tls_sec_prot/supp_eap_tls_sec_prot.c  |  2 +-
 .../eap_tls_sec_prot/supp_eap_tls_sec_prot.h  |  2 +-
 .../fwh_sec_prot/auth_fwh_sec_prot.c          |  2 +-
 .../fwh_sec_prot/auth_fwh_sec_prot.h          |  2 +-
 .../fwh_sec_prot/supp_fwh_sec_prot.c          |  2 +-
 .../fwh_sec_prot/supp_fwh_sec_prot.h          |  2 +-
 .../gkh_sec_prot/auth_gkh_sec_prot.c          |  2 +-
 .../gkh_sec_prot/auth_gkh_sec_prot.h          |  2 +-
 .../gkh_sec_prot/supp_gkh_sec_prot.c          |  2 +-
 .../gkh_sec_prot/supp_gkh_sec_prot.h          |  2 +-
 .../protocols/key_sec_prot/key_sec_prot.c     |  2 +-
 .../protocols/key_sec_prot/key_sec_prot.h     |  2 +-
 .../protocols/radius_sec_prot/avp_helper.c    |  2 +-
 .../protocols/radius_sec_prot/avp_helper.h    |  2 +-
 .../radius_sec_prot/radius_client_sec_prot.c  |  2 +-
 .../radius_sec_prot/radius_client_sec_prot.h  |  2 +-
 source/Security/protocols/sec_prot.h          |  2 +-
 source/Security/protocols/sec_prot_certs.c    |  2 +-
 source/Security/protocols/sec_prot_certs.h    |  2 +-
 source/Security/protocols/sec_prot_cfg.h      |  2 +-
 source/Security/protocols/sec_prot_keys.c     |  2 +-
 source/Security/protocols/sec_prot_keys.h     |  2 +-
 source/Security/protocols/sec_prot_lib.c      |  2 +-
 source/Security/protocols/sec_prot_lib.h      |  2 +-
 .../protocols/tls_sec_prot/tls_sec_prot.c     |  2 +-
 .../protocols/tls_sec_prot/tls_sec_prot.h     |  2 +-
 .../protocols/tls_sec_prot/tls_sec_prot_lib.c |  2 +-
 .../protocols/tls_sec_prot/tls_sec_prot_lib.h |  2 +-
 source/Service_Libs/CCM_lib/ccm_security.c    |  2 +-
 .../Service_Libs/CCM_lib/mbedOS/aes_mbedtls.c |  2 +-
 .../CCM_lib/mbedOS/aes_mbedtls_adapter.c      |  2 +-
 .../Neighbor_cache/neighbor_cache.c           |  2 +-
 .../neighbor_table_definition.h               |  2 +-
 source/Service_Libs/SHA256_Lib/ns_sha256.c    |  2 +-
 source/Service_Libs/SHA256_Lib/shalib.c       |  2 +-
 source/Service_Libs/Trickle/trickle.c         |  2 +-
 source/Service_Libs/Trickle/trickle.h         |  2 +-
 source/Service_Libs/blacklist/blacklist.c     |  2 +-
 source/Service_Libs/blacklist/blacklist.h     |  2 +-
 source/Service_Libs/etx/etx.c                 |  2 +-
 source/Service_Libs/etx/etx.h                 |  2 +-
 source/Service_Libs/fhss/channel_functions.c  |  2 +-
 source/Service_Libs/fhss/channel_functions.h  |  2 +-
 source/Service_Libs/fhss/channel_list.c       |  2 +-
 source/Service_Libs/fhss/channel_list.h       |  2 +-
 source/Service_Libs/fhss/fhss.c               |  2 +-
 source/Service_Libs/fhss/fhss.h               |  2 +-
 source/Service_Libs/fhss/fhss_channel.c       |  2 +-
 source/Service_Libs/fhss/fhss_channel.h       |  2 +-
 source/Service_Libs/fhss/fhss_common.c        |  2 +-
 source/Service_Libs/fhss/fhss_common.h        |  2 +-
 .../fhss/fhss_configuration_interface.c       |  2 +-
 source/Service_Libs/fhss/fhss_statistics.c    |  2 +-
 source/Service_Libs/fhss/fhss_statistics.h    |  2 +-
 source/Service_Libs/fhss/fhss_test_api.c      |  2 +-
 source/Service_Libs/fhss/fhss_ws.c            |  2 +-
 source/Service_Libs/fhss/fhss_ws.h            |  2 +-
 .../fhss/fhss_ws_empty_functions.c            |  2 +-
 source/Service_Libs/fnv_hash/fnv_hash.c       |  2 +-
 source/Service_Libs/fnv_hash/fnv_hash.h       |  2 +-
 source/Service_Libs/hmac/hmac_md.c            |  2 +-
 source/Service_Libs/hmac/hmac_md.h            |  2 +-
 source/Service_Libs/ieee_802_11/ieee_802_11.c |  2 +-
 source/Service_Libs/ieee_802_11/ieee_802_11.h |  2 +-
 .../Service_Libs/load_balance/load_balance.c  |  2 +-
 .../load_balance/load_balance_api.h           |  2 +-
 .../mac_neighbor_table/mac_neighbor_table.c   |  2 +-
 .../mac_neighbor_table/mac_neighbor_table.h   |  2 +-
 source/Service_Libs/mle_service/mle_service.c |  2 +-
 .../mle_service/mle_service_api.h             |  2 +-
 .../mle_service/mle_service_buffer.c          |  2 +-
 .../mle_service/mle_service_buffer.h          |  2 +-
 .../mle_service_frame_counter_table.c         |  2 +-
 .../mle_service_frame_counter_table.h         |  2 +-
 .../mle_service/mle_service_interface.c       |  2 +-
 .../mle_service/mle_service_interface.h       |  2 +-
 .../mle_service/mle_service_security.c        |  2 +-
 .../mle_service/mle_service_security.h        |  2 +-
 source/Service_Libs/nd_proxy/nd_proxy.c       |  2 +-
 source/Service_Libs/nd_proxy/nd_proxy.h       |  2 +-
 source/Service_Libs/nist_aes_kw/nist_aes_kw.c |  2 +-
 source/Service_Libs/nist_aes_kw/nist_aes_kw.h |  2 +-
 .../pan_blacklist/pan_blacklist.c             |  2 +-
 .../pan_blacklist/pan_blacklist_api.h         |  2 +-
 .../random_early_detection.c                  |  2 +-
 .../random_early_detection.h                  |  2 +-
 .../random_early_detection_api.h              |  2 +-
 source/Service_Libs/utils/isqrt.c             |  2 +-
 source/Service_Libs/utils/isqrt.h             |  2 +-
 source/Service_Libs/utils/ns_conf.c           |  2 +-
 source/Service_Libs/utils/ns_crc.c            |  2 +-
 source/Service_Libs/utils/ns_crc.h            |  2 +-
 source/Service_Libs/utils/ns_file.h           |  2 +-
 source/Service_Libs/utils/ns_file_system.c    |  2 +-
 source/Service_Libs/whiteboard/whiteboard.c   |  2 +-
 source/Service_Libs/whiteboard/whiteboard.h   |  2 +-
 source/configs/base/cfg_ethernet.h            |  2 +-
 source/configs/base/cfg_local_socket.h        |  2 +-
 .../configs/base/cfg_lowpan_border_router.h   |  2 +-
 source/configs/base/cfg_lowpan_host.h         |  2 +-
 source/configs/base/cfg_lowpan_router.h       |  2 +-
 source/configs/base/cfg_rf_tunnel.h           |  2 +-
 .../configs/base/cfg_thread_border_router.h   |  2 +-
 source/configs/base/cfg_thread_end_device.h   |  2 +-
 .../configs/base/cfg_thread_full_end_device.h |  2 +-
 source/configs/base/cfg_thread_router.h       |  2 +-
 source/configs/base/cfg_ws_border_router.h    |  2 +-
 source/configs/base/cfg_ws_router.h           |  2 +-
 source/configs/cfg_ethernet_host.h            |  2 +-
 source/configs/cfg_generic.h                  |  2 +-
 source/configs/cfg_lowpan_border_router.h     |  2 +-
 .../cfg_lowpan_border_router_rf_tunnel.h      |  2 +-
 .../cfg_lowpan_border_router_rf_tunnel_ecc.h  |  2 +-
 ...wpan_border_router_rf_tunnel_ecc_release.h |  2 +-
 source/configs/cfg_lowpan_host.h              |  2 +-
 source/configs/cfg_lowpan_router.h            |  2 +-
 source/configs/cfg_lowpan_router_ecc.h        |  2 +-
 .../configs/cfg_lowpan_router_ecc_release.h   |  2 +-
 source/configs/cfg_nanostack_full.h           |  2 +-
 source/configs/cfg_nanostack_full_debug.h     |  2 +-
 source/configs/cfg_rf_interface.h             |  2 +-
 source/configs/cfg_thread_border_router.h     |  2 +-
 source/configs/cfg_thread_end_device.h        |  2 +-
 source/configs/cfg_thread_full_end_device.h   |  2 +-
 source/configs/cfg_thread_router.h            |  2 +-
 source/configs/cfg_thread_thci.h              |  2 +-
 source/configs/cfg_ws_border_router.h         |  2 +-
 source/configs/cfg_ws_router.h                |  2 +-
 source/ipv6_stack/ipv6_routing_table.c        |  2 +-
 source/ipv6_stack/ipv6_routing_table.h        |  2 +-
 source/ipv6_stack/protocol_ipv6.c             |  2 +-
 source/ipv6_stack/protocol_ipv6.h             |  2 +-
 source/libDHCPv6/dhcp_service_api.c           |  2 +-
 source/libDHCPv6/libDHCPv6.c                  |  2 +-
 source/libDHCPv6/libDHCPv6.h                  |  2 +-
 source/libDHCPv6/libDHCPv6_server.c           |  2 +-
 source/libDHCPv6/libDHCPv6_server.h           |  2 +-
 source/libDHCPv6/libDHCPv6_vendordata.c       |  2 +-
 source/libDHCPv6/libDHCPv6_vendordata.h       |  2 +-
 source/libNET/src/multicast_api.c             |  2 +-
 source/libNET/src/net_6lowpan_parameter_api.c |  2 +-
 source/libNET/src/net_dns.c                   |  2 +-
 source/libNET/src/net_dns_internal.h          |  2 +-
 source/libNET/src/net_ipv6.c                  |  2 +-
 source/libNET/src/net_load_balance.c          |  2 +-
 source/libNET/src/net_load_balance_internal.h |  2 +-
 source/libNET/src/net_mle.c                   |  2 +-
 source/libNET/src/net_rpl.c                   |  2 +-
 .../libNET/src/net_short_address_extension.c  |  2 +-
 source/libNET/src/net_test.c                  |  2 +-
 source/libNET/src/ns_net.c                    |  2 +-
 source/libNET/src/socket_api.c                |  2 +-
 source/nsconfig.h                             |  2 +-
 test/nanostack/unittest/6LoWPAN/Mesh/main.cpp |  2 +-
 .../unittest/6LoWPAN/Mesh/mesh_test.cpp       |  2 +-
 .../unittest/6LoWPAN/Mesh/test_mesh.cpp       |  2 +-
 .../unittest/6LoWPAN/Mesh/test_mesh.h         |  2 +-
 test/nanostack/unittest/6LoWPAN/NVM/main.cpp  |  2 +-
 .../unittest/6LoWPAN/NVM/nwk_nvmtest.cpp      |  2 +-
 .../unittest/6LoWPAN/NVM/test_nwk_nvm.c       |  2 +-
 .../unittest/6LoWPAN/NVM/test_nwk_nvm.h       |  2 +-
 .../adaptation_interfacetest.cpp              |  2 +-
 .../6LoWPAN/adaptation_interface/main.cpp     |  2 +-
 .../test_adaptation_interface.c               |  2 +-
 .../test_adaptation_interface.h               |  2 +-
 .../6LoWPAN/nd_router_object/main.cpp         |  2 +-
 .../nd_router_object/nd_router_objecttest.cpp |  2 +-
 .../nd_router_object/test_nd_router_object.c  |  2 +-
 .../nd_router_object/test_nd_router_object.h  |  2 +-
 .../6LoWPAN/reassemly_interface/main.cpp      |  2 +-
 .../reassembly_interfacetest.cpp              |  2 +-
 .../test_cipv6_reassembly_interface.c         |  2 +-
 .../test_cipv6_reassembly_interface.h         |  2 +-
 .../unittest/6LoWPAN/ws_cfg_settings/main.cpp |  2 +-
 .../ws_cfg_settings/test_ws_cfg_settings.c    |  6 ++--
 .../ws_cfg_settings/test_ws_cfg_settings.h    |  2 +-
 .../ws_cfg_settings/ws_cfg_settings_test.cpp  |  2 +-
 .../unittest/6LoWPAN/ws_ie_lib/main.cpp       |  2 +-
 .../6LoWPAN/ws_ie_lib/test_ws_ie_lib.c        |  2 +-
 .../6LoWPAN/ws_ie_lib/test_ws_ie_lib.h        |  2 +-
 .../6LoWPAN/ws_ie_lib/ws_ie_libtest.cpp       |  2 +-
 .../6LoWPAN/ws_llc_data_service/main.cpp      |  2 +-
 .../test_ws_llc_data_service.c                |  2 +-
 .../test_ws_llc_data_service.h                |  2 +-
 .../ws_llc_data_servicetest.cpp               |  2 +-
 .../6LoWPAN/ws_management_api/main.cpp        |  2 +-
 .../test_ws_management_api.c                  |  2 +-
 .../test_ws_management_api.h                  |  2 +-
 .../ws_management_api_test.cpp                |  2 +-
 .../unittest/6LoWPAN/ws_mpx_header/main.cpp   |  2 +-
 .../ws_mpx_header/test_ws_mpx_header.c        |  2 +-
 .../ws_mpx_header/test_ws_mpx_header.h        |  2 +-
 .../ws_mpx_header/ws_mpx_headertest.cpp       |  2 +-
 .../beacon_handler/beacon_handlertest.cpp     |  2 +-
 .../unittest/6lp_mac/beacon_handler/main.cpp  |  2 +-
 .../beacon_handler/test_beacon_handler.c      |  2 +-
 .../beacon_handler/test_beacon_handler.h      |  2 +-
 .../mac_data_poll/mac_data_polltest.cpp       |  2 +-
 .../unittest/6lp_mac/mac_data_poll/main.cpp   |  2 +-
 .../mac_data_poll/test_mac_data_poll.c        |  2 +-
 .../mac_data_poll/test_mac_data_poll.h        |  2 +-
 .../6lp_mac/mac_helper/mac_helpertest.cpp     |  2 +-
 .../unittest/6lp_mac/mac_helper/main.cpp      |  2 +-
 .../6lp_mac/mac_helper/test_mac_helper.c      |  2 +-
 .../6lp_mac/mac_helper/test_mac_helper.h      |  2 +-
 .../6lp_mac/mac_ie_lib/mac_ie_libtest.cpp     |  2 +-
 .../unittest/6lp_mac/mac_ie_lib/main.cpp      |  2 +-
 .../6lp_mac/mac_ie_lib/test_mac_ie_lib.c      |  2 +-
 .../6lp_mac/mac_ie_lib/test_mac_ie_lib.h      |  2 +-
 .../mac_pairwise_key/mac_pairwise_keytest.cpp |  2 +-
 .../6lp_mac/mac_pairwise_key/main.cpp         |  2 +-
 .../mac_pairwise_key/test_mac_pairwise_key.c  |  2 +-
 .../mac_pairwise_key/test_mac_pairwise_key.h  |  2 +-
 .../mac_response_handlertest.cpp              |  2 +-
 .../6lp_mac/mac_response_handler/main.cpp     |  2 +-
 .../test_mac_response_handler.c               |  2 +-
 .../test_mac_response_handler.h               |  2 +-
 .../unittest/Bootstraps/network_lib/main.cpp  |  2 +-
 .../network_lib/network_libtest.cpp           |  2 +-
 .../Bootstraps/network_lib/test_network_lib.c |  2 +-
 .../Bootstraps/network_lib/test_network_lib.h |  2 +-
 .../Bootstraps/protocol_6lowpan/main.cpp      |  2 +-
 .../protocol_6lowpan/protocol_6lowpantest.cpp |  2 +-
 .../protocol_6lowpan/test_protocol_6lowpan.c  |  2 +-
 .../protocol_6lowpan/test_protocol_6lowpan.h  |  2 +-
 .../protocol_6lowpan_bootstrap/main.cpp       |  2 +-
 .../protocol_6lowpan_bootstraptest.cpp        |  2 +-
 .../test_protocol_6lowpan_bootstrap.c         |  2 +-
 .../test_protocol_6lowpan_bootstrap.h         |  2 +-
 .../protocol_6lowpan_interface/main.cpp       |  2 +-
 .../protocol_6lowpan_interfacetest.cpp        |  2 +-
 .../test_protocol_6lowpan_interface.c         |  2 +-
 .../test_protocol_6lowpan_interface.h         |  2 +-
 .../border_router/border_routertest.cpp       |  2 +-
 .../BorderRouter/border_router/main.cpp       |  2 +-
 .../border_router/test_border_router.c        |  2 +-
 .../border_router/test_border_router.h        |  2 +-
 .../Common_Protocols/icmpv6/icmpv6test.cpp    |  2 +-
 .../unittest/Common_Protocols/icmpv6/main.cpp |  2 +-
 .../Common_Protocols/icmpv6/test_icmpv6.c     |  2 +-
 .../Common_Protocols/icmpv6/test_icmpv6.h     |  2 +-
 .../icmpv6_prefix/icmpv6_prefixtest.cpp       |  2 +-
 .../Common_Protocols/icmpv6_prefix/main.cpp   |  2 +-
 .../icmpv6_prefix/test_icmpv6_prefix.c        |  2 +-
 .../icmpv6_prefix/test_icmpv6_prefix.h        |  2 +-
 .../icmpv6_radv/icmpv6_radvtest.cpp           |  2 +-
 .../Common_Protocols/icmpv6_radv/main.cpp     |  2 +-
 .../icmpv6_radv/test_icmpv6_radv.c            |  2 +-
 .../icmpv6_radv/test_icmpv6_radv.h            |  2 +-
 .../Common_Protocols/ipv6/ipv6test.cpp        |  2 +-
 .../unittest/Common_Protocols/ipv6/main.cpp   |  2 +-
 .../Common_Protocols/ipv6/test_ipv6.c         |  2 +-
 .../Common_Protocols/ipv6/test_ipv6.h         |  2 +-
 .../ipv6_flow/ipv6_flowtest.cpp               |  2 +-
 .../Common_Protocols/ipv6_flow/main.cpp       |  2 +-
 .../ipv6_flow/test_ipv6_flow.c                |  2 +-
 .../ipv6_flow/test_ipv6_flow.h                |  2 +-
 .../ipv6_fragmentationtest.cpp                |  2 +-
 .../ipv6_fragmentation/main.cpp               |  2 +-
 .../test_ipv6_fragmentation.c                 |  2 +-
 .../test_ipv6_fragmentation.h                 |  2 +-
 .../ipv6_resolution/ipv6_resolutiontest.cpp   |  2 +-
 .../Common_Protocols/ipv6_resolution/main.cpp |  2 +-
 .../ipv6_resolution/test_ipv6_resolution.c    |  2 +-
 .../ipv6_resolution/test_ipv6_resolution.h    |  2 +-
 .../unittest/Common_Protocols/tcp/main.cpp    |  2 +-
 .../unittest/Common_Protocols/tcp/tcptest.cpp |  2 +-
 .../unittest/Common_Protocols/tcp/test_tcp.c  |  2 +-
 .../unittest/Common_Protocols/tcp/test_tcp.h  |  2 +-
 .../unittest/Common_Protocols/udp/main.cpp    |  2 +-
 .../unittest/Common_Protocols/udp/test_udp.c  |  2 +-
 .../unittest/Common_Protocols/udp/test_udp.h  |  2 +-
 .../unittest/Common_Protocols/udp/udptest.cpp |  2 +-
 .../unittest/Core/address/addresstest.cpp     |  2 +-
 test/nanostack/unittest/Core/address/main.cpp |  2 +-
 .../unittest/Core/address/test_address.c      |  2 +-
 .../unittest/Core/address/test_address.h      |  2 +-
 .../Core/buffer_dyn/buffer_dyntest.cpp        |  2 +-
 .../unittest/Core/buffer_dyn/main.cpp         |  2 +-
 .../Core/buffer_dyn/test_buffer_dyn.c         |  2 +-
 .../Core/buffer_dyn/test_buffer_dyn.h         |  2 +-
 test/nanostack/unittest/Core/monitor/main.cpp |  2 +-
 .../unittest/Core/monitor/monitortest.cpp     |  2 +-
 .../unittest/Core/monitor/test_monitor.c      |  2 +-
 .../unittest/Core/monitor/test_monitor.h      |  2 +-
 test/nanostack/unittest/Core/socket/main.cpp  |  2 +-
 .../unittest/Core/socket/sockettest.cpp       |  2 +-
 .../unittest/Core/socket/test_socket.c        |  2 +-
 .../unittest/Core/socket/test_socket.h        |  2 +-
 .../dhcpv6_server_servicetest.cpp             |  2 +-
 .../dhcpv6_server_service/main.cpp            |  2 +-
 .../test_dhcpv6_server_service.c              |  2 +-
 .../test_dhcpv6_server_service.h              |  2 +-
 .../IPHC/6lowpan_iphc/6lowpan_iphctest.cpp    |  2 +-
 .../unittest/IPHC/6lowpan_iphc/main.cpp       |  2 +-
 .../IPHC/6lowpan_iphc/test_6lowpan_iphc.c     |  2 +-
 .../IPHC/6lowpan_iphc/test_6lowpan_iphc.h     |  2 +-
 .../IPHC/iphc_compress/iphc_compresstest.cpp  |  2 +-
 .../unittest/IPHC/iphc_compress/main.cpp      |  2 +-
 .../IPHC/iphc_compress/test_iphc_compress.c   |  2 +-
 .../IPHC/iphc_compress/test_iphc_compress.h   |  2 +-
 .../iphc_decompress/iphc_decompresstest.cpp   |  2 +-
 .../unittest/IPHC/iphc_decompress/main.cpp    |  2 +-
 .../iphc_decompress/test_iphc_decompress.c    |  2 +-
 .../iphc_decompress/test_iphc_decompress.h    |  2 +-
 .../lowpan_context/lowpan_contexttest.cpp     |  2 +-
 .../unittest/IPHC/lowpan_context/main.cpp     |  2 +-
 .../IPHC/lowpan_context/test_lowpan_context.c |  2 +-
 .../IPHC/lowpan_context/test_lowpan_context.h |  2 +-
 .../ipv6_routing_tabletest.cpp                |  2 +-
 .../ipv6_stack/ipv6_routing_table/main.cpp    |  2 +-
 .../test_ipv6_routing_table.c                 |  2 +-
 .../test_ipv6_routing_table.h                 |  2 +-
 .../ipv6_stack/protocol_ipv6/main.cpp         |  2 +-
 .../protocol_ipv6/protocol_ipv6test.cpp       |  2 +-
 .../protocol_ipv6/test_protocol_ipv6.c        |  2 +-
 .../protocol_ipv6/test_protocol_ipv6.h        |  2 +-
 .../dhcp_service_api/dhcp_service_apitest.cpp |  2 +-
 .../libDHCPv6/dhcp_service_api/main.cpp       |  2 +-
 .../dhcp_service_api/test_dhcp_service_api.c  |  2 +-
 .../dhcp_service_api/test_dhcp_service_api.h  |  2 +-
 .../libDHCPv6/libdhcpv6/libdhcpv6test.cpp     |  2 +-
 .../unittest/libDHCPv6/libdhcpv6/main.cpp     |  2 +-
 .../libDHCPv6/libdhcpv6/test_libdhcpv6.c      |  2 +-
 .../libDHCPv6/libdhcpv6/test_libdhcpv6.h      |  2 +-
 .../libdhcpv6_server/libdhcpv6_servertest.cpp |  2 +-
 .../libDHCPv6/libdhcpv6_server/main.cpp       |  2 +-
 .../libdhcpv6_server/test_libdhcpv6_server.c  |  2 +-
 .../libdhcpv6_server/test_libdhcpv6_server.h  |  2 +-
 test/nanostack/unittest/libNET/net/main.cpp   |  2 +-
 .../nanostack/unittest/libNET/net/nettest.cpp |  2 +-
 test/nanostack/unittest/libNET/net/test_net.c |  2 +-
 test/nanostack/unittest/libNET/net/test_net.h |  2 +-
 .../libNET/net_6lowpan_parameter_api/main.cpp |  2 +-
 .../net_6lowpan_parameter_apitest.cpp         |  2 +-
 .../test_net_6lowpan_parameter_api.c          |  2 +-
 .../test_net_6lowpan_parameter_api.h          |  2 +-
 .../unittest/libNET/net_ipv6/main.cpp         |  2 +-
 .../unittest/libNET/net_ipv6/net_ipv6test.cpp |  2 +-
 .../unittest/libNET/net_ipv6/test_net_ipv6.c  |  2 +-
 .../unittest/libNET/net_ipv6/test_net_ipv6.h  |  2 +-
 .../unittest/libNET/net_mle/main.cpp          |  2 +-
 .../unittest/libNET/net_mle/net_mletest.cpp   |  2 +-
 .../unittest/libNET/net_mle/test_net_mle.c    |  2 +-
 .../unittest/libNET/net_mle/test_net_mle.h    |  2 +-
 .../unittest/libNET/net_rpl/main.cpp          |  2 +-
 .../unittest/libNET/net_rpl/net_rpltest.cpp   |  2 +-
 .../unittest/libNET/net_rpl/test_net_rpl.c    |  2 +-
 .../unittest/libNET/net_rpl/test_net_rpl.h    |  2 +-
 .../net_short_address_extension/main.cpp      |  2 +-
 .../net_short_address_extensiontest.cpp       |  2 +-
 .../test_net_short_address_extension.c        |  2 +-
 .../test_net_short_address_extension.h        |  2 +-
 .../unittest/libNET/socket_api/main.cpp       |  2 +-
 .../libNET/socket_api/socket_api_test.cpp     |  2 +-
 .../ethernet_mac_api/ethernet_mac_apitest.cpp |  2 +-
 .../unittest/mac/ethernet_mac_api/main.cpp    |  2 +-
 .../ethernet_mac_api/test_ethernet_mac_api.c  |  2 +-
 .../ethernet_mac_api/test_ethernet_mac_api.h  |  2 +-
 .../mac/fhss_callbacks/fhss_callbackstest.cpp |  2 +-
 .../unittest/mac/fhss_callbacks/main.cpp      |  2 +-
 .../mac/fhss_callbacks/test_fhss_callbacks.c  |  2 +-
 .../mac/fhss_callbacks/test_fhss_callbacks.h  |  2 +-
 .../mac_cca_threshold_test.cpp                |  2 +-
 .../unittest/mac/mac_cca_threshold/main.cpp   |  2 +-
 .../test_mac_cca_threshold.c                  |  2 +-
 .../test_mac_cca_threshold.h                  |  2 +-
 .../mac/mac_filter/mac_filtertest.cpp         |  2 +-
 .../unittest/mac/mac_filter/main.cpp          |  2 +-
 .../unittest/mac/mac_filter/test_mac_filter.c |  2 +-
 .../unittest/mac/mac_filter/test_mac_filter.h |  2 +-
 .../mac_header_helper_functionstest.cpp       |  2 +-
 .../mac/mac_header_helper_functions/main.cpp  |  2 +-
 .../test_mac_header_helper_functions.c        |  2 +-
 .../test_mac_header_helper_functions.h        |  2 +-
 .../mac_indirect_datatest.cpp                 |  2 +-
 .../unittest/mac/mac_indirect_data/main.cpp   |  2 +-
 .../test_mac_indirect_data.c                  |  2 +-
 .../test_mac_indirect_data.h                  |  2 +-
 .../mac/mac_mcps_sap/mac_mcps_saptest.cpp     |  2 +-
 .../unittest/mac/mac_mcps_sap/main.cpp        |  2 +-
 .../mac/mac_mcps_sap/test_mac_mcps_sap.c      |  2 +-
 .../mac/mac_mcps_sap/test_mac_mcps_sap.h      |  2 +-
 .../unittest/mac/mac_mlme/mac_mlmetest.cpp    |  2 +-
 test/nanostack/unittest/mac/mac_mlme/main.cpp |  2 +-
 .../unittest/mac/mac_mlme/test_mac_mlme.c     |  2 +-
 .../unittest/mac/mac_mlme/test_mac_mlme.h     |  2 +-
 .../mac/mac_pd_sap/mac_pd_saptest.cpp         |  2 +-
 .../unittest/mac/mac_pd_sap/main.cpp          |  2 +-
 .../unittest/mac/mac_pd_sap/test_mac_pd_sap.c |  2 +-
 .../unittest/mac/mac_pd_sap/test_mac_pd_sap.h |  2 +-
 .../mac_security_mib/mac_security_mibtest.cpp |  2 +-
 .../unittest/mac/mac_security_mib/main.cpp    |  2 +-
 .../mac_security_mib/test_mac_security_mib.c  |  2 +-
 .../mac_security_mib/test_mac_security_mib.h  |  2 +-
 .../unittest/mac/mac_timer/mac_timertest.cpp  |  2 +-
 .../nanostack/unittest/mac/mac_timer/main.cpp |  2 +-
 .../unittest/mac/mac_timer/test_mac_timer.c   |  2 +-
 .../unittest/mac/mac_timer/test_mac_timer.h   |  2 +-
 .../unittest/mac/rf_driver_storage/main.cpp   |  2 +-
 .../rf_driver_storagetest.cpp                 |  2 +-
 .../test_rf_driver_storage.c                  |  2 +-
 .../test_rf_driver_storage.h                  |  2 +-
 .../unittest/mac/serial_mac_api/main.cpp      |  2 +-
 .../mac/serial_mac_api/serial_mac_apitest.cpp |  2 +-
 .../mac/serial_mac_api/test_serial_mac_api.c  |  2 +-
 .../mac/serial_mac_api/test_serial_mac_api.h  |  2 +-
 test/nanostack/unittest/mac/sw_mac/main.cpp   |  2 +-
 .../unittest/mac/sw_mac/sw_mactest.cpp        |  2 +-
 .../unittest/mac/sw_mac/test_sw_mac.c         |  2 +-
 .../unittest/mac/sw_mac/test_sw_mac.h         |  2 +-
 .../unittest/mac/virtual_rf_client/main.cpp   |  2 +-
 .../test_virtual_rf_client.c                  |  2 +-
 .../test_virtual_rf_client.h                  |  2 +-
 .../virtual_rf_clienttest.cpp                 |  2 +-
 .../unittest/mac/virtual_rf_driver/main.cpp   |  2 +-
 .../test_virtual_rf_driver.c                  |  2 +-
 .../test_virtual_rf_driver.h                  |  2 +-
 .../virtual_rf_drivertest.cpp                 |  2 +-
 test/nanostack/unittest/mle/mle/main.cpp      |  2 +-
 test/nanostack/unittest/mle/mle/mle_test.cpp  |  2 +-
 test/nanostack/unittest/mle/mle/test_mle.c    |  2 +-
 test/nanostack/unittest/mle/mle/test_mle.h    |  2 +-
 test/nanostack/unittest/mle/mle_tlv/main.cpp  |  2 +-
 .../unittest/mle/mle_tlv/mle_tlvtest.cpp      |  2 +-
 .../unittest/mle/mle_tlv/test_mle_tlv.c       |  2 +-
 .../unittest/mle/mle_tlv/test_mle_tlv.h       |  2 +-
 .../nwk_interface/protocol_core/main.cpp      |  2 +-
 .../protocol_core/protocol_coretest.cpp       |  2 +-
 .../protocol_core/test_protocol_core.c        |  2 +-
 .../protocol_core/test_protocol_core.h        |  2 +-
 .../protocol_core_sleep/main.cpp              |  2 +-
 .../protocol_core_sleeptest.cpp               |  2 +-
 .../test_protocol_core_sleep.c                |  2 +-
 .../test_protocol_core_sleep.h                |  2 +-
 .../nwk_interface/protocol_stats/main.cpp     |  2 +-
 .../protocol_stats/protocol_statstest.cpp     |  2 +-
 .../protocol_stats/test_protocol_stats.c      |  2 +-
 .../protocol_stats/test_protocol_stats.h      |  2 +-
 .../nwk_interface/protocol_timer/main.cpp     |  2 +-
 .../protocol_timer/protocol_timertest.cpp     |  2 +-
 .../protocol_timer/test_protocol_timer.c      |  2 +-
 .../protocol_timer/test_protocol_timer.h      |  2 +-
 .../unittest/rpl/rpl_control/main.cpp         |  2 +-
 .../rpl/rpl_control/rpl_controltest.cpp       |  2 +-
 .../rpl/rpl_control/test_rpl_control.c        |  2 +-
 .../rpl/rpl_control/test_rpl_control.h        |  2 +-
 test/nanostack/unittest/rpl/rpl_data/main.cpp |  2 +-
 .../unittest/rpl/rpl_data/rpl_datatest.cpp    |  2 +-
 .../unittest/rpl/rpl_data/test_rpl_data.c     |  2 +-
 .../unittest/rpl/rpl_data/test_rpl_data.h     |  2 +-
 .../unittest/rpl/rpl_downward/main.cpp        |  2 +-
 .../rpl/rpl_downward/rpl_downwardtest.cpp     |  2 +-
 .../rpl/rpl_downward/test_rpl_downward.c      |  2 +-
 .../rpl/rpl_downward/test_rpl_downward.h      |  2 +-
 .../nanostack/unittest/rpl/rpl_mrhof/main.cpp |  2 +-
 .../unittest/rpl/rpl_mrhof/rpl_mrhoftest.cpp  |  2 +-
 .../unittest/rpl/rpl_mrhof/test_rpl_mrhof.c   |  2 +-
 .../unittest/rpl/rpl_mrhof/test_rpl_mrhof.h   |  2 +-
 .../unittest/rpl/rpl_objective/main.cpp       |  2 +-
 .../rpl/rpl_objective/rpl_objectivetest.cpp   |  2 +-
 .../rpl/rpl_objective/test_rpl_objective.c    |  2 +-
 .../rpl/rpl_objective/test_rpl_objective.h    |  2 +-
 test/nanostack/unittest/rpl/rpl_of0/main.cpp  |  2 +-
 .../unittest/rpl/rpl_of0/rpl_of0test.cpp      |  2 +-
 .../unittest/rpl/rpl_of0/test_rpl_of0.c       |  2 +-
 .../unittest/rpl/rpl_of0/test_rpl_of0.h       |  2 +-
 .../unittest/rpl/rpl_policy/main.cpp          |  2 +-
 .../rpl/rpl_policy/rpl_policytest.cpp         |  2 +-
 .../unittest/rpl/rpl_policy/test_rpl_policy.c |  2 +-
 .../unittest/rpl/rpl_policy/test_rpl_policy.h |  2 +-
 .../unittest/rpl/rpl_upward/main.cpp          |  2 +-
 .../rpl/rpl_upward/rpl_upwardtest.cpp         |  2 +-
 .../unittest/rpl/rpl_upward/test_rpl_upward.c |  2 +-
 .../unittest/rpl/rpl_upward/test_rpl_upward.h |  2 +-
 .../security/kde_helper/kde_helpertest.cpp    |  2 +-
 .../unittest/security/kde_helper/main.cpp     |  2 +-
 .../security/kde_helper/test_kde_helper.c     |  2 +-
 .../security/kde_helper/test_kde_helper.h     |  2 +-
 .../nanostack/unittest/security/pana/main.cpp |  2 +-
 .../unittest/security/pana/panatest.cpp       |  2 +-
 .../unittest/security/pana/test_pana.c        |  2 +-
 .../unittest/security/pana/test_pana.h        |  2 +-
 .../security/pana_relay_table/main.cpp        |  2 +-
 .../pana_relay_table/pana_relay_tabletest.cpp |  2 +-
 .../pana_relay_table/test_pana_relay_table.c  |  2 +-
 .../pana_relay_table/test_pana_relay_table.h  |  2 +-
 .../unittest/security/security_lib/main.cpp   |  2 +-
 .../security_lib/security_libtest.cpp         |  2 +-
 .../security/security_lib/test_security_lib.c |  2 +-
 .../security/security_lib/test_security_lib.h |  2 +-
 .../unittest/security/tls_lib/main.cpp        |  2 +-
 .../unittest/security/tls_lib/test_tls_lib.c  |  2 +-
 .../unittest/security/tls_lib/test_tls_lib.h  |  2 +-
 .../unittest/security/tls_lib/tls_libtest.cpp |  2 +-
 .../unittest/service_libs/SHA256_Lib/main.cpp |  2 +-
 .../service_libs/SHA256_Lib/shalibtest.cpp    |  2 +-
 .../service_libs/SHA256_Lib/test_shalib.c     |  2 +-
 .../service_libs/SHA256_Lib/test_shalib.h     |  2 +-
 .../service_libs/blacklist/blacklisttest.cpp  |  2 +-
 .../unittest/service_libs/blacklist/main.cpp  |  2 +-
 .../service_libs/blacklist/test_blacklist.c   |  2 +-
 .../service_libs/blacklist/test_blacklist.h   |  2 +-
 .../channel_functions/channelfunctest.cpp     |  2 +-
 .../service_libs/channel_functions/main.cpp   |  2 +-
 .../test_channel_functions.c                  |  2 +-
 .../test_channel_functions.h                  |  2 +-
 .../service_libs/channel_list/channeltest.cpp |  2 +-
 .../service_libs/channel_list/main.cpp        |  2 +-
 .../channel_list/test_channel_list.c          |  2 +-
 .../channel_list/test_channel_list.h          |  2 +-
 .../unittest/service_libs/etx/etxtest.cpp     |  2 +-
 .../unittest/service_libs/etx/main.cpp        |  2 +-
 .../unittest/service_libs/etx/test_etx.c      |  2 +-
 .../unittest/service_libs/etx/test_etx.h      |  2 +-
 .../unittest/service_libs/fhss/fhsstest.cpp   |  2 +-
 .../unittest/service_libs/fhss/main.cpp       |  2 +-
 .../unittest/service_libs/fhss/test_fhss.c    |  2 +-
 .../unittest/service_libs/fhss/test_fhss.h    |  2 +-
 .../fhss_channel/fhsschanneltest.cpp          |  2 +-
 .../service_libs/fhss_channel/main.cpp        |  2 +-
 .../fhss_channel/test_fhss_channel.c          |  2 +-
 .../fhss_channel/test_fhss_channel.h          |  2 +-
 .../fhss_common/fhsscommontest.cpp            |  2 +-
 .../service_libs/fhss_common/main.cpp         |  2 +-
 .../fhss_common/test_fhss_common.c            |  2 +-
 .../fhss_common/test_fhss_common.h            |  2 +-
 .../fhss_config/fhssconfigtest.cpp            |  2 +-
 .../service_libs/fhss_config/main.cpp         |  2 +-
 .../fhss_config/test_fhss_config.c            |  2 +-
 .../fhss_config/test_fhss_config.h            |  2 +-
 .../fhss_statistics/fhssstatisticstest.cpp    |  2 +-
 .../service_libs/fhss_statistics/main.cpp     |  2 +-
 .../fhss_statistics/test_fhss_statistics.c    |  2 +-
 .../fhss_statistics/test_fhss_statistics.h    |  2 +-
 .../service_libs/fhss_ws/fhsswstest.cpp       |  2 +-
 .../unittest/service_libs/fhss_ws/main.cpp    |  2 +-
 .../service_libs/fhss_ws/test_fhss_ws.c       |  2 +-
 .../service_libs/fhss_ws/test_fhss_ws.h       |  2 +-
 .../unittest/service_libs/hmac/hmactest.cpp   |  2 +-
 .../unittest/service_libs/hmac/main.cpp       |  2 +-
 .../unittest/service_libs/hmac/test_hmac.c    |  2 +-
 .../unittest/service_libs/hmac/test_hmac.h    |  2 +-
 .../ieee_802_11/ieee80211test.cpp             |  2 +-
 .../service_libs/ieee_802_11/main.cpp         |  2 +-
 .../ieee_802_11/test_ieee_802_11.c            |  2 +-
 .../ieee_802_11/test_ieee_802_11.h            |  2 +-
 .../load_balance/loadbalance_test.cpp         |  2 +-
 .../service_libs/load_balance/main.cpp        |  2 +-
 .../mac_neighbor_table_test.cpp               |  2 +-
 .../service_libs/mac_neighbor_table/main.cpp  |  2 +-
 .../test_mac_neighbor_table.c                 |  2 +-
 .../test_mac_neighbor_table.h                 |  2 +-
 .../unittest/service_libs/mdns/main.cpp       |  2 +-
 .../unittest/service_libs/mdns/mdns_tests.cpp |  2 +-
 .../service_libs/mdns/test_ns_mdns_api.c      |  2 +-
 .../service_libs/mdns/test_ns_mdns_api.h      |  2 +-
 .../service_libs/nist_aes_kw/main.cpp         |  2 +-
 .../nist_aes_kw/nistaeskwtest.cpp             |  2 +-
 .../nist_aes_kw/test_nist_aes_kw.c            |  2 +-
 .../nist_aes_kw/test_nist_aes_kw.h            |  2 +-
 .../random_early_detetction/main.cpp          |  2 +-
 .../randomEarlyDetection_test.cpp             |  2 +-
 .../unittest/stub/6lowpan_iphc_stub.c         |  2 +-
 .../unittest/stub/6lowpan_mesh_stub.c         |  2 +-
 .../unittest/stub/adaptation_interface_stub.c |  2 +-
 .../unittest/stub/adaptation_interface_stub.h |  2 +-
 test/nanostack/unittest/stub/address_stub.c   |  2 +-
 test/nanostack/unittest/stub/address_stub.h   |  2 +-
 .../unittest/stub/beacon_handler_stub.c       |  2 +-
 test/nanostack/unittest/stub/blacklist_stub.c |  2 +-
 .../unittest/stub/border_router_stub.c        |  2 +-
 .../nanostack/unittest/stub/buffer_dyn_stub.c |  2 +-
 .../nanostack/unittest/stub/buffer_dyn_stub.h |  2 +-
 .../unittest/stub/ccm_security_stub.c         |  2 +-
 .../unittest/stub/ccm_security_stub.h         |  2 +-
 .../unittest/stub/channel_functions_stub.c    |  2 +-
 .../unittest/stub/channel_functions_stub.h    |  2 +-
 .../unittest/stub/channel_list_stub.c         |  2 +-
 .../unittest/stub/channel_list_stub.h         |  2 +-
 .../unittest/stub/cipv6_fragmenter_stub.c     |  2 +-
 .../unittest/stub/cipv6_fragmenter_stub.h     |  2 +-
 .../stub/coap_connection_handler_stub.c       |  2 +-
 .../stub/coap_connection_handler_stub.h       |  2 +-
 .../stub/coap_security_handler_stub.c         |  2 +-
 .../stub/coap_security_handler_stub.h         |  2 +-
 .../unittest/stub/coap_service_api_stub.c     |  2 +-
 .../unittest/stub/coap_service_api_stub.h     |  2 +-
 .../unittest/stub/common_functions_stub.c     |  2 +-
 .../unittest/stub/common_functions_stub.h     |  2 +-
 test/nanostack/unittest/stub/crc_stub.c       |  2 +-
 test/nanostack/unittest/stub/cudp_stub.c      |  2 +-
 .../unittest/stub/dhcp_service_api_stub.c     |  2 +-
 .../unittest/stub/dhcpv6_client_stub.c        |  2 +-
 .../stub/dhcpv6_server_service_stub.c         |  2 +-
 .../unittest/stub/eap_protocol_stub.c         |  2 +-
 .../unittest/stub/eapol_helper_stub.c         |  2 +-
 test/nanostack/unittest/stub/ecc_stub.c       |  2 +-
 test/nanostack/unittest/stub/ecdsa_stub.c     |  2 +-
 test/nanostack/unittest/stub/etx_stub.c       |  2 +-
 test/nanostack/unittest/stub/event_stub.c     |  2 +-
 test/nanostack/unittest/stub/event_stub.h     |  2 +-
 .../unittest/stub/fhss_callbacks_stub.c       |  2 +-
 .../unittest/stub/fhss_callbacks_stub.h       |  2 +-
 .../unittest/stub/fhss_channel_stub.c         |  2 +-
 .../unittest/stub/fhss_channel_stub.h         |  2 +-
 .../unittest/stub/fhss_common_stub.c          |  2 +-
 .../unittest/stub/fhss_common_stub.h          |  2 +-
 .../unittest/stub/fhss_config_stub.c          |  2 +-
 .../unittest/stub/fhss_config_stub.h          |  2 +-
 .../unittest/stub/fhss_platform_stub.c        |  2 +-
 .../unittest/stub/fhss_platform_stub.h        |  2 +-
 .../unittest/stub/fhss_statistics_stub.c      |  2 +-
 test/nanostack/unittest/stub/fhss_stub.c      |  2 +-
 test/nanostack/unittest/stub/fhss_stub.h      |  2 +-
 test/nanostack/unittest/stub/fhss_ws_stub.c   |  2 +-
 test/nanostack/unittest/stub/fhss_ws_stub.h   |  2 +-
 test/nanostack/unittest/stub/fnet_mdns_stub.c |  2 +-
 test/nanostack/unittest/stub/fnet_mdns_stub.h |  2 +-
 test/nanostack/unittest/stub/fnet_poll_stub.c |  2 +-
 test/nanostack/unittest/stub/fnv_hash_stub.c  |  2 +-
 test/nanostack/unittest/stub/hmac_stub.c      |  2 +-
 test/nanostack/unittest/stub/hmac_stub.h      |  2 +-
 .../unittest/stub/icmpv6_prefix_stub.c        |  2 +-
 .../unittest/stub/icmpv6_radv_stub.c          |  2 +-
 test/nanostack/unittest/stub/icmpv6_stub.c    |  2 +-
 test/nanostack/unittest/stub/ip6tos_stub.c    |  2 +-
 test/nanostack/unittest/stub/ip_fsc_stub.c    |  2 +-
 .../unittest/stub/iphc_compress_stub.c        |  2 +-
 .../unittest/stub/iphc_decompress_stub.c      |  2 +-
 test/nanostack/unittest/stub/ipv6_flow_stub.c |  2 +-
 .../unittest/stub/ipv6_fragmentation_stub.c   |  2 +-
 .../unittest/stub/ipv6_resolution_stub.c      |  2 +-
 .../unittest/stub/ipv6_resolution_stub.h      |  2 +-
 .../unittest/stub/ipv6_routing_table_stub.c   |  2 +-
 .../unittest/stub/ipv6_routing_table_stub.h   |  2 +-
 test/nanostack/unittest/stub/ipv6_stub.c      |  2 +-
 test/nanostack/unittest/stub/isqrt_stub.c     |  2 +-
 .../unittest/stub/libDHCPv6_server_stub.c     |  2 +-
 test/nanostack/unittest/stub/libDHCPv6_stub.c |  2 +-
 .../unittest/stub/load_balance_stub.c         |  2 +-
 .../unittest/stub/lowpan_context_stub.c       |  2 +-
 .../unittest/stub/mac_cca_threshold_stub.c    |  2 +-
 .../unittest/stub/mac_data_poll_stub.c        |  2 +-
 .../nanostack/unittest/stub/mac_filter_stub.c |  2 +-
 .../nanostack/unittest/stub/mac_filter_stub.h |  2 +-
 .../stub/mac_header_helper_functions_stub.c   |  2 +-
 .../stub/mac_header_helper_functions_stub.h   |  2 +-
 .../nanostack/unittest/stub/mac_helper_stub.c |  2 +-
 .../nanostack/unittest/stub/mac_helper_stub.h |  2 +-
 .../nanostack/unittest/stub/mac_ie_lib_stub.c |  2 +-
 .../nanostack/unittest/stub/mac_ie_lib_stub.h |  2 +-
 .../unittest/stub/mac_indirect_data_stub.c    |  2 +-
 .../unittest/stub/mac_indirect_data_stub.h    |  2 +-
 .../unittest/stub/mac_mcps_sap_stub.c         |  2 +-
 .../unittest/stub/mac_mcps_sap_stub.h         |  2 +-
 test/nanostack/unittest/stub/mac_mlme_stub.c  |  2 +-
 test/nanostack/unittest/stub/mac_mlme_stub.h  |  2 +-
 .../unittest/stub/mac_neighbor_table_stub.c   |  2 +-
 .../unittest/stub/mac_neighbor_table_stub.h   |  2 +-
 .../unittest/stub/mac_pairwise_key_stub.c     |  2 +-
 .../nanostack/unittest/stub/mac_pd_sap_stub.c |  2 +-
 .../unittest/stub/mac_response_handler_stub.c |  2 +-
 .../stub/mac_security_interface_stub.c        |  2 +-
 .../unittest/stub/mac_security_mib_stub.c     |  2 +-
 .../unittest/stub/mac_security_mib_stub.h     |  2 +-
 test/nanostack/unittest/stub/mac_timer_stub.c |  2 +-
 .../nanostack/unittest/stub/mbed_trace_stub.c |  2 +-
 test/nanostack/unittest/stub/mbedtls_stub.c   |  2 +-
 test/nanostack/unittest/stub/mbedtls_stub.h   |  2 +-
 test/nanostack/unittest/stub/mesh_stub.c      |  2 +-
 test/nanostack/unittest/stub/mesh_stub.h      |  2 +-
 test/nanostack/unittest/stub/mld_stub.c       |  2 +-
 .../unittest/stub/mle_service_buffer_stub.c   |  2 +-
 .../mle_service_frame_counter_table_stub.c    |  2 +-
 .../mle_service_frame_counter_table_stub.h    |  2 +-
 .../unittest/stub/mle_service_stub.c          |  2 +-
 .../unittest/stub/mle_service_stub.h          |  2 +-
 test/nanostack/unittest/stub/mle_stub.c       |  2 +-
 test/nanostack/unittest/stub/mle_stub.h       |  2 +-
 test/nanostack/unittest/stub/mle_tlv_stub.c   |  2 +-
 test/nanostack/unittest/stub/mle_tlv_stub.h   |  2 +-
 test/nanostack/unittest/stub/mpl_stub.c       |  2 +-
 test/nanostack/unittest/stub/mpl_stub.h       |  2 +-
 .../unittest/stub/multicast_api_stub.c        |  2 +-
 test/nanostack/unittest/stub/nd_proxy.c       |  2 +-
 test/nanostack/unittest/stub/nd_proxy_stub.c  |  2 +-
 .../unittest/stub/nd_router_object_stub.c     |  2 +-
 .../unittest/stub/neighbor_cache_stub.c       |  2 +-
 test/nanostack/unittest/stub/net_dns_stub.c   |  2 +-
 .../unittest/stub/net_load_balance_stub.c     |  2 +-
 test/nanostack/unittest/stub/net_mle_stub.c   |  2 +-
 test/nanostack/unittest/stub/net_rpl_stub.c   |  2 +-
 test/nanostack/unittest/stub/net_stub.c       |  2 +-
 .../unittest/stub/network_lib_stub.c          |  2 +-
 .../unittest/stub/ns_file_system_stub.c       |  2 +-
 test/nanostack/unittest/stub/ns_list_stub.c   |  2 +-
 .../nanostack/unittest/stub/ns_monitor_stub.c |  2 +-
 .../nanostack/unittest/stub/ns_monitor_stub.h |  2 +-
 test/nanostack/unittest/stub/ns_sha256_stub.c |  2 +-
 test/nanostack/unittest/stub/ns_timer_stub.c  |  2 +-
 test/nanostack/unittest/stub/ns_timer_stub.h  |  2 +-
 .../unittest/stub/nsdynmemLIB_stub.c          |  2 +-
 .../unittest/stub/nsdynmemLIB_stub.h          |  2 +-
 test/nanostack/unittest/stub/nwk_nvm_stub.c   |  2 +-
 .../unittest/stub/pan_blacklist_stub.c        |  2 +-
 test/nanostack/unittest/stub/pana_avp_stub.c  |  2 +-
 .../unittest/stub/pana_client_stub.c          |  2 +-
 test/nanostack/unittest/stub/pana_eap_stub.c  |  2 +-
 .../unittest/stub/pana_header_stub.c          |  2 +-
 .../unittest/stub/pana_relay_table_stub.c     |  2 +-
 .../unittest/stub/pana_server_stub.c          |  2 +-
 test/nanostack/unittest/stub/pana_stub.c      |  2 +-
 .../unittest/stub/platform_nvm_stub.c         |  2 +-
 test/nanostack/unittest/stub/platform_stub.c  |  2 +-
 .../stub/protocol_6lowpan_bootstrap_stub.c    |  2 +-
 .../stub/protocol_6lowpan_bootstrap_stub.h    |  2 +-
 .../stub/protocol_6lowpan_interface_stub.c    |  2 +-
 .../unittest/stub/protocol_6lowpan_stub.c     |  2 +-
 .../unittest/stub/protocol_6lowpan_stub.h     |  2 +-
 .../unittest/stub/protocol_core_stub.c        |  2 +-
 .../unittest/stub/protocol_core_stub.h        |  2 +-
 .../unittest/stub/protocol_ipv6_stub.c        |  2 +-
 .../unittest/stub/protocol_stats_stub.c       |  2 +-
 .../unittest/stub/protocol_timer_stub.c       |  2 +-
 .../unittest/stub/protocol_tun_driver_stub.c  |  2 +-
 .../unittest/stub/protocol_tun_driver_stub.h  |  2 +-
 test/nanostack/unittest/stub/randLIB_stub.c   |  2 +-
 test/nanostack/unittest/stub/rand_lib2_stub.c |  2 +-
 test/nanostack/unittest/stub/rand_lib_stub.h  |  2 +-
 .../stub/random_early_detection_stub.c        |  2 +-
 .../stub/random_early_detection_stub.h        |  2 +-
 .../unittest/stub/rf_driver_storage_stub.c    |  2 +-
 .../unittest/stub/rf_driver_storage_stub.h    |  2 +-
 .../unittest/stub/routing_table_stub.c        |  2 +-
 .../unittest/stub/rpl_control_stub.c          |  2 +-
 test/nanostack/unittest/stub/rpl_data_stub.c  |  2 +-
 test/nanostack/unittest/stub/rpl_data_stub.h  |  2 +-
 .../unittest/stub/rpl_downward_stub.c         |  2 +-
 test/nanostack/unittest/stub/rpl_mrhof_stub.c |  2 +-
 .../unittest/stub/rpl_objective_stub.c        |  2 +-
 test/nanostack/unittest/stub/rpl_of0_stub.c   |  2 +-
 .../nanostack/unittest/stub/rpl_policy_stub.c |  2 +-
 .../nanostack/unittest/stub/rpl_upward_stub.c |  2 +-
 .../unittest/stub/security_lib_stub.c         |  2 +-
 test/nanostack/unittest/stub/shalib_stub.c    |  2 +-
 .../unittest/stub/sn_coap_builder_stub.c      |  2 +-
 .../unittest/stub/sn_coap_builder_stub.h      |  2 +-
 .../unittest/stub/sn_coap_parser_stub.h       |  2 +-
 .../unittest/stub/sn_coap_protocol_stub.h     |  2 +-
 test/nanostack/unittest/stub/sockbuf_stub.c   |  2 +-
 .../nanostack/unittest/stub/socket_api_stub.c |  2 +-
 .../nanostack/unittest/stub/socket_api_stub.h |  2 +-
 test/nanostack/unittest/stub/socket_stub.c    |  2 +-
 test/nanostack/unittest/stub/socket_stub.h    |  2 +-
 test/nanostack/unittest/stub/sw_mac_stub.c    |  2 +-
 test/nanostack/unittest/stub/sw_mac_stub.h    |  2 +-
 .../unittest/stub/system_timer_stub.c         |  2 +-
 .../unittest/stub/system_timer_stub.h         |  2 +-
 test/nanostack/unittest/stub/tcp_stub.c       |  2 +-
 test/nanostack/unittest/stub/tcp_stub.h       |  2 +-
 .../thread_address_registration_client_stub.c |  2 +-
 .../unittest/stub/thread_bbr_api_stub.c       |  2 +-
 .../stub/thread_bbr_commercial_stub.c         | 34 ++++++-------------
 .../unittest/stub/thread_beacon_stub.c        |  2 +-
 .../unittest/stub/thread_bootstrap_stub.c     |  2 +-
 .../thread_border_router_api_internal_stub.c  |  2 +-
 .../stub/thread_border_router_api_stub.c      |  2 +-
 .../nanostack/unittest/stub/thread_ccm_stub.c | 34 ++++++-------------
 .../stub/thread_commissioning_if_stub.c       |  2 +-
 .../unittest/stub/thread_common_stub.c        |  2 +-
 .../unittest/stub/thread_common_stub.h        |  2 +-
 .../unittest/stub/thread_diagnostic_stub.c    |  2 +-
 .../unittest/stub/thread_discovery_stub.c     |  2 +-
 .../stub/thread_host_bootstrap_stub.c         |  2 +-
 .../stub/thread_joiner_application_stub.c     |  2 +-
 .../stub/thread_leader_service_stub.c         |  2 +-
 .../unittest/stub/thread_lowpower_api_stub.c  |  2 +-
 .../stub/thread_management_api_stub.c         |  2 +-
 .../stub/thread_management_client_stub.c      |  2 +-
 .../unittest/stub/thread_management_if_stub.c |  2 +-
 .../stub/thread_management_server_stub.c      |  2 +-
 .../unittest/stub/thread_meshcop_lib_stub.c   |  2 +-
 .../unittest/stub/thread_meshcop_lib_stub.h   |  2 +-
 .../stub/thread_mle_message_handler_stub.c    |  2 +-
 test/nanostack/unittest/stub/thread_nd_stub.c |  2 +-
 .../stub/thread_neighbor_class_stub.c         |  2 +-
 .../stub/thread_neighbor_class_stub.h         |  2 +-
 .../stub/thread_network_data_lib_stub.c       |  2 +-
 .../stub/thread_network_data_storage_stub.c   |  2 +-
 .../unittest/stub/thread_network_synch_stub.c |  2 +-
 .../unittest/stub/thread_nvm_store_stub.c     |  2 +-
 .../stub/thread_resolution_client_stub.c      |  2 +-
 .../stub/thread_router_bootstrap_stub.c       |  2 +-
 .../unittest/stub/thread_routing_stub.c       |  2 +-
 .../unittest/stub/thread_test_api_stub.c      |  2 +-
 test/nanostack/unittest/stub/timeout_stub.c   |  2 +-
 .../unittest/stub/tls_ccm_crypt_stub.c        |  2 +-
 test/nanostack/unittest/stub/tls_lib_stub.c   |  2 +-
 test/nanostack/unittest/stub/trickle_stub.c   |  2 +-
 test/nanostack/unittest/stub/udp_stub.c       |  2 +-
 .../nanostack/unittest/stub/whiteboard_stub.c |  2 +-
 .../nanostack/unittest/stub/ws_bbr_api_stub.c |  2 +-
 .../nanostack/unittest/stub/ws_bbr_api_stub.h |  2 +-
 .../unittest/stub/ws_bootstrap_stub.c         |  2 +-
 .../unittest/stub/ws_cfg_settings_stub.c      |  4 +--
 .../unittest/stub/ws_cfg_settings_stub.h      |  2 +-
 test/nanostack/unittest/stub/ws_common_stub.c |  2 +-
 test/nanostack/unittest/stub/ws_common_stub.h |  2 +-
 test/nanostack/unittest/stub/ws_ie_lib_stub.c |  2 +-
 test/nanostack/unittest/stub/ws_ie_lib_stub.h |  2 +-
 .../unittest/stub/ws_mpx_header_stub.c        |  2 +-
 .../unittest/stub/ws_mpx_header_stub.h        |  2 +-
 .../unittest/stub/ws_neighbour_class_stub.c   |  2 +-
 .../unittest/stub/ws_neighbour_class_stub.h   |  2 +-
 .../unittest/stub/ws_pae_controller_stub.c    |  2 +-
 .../unittest/stub/ws_pae_controller_stub.h    |  2 +-
 test/nanostack/unittest/stub/x509_stub.c      |  2 +-
 test/nanostack/unittest/thread/nvm/main.cpp   |  2 +-
 .../thread/nvm/test_thread_nvm_store.c        |  2 +-
 .../thread/nvm/test_thread_nvm_store.h        |  2 +-
 .../thread/nvm/thread_nvm_storetest.cpp       |  2 +-
 .../nanostack/unittest/thread/thread/main.cpp |  2 +-
 .../unittest/thread/thread/test_thread.c      |  2 +-
 .../unittest/thread/thread/test_thread.h      |  2 +-
 .../unittest/thread/thread/threadtest.cpp     |  2 +-
 .../unittest/thread/thread_bootstrap/main.cpp |  2 +-
 .../thread_bootstrap/test_thread_bootstrap.c  |  2 +-
 .../thread_bootstrap/test_thread_bootstrap.h  |  2 +-
 .../thread_bootstrap/thread_bootstraptest.cpp |  2 +-
 .../thread/thread_commissioning_api/main.cpp  |  2 +-
 .../test_thread_commissioning_api.c           |  2 +-
 .../test_thread_commissioning_api.h           |  2 +-
 .../thread_commissioning_apitest.cpp          |  2 +-
 .../thread/thread_commissioning_if/main.cpp   |  2 +-
 .../test_thread_commissioning_if.c            |  2 +-
 .../test_thread_commissioning_if.h            |  2 +-
 .../thread_commissioning_iftest.cpp           |  2 +-
 .../thread/thread_lowpower_api/main.cpp       |  2 +-
 .../test_thread_lowpower_api.c                |  2 +-
 .../test_thread_lowpower_api.h                |  2 +-
 .../thread_lowpower_apitest.cpp               |  2 +-
 .../thread/thread_management_client/main.cpp  |  2 +-
 .../test_thread_management_client.c           |  2 +-
 .../test_thread_management_client.h           |  2 +-
 .../thread_management_clienttest.cpp          |  2 +-
 .../thread/thread_management_server/main.cpp  |  2 +-
 .../test_thread_management_server.cpp         |  2 +-
 .../test_thread_management_server.h           |  2 +-
 .../thread_management_server_test.cpp         |  2 +-
 unittest/simulations/sim_address.c            |  2 +-
 unittest/simulations/sim_address.h            |  2 +-
 unittest/simulations/sim_nanostack.c          |  2 +-
 unittest/simulations/sim_socket_api.c         |  2 +-
 unittest/simulations/sim_socket_api.h         |  2 +-
 unittest/thread_dhcp/Test.c                   |  2 +-
 unittest/thread_dhcp_servers/Test.c           |  2 +-
 unittest/unity_improvement/unity_improved.c   |  2 +-
 unittest/unity_improvement/unity_improved.h   |  2 +-
 1219 files changed, 1242 insertions(+), 1266 deletions(-)

diff --git a/nanostack/cca_api.h b/nanostack/cca_api.h
index 6f276b62edb..3abe66093a2 100644
--- a/nanostack/cca_api.h
+++ b/nanostack/cca_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/ccmLIB.h b/nanostack/ccmLIB.h
index d168a6ed008..3ef95fe7d9e 100644
--- a/nanostack/ccmLIB.h
+++ b/nanostack/ccmLIB.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/dhcp_service_api.h b/nanostack/dhcp_service_api.h
index 869344192a0..e3485bf99e3 100644
--- a/nanostack/dhcp_service_api.h
+++ b/nanostack/dhcp_service_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018, Arm Limited and affiliates.
+ * Copyright (c) 2013-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/ethernet_mac_api.h b/nanostack/ethernet_mac_api.h
index 8460da680d2..22d40ca67c4 100644
--- a/nanostack/ethernet_mac_api.h
+++ b/nanostack/ethernet_mac_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/fhss_api.h b/nanostack/fhss_api.h
index e6aa23270e4..6060fd67dfe 100644
--- a/nanostack/fhss_api.h
+++ b/nanostack/fhss_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/fhss_config.h b/nanostack/fhss_config.h
index 545cb98cda8..fddd216b64e 100644
--- a/nanostack/fhss_config.h
+++ b/nanostack/fhss_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/fhss_test_api.h b/nanostack/fhss_test_api.h
index e6a93cc2c0b..1094b8c3442 100644
--- a/nanostack/fhss_test_api.h
+++ b/nanostack/fhss_test_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/fhss_ws_extension.h b/nanostack/fhss_ws_extension.h
index d98b5ace978..7516b10f74e 100644
--- a/nanostack/fhss_ws_extension.h
+++ b/nanostack/fhss_ws_extension.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/mac_api.h b/nanostack/mac_api.h
index 8f49a79d711..8cc4da258e2 100644
--- a/nanostack/mac_api.h
+++ b/nanostack/mac_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/mac_common_defines.h b/nanostack/mac_common_defines.h
index e64015c1bd6..082b5b4c34e 100644
--- a/nanostack/mac_common_defines.h
+++ b/nanostack/mac_common_defines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/mac_filter_api.h b/nanostack/mac_filter_api.h
index 0b7fe0349a3..a667901f1a3 100644
--- a/nanostack/mac_filter_api.h
+++ b/nanostack/mac_filter_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/mac_mcps.h b/nanostack/mac_mcps.h
index 8e99c2f4319..9f568819459 100644
--- a/nanostack/mac_mcps.h
+++ b/nanostack/mac_mcps.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/mlme.h b/nanostack/mlme.h
index 992046dfdea..2bd14e2bc8e 100644
--- a/nanostack/mlme.h
+++ b/nanostack/mlme.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018, Arm Limited and affiliates.
+ * Copyright (c) 2013-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/multicast_api.h b/nanostack/multicast_api.h
index a24f958fd86..1fa999bbbbc 100644
--- a/nanostack/multicast_api.h
+++ b/nanostack/multicast_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018, Arm Limited and affiliates.
+ * Copyright (c) 2012-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_6lowpan_parameter_api.h b/nanostack/net_6lowpan_parameter_api.h
index 0783ac9aaed..9e21bde1a5f 100644
--- a/nanostack/net_6lowpan_parameter_api.h
+++ b/nanostack/net_6lowpan_parameter_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_address_extension.h b/nanostack/net_address_extension.h
index 8f1ece0b706..5bbac60da7e 100644
--- a/nanostack/net_address_extension.h
+++ b/nanostack/net_address_extension.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_fhss.h b/nanostack/net_fhss.h
index 6d6003c9861..6f644966738 100644
--- a/nanostack/net_fhss.h
+++ b/nanostack/net_fhss.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_interface.h b/nanostack/net_interface.h
index 89c942ccb11..eb87675af5c 100644
--- a/nanostack/net_interface.h
+++ b/nanostack/net_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_ipv6_api.h b/nanostack/net_ipv6_api.h
index 7132d9057ff..9f23448ee52 100644
--- a/nanostack/net_ipv6_api.h
+++ b/nanostack/net_ipv6_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_load_balance_api.h b/nanostack/net_load_balance_api.h
index d198bd83156..c72b1e89dd1 100644
--- a/nanostack/net_load_balance_api.h
+++ b/nanostack/net_load_balance_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_mle_api.h b/nanostack/net_mle_api.h
index 2dde4426e9e..66eb9586f0a 100644
--- a/nanostack/net_mle_api.h
+++ b/nanostack/net_mle_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_nvm_api.h b/nanostack/net_nvm_api.h
index e790f63a87f..98c108e37d7 100644
--- a/nanostack/net_nvm_api.h
+++ b/nanostack/net_nvm_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_nwk_scan.h b/nanostack/net_nwk_scan.h
index f5b09126ff9..f12a3979985 100644
--- a/nanostack/net_nwk_scan.h
+++ b/nanostack/net_nwk_scan.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_pana_parameters_api.h b/nanostack/net_pana_parameters_api.h
index c3f63ff7eb3..924bf417e53 100644
--- a/nanostack/net_pana_parameters_api.h
+++ b/nanostack/net_pana_parameters_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_polling_api.h b/nanostack/net_polling_api.h
index de22f7db7d5..ea98ee7d3f4 100644
--- a/nanostack/net_polling_api.h
+++ b/nanostack/net_polling_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_rpl.h b/nanostack/net_rpl.h
index c65308130ea..d78bc80001d 100644
--- a/nanostack/net_rpl.h
+++ b/nanostack/net_rpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_sleep.h b/nanostack/net_sleep.h
index 3eb8ba3d442..da7b85d50b8 100644
--- a/nanostack/net_sleep.h
+++ b/nanostack/net_sleep.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_test_api.h b/nanostack/net_test_api.h
index 35322069b58..3ebe3eec4e7 100644
--- a/nanostack/net_test_api.h
+++ b/nanostack/net_test_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/net_thread_test.h b/nanostack/net_thread_test.h
index f88e19a56c6..0ab970a77c2 100644
--- a/nanostack/net_thread_test.h
+++ b/nanostack/net_thread_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nanostack/net_ws_test.h b/nanostack/net_ws_test.h
index 6bd20c658a3..234c12e0b10 100644
--- a/nanostack/net_ws_test.h
+++ b/nanostack/net_ws_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/ns_address.h b/nanostack/ns_address.h
index 0a820fb5513..50e7e96ba54 100644
--- a/nanostack/ns_address.h
+++ b/nanostack/ns_address.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2017, Arm Limited and affiliates.
+ * Copyright (c) 2010-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/ns_conf.h b/nanostack/ns_conf.h
index c8e6d506023..56b07875174 100644
--- a/nanostack/ns_conf.h
+++ b/nanostack/ns_conf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/ns_file_system.h b/nanostack/ns_file_system.h
index 031e3a16573..45a92f1efdb 100644
--- a/nanostack/ns_file_system.h
+++ b/nanostack/ns_file_system.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/ns_mdns_api.h b/nanostack/ns_mdns_api.h
index 7a92fb2c36f..bba6d2608a5 100644
--- a/nanostack/ns_mdns_api.h
+++ b/nanostack/ns_mdns_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/ns_sha256.h b/nanostack/ns_sha256.h
index d0881886085..fccded2cfa9 100644
--- a/nanostack/ns_sha256.h
+++ b/nanostack/ns_sha256.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018, Arm Limited and affiliates.
+ * Copyright (c) 2006-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/ns_time_api.h b/nanostack/ns_time_api.h
index a306bad7183..9e9e9539f89 100644
--- a/nanostack/ns_time_api.h
+++ b/nanostack/ns_time_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/ns_virtual_rf_api.h b/nanostack/ns_virtual_rf_api.h
index 6d64d2b3b3c..877709509a5 100644
--- a/nanostack/ns_virtual_rf_api.h
+++ b/nanostack/ns_virtual_rf_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/nwk_stats_api.h b/nanostack/nwk_stats_api.h
index d1c71cfd7bf..a53104a0b98 100644
--- a/nanostack/nwk_stats_api.h
+++ b/nanostack/nwk_stats_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, 2019-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/platform/arm_hal_aes.h b/nanostack/platform/arm_hal_aes.h
index e64c12050ed..60e7be7d26d 100644
--- a/nanostack/platform/arm_hal_aes.h
+++ b/nanostack/platform/arm_hal_aes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/platform/arm_hal_phy.h b/nanostack/platform/arm_hal_phy.h
index 62c46f85529..b4a19137426 100644
--- a/nanostack/platform/arm_hal_phy.h
+++ b/nanostack/platform/arm_hal_phy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/platform/os_whiteboard.h b/nanostack/platform/os_whiteboard.h
index 8709bc351a4..8348f754f49 100644
--- a/nanostack/platform/os_whiteboard.h
+++ b/nanostack/platform/os_whiteboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/platform/topo_trace.h b/nanostack/platform/topo_trace.h
index b8615ffc113..80c837ff739 100644
--- a/nanostack/platform/topo_trace.h
+++ b/nanostack/platform/topo_trace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/serial_mac_api.h b/nanostack/serial_mac_api.h
index 2b202e39bd1..dd5dc14f081 100644
--- a/nanostack/serial_mac_api.h
+++ b/nanostack/serial_mac_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/shalib.h b/nanostack/shalib.h
index 5aaa7f9d1a9..3883830c7f1 100644
--- a/nanostack/shalib.h
+++ b/nanostack/shalib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/socket_api.h b/nanostack/socket_api.h
index 0b5db6c825a..7cf8b577484 100644
--- a/nanostack/socket_api.h
+++ b/nanostack/socket_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2018, Arm Limited and affiliates.
+ * Copyright (c) 2010-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/sw_mac.h b/nanostack/sw_mac.h
index 894b8b75c4b..d150718110c 100644
--- a/nanostack/sw_mac.h
+++ b/nanostack/sw_mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/thread_bbr_api.h b/nanostack/thread_bbr_api.h
index 55a8e9f97da..2bfc2b1267b 100644
--- a/nanostack/thread_bbr_api.h
+++ b/nanostack/thread_bbr_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nanostack/thread_border_router_api.h b/nanostack/thread_border_router_api.h
index c5083a598c5..cbdaafc9a57 100644
--- a/nanostack/thread_border_router_api.h
+++ b/nanostack/thread_border_router_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nanostack/thread_commissioning_api.h b/nanostack/thread_commissioning_api.h
index fbba8b355e3..7235d415bba 100644
--- a/nanostack/thread_commissioning_api.h
+++ b/nanostack/thread_commissioning_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nanostack/thread_dhcpv6_server.h b/nanostack/thread_dhcpv6_server.h
index e0b1fab14c5..70df15d3106 100644
--- a/nanostack/thread_dhcpv6_server.h
+++ b/nanostack/thread_dhcpv6_server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nanostack/thread_diagcop_lib.h b/nanostack/thread_diagcop_lib.h
index abad9775cea..f1d92d98205 100644
--- a/nanostack/thread_diagcop_lib.h
+++ b/nanostack/thread_diagcop_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nanostack/thread_lowpower_api.h b/nanostack/thread_lowpower_api.h
index bf078280dcd..74033cbef23 100644
--- a/nanostack/thread_lowpower_api.h
+++ b/nanostack/thread_lowpower_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nanostack/thread_management_api.h b/nanostack/thread_management_api.h
index 42def140d66..cbc6693443f 100644
--- a/nanostack/thread_management_api.h
+++ b/nanostack/thread_management_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nanostack/thread_management_if.h b/nanostack/thread_management_if.h
index 9256e6149f7..0332d7faafc 100644
--- a/nanostack/thread_management_if.h
+++ b/nanostack/thread_management_if.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nanostack/thread_meshcop_lib.h b/nanostack/thread_meshcop_lib.h
index 583721d4d6e..67dab7150b2 100644
--- a/nanostack/thread_meshcop_lib.h
+++ b/nanostack/thread_meshcop_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nanostack/thread_net_config_api.h b/nanostack/thread_net_config_api.h
index c92f0c0b2ca..7830ef6d8c2 100644
--- a/nanostack/thread_net_config_api.h
+++ b/nanostack/thread_net_config_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nanostack/whiteboard_api.h b/nanostack/whiteboard_api.h
index 62cc5c7d2ea..61164a72523 100644
--- a/nanostack/whiteboard_api.h
+++ b/nanostack/whiteboard_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017, Arm Limited and affiliates.
+ * Copyright (c) 2011-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/ws_bbr_api.h b/nanostack/ws_bbr_api.h
index 6347e2c95cb..a1c15aa0614 100644
--- a/nanostack/ws_bbr_api.h
+++ b/nanostack/ws_bbr_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/nanostack/ws_management_api.h b/nanostack/ws_management_api.h
index 0d2d75c99bb..ddab5d40e51 100644
--- a/nanostack/ws_management_api.h
+++ b/nanostack/ws_management_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/Bootstraps/Generic/network_lib.c b/source/6LoWPAN/Bootstraps/Generic/network_lib.c
index 208b091b8a5..86d2d353b34 100644
--- a/source/6LoWPAN/Bootstraps/Generic/network_lib.c
+++ b/source/6LoWPAN/Bootstraps/Generic/network_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c b/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c
index 6c6a0ca4453..83bca13189b 100644
--- a/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c
+++ b/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c b/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c
index 11a2a8d989f..fa7ecae8b13 100644
--- a/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c
+++ b/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_interface.c b/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_interface.c
index 92ea3ce7382..0ac784303ab 100644
--- a/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_interface.c
+++ b/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_interface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/Bootstraps/network_lib.h b/source/6LoWPAN/Bootstraps/network_lib.h
index 2b856fd5a53..9bcbc515bc9 100644
--- a/source/6LoWPAN/Bootstraps/network_lib.h
+++ b/source/6LoWPAN/Bootstraps/network_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/Bootstraps/protocol_6lowpan.h b/source/6LoWPAN/Bootstraps/protocol_6lowpan.h
index 95515c1fd4f..ced19fdcb15 100644
--- a/source/6LoWPAN/Bootstraps/protocol_6lowpan.h
+++ b/source/6LoWPAN/Bootstraps/protocol_6lowpan.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h b/source/6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h
index 14bb8284960..0768034d037 100644
--- a/source/6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h
+++ b/source/6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/Bootstraps/protocol_6lowpan_interface.h b/source/6LoWPAN/Bootstraps/protocol_6lowpan_interface.h
index 017805735ca..175c6a696f9 100644
--- a/source/6LoWPAN/Bootstraps/protocol_6lowpan_interface.h
+++ b/source/6LoWPAN/Bootstraps/protocol_6lowpan_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/Fragmentation/cipv6_fragmenter.c b/source/6LoWPAN/Fragmentation/cipv6_fragmenter.c
index df2b4404e3c..ca4710241f6 100644
--- a/source/6LoWPAN/Fragmentation/cipv6_fragmenter.c
+++ b/source/6LoWPAN/Fragmentation/cipv6_fragmenter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/Fragmentation/cipv6_fragmenter.h b/source/6LoWPAN/Fragmentation/cipv6_fragmenter.h
index 28c3384a1de..42baadeedab 100644
--- a/source/6LoWPAN/Fragmentation/cipv6_fragmenter.h
+++ b/source/6LoWPAN/Fragmentation/cipv6_fragmenter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/IPHC_Decode/6lowpan_iphc.c b/source/6LoWPAN/IPHC_Decode/6lowpan_iphc.c
index b02b372fc1f..45c91e5ba73 100644
--- a/source/6LoWPAN/IPHC_Decode/6lowpan_iphc.c
+++ b/source/6LoWPAN/IPHC_Decode/6lowpan_iphc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018, Arm Limited and affiliates.
+ * Copyright (c) 2013-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/IPHC_Decode/cipv6.h b/source/6LoWPAN/IPHC_Decode/cipv6.h
index 28f55fd1129..764d042fb30 100644
--- a/source/6LoWPAN/IPHC_Decode/cipv6.h
+++ b/source/6LoWPAN/IPHC_Decode/cipv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/IPHC_Decode/iphc_compress.c b/source/6LoWPAN/IPHC_Decode/iphc_compress.c
index 735955aca9e..326cfd49ed4 100644
--- a/source/6LoWPAN/IPHC_Decode/iphc_compress.c
+++ b/source/6LoWPAN/IPHC_Decode/iphc_compress.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/IPHC_Decode/iphc_compress.h b/source/6LoWPAN/IPHC_Decode/iphc_compress.h
index b64074fb0d0..60610632259 100644
--- a/source/6LoWPAN/IPHC_Decode/iphc_compress.h
+++ b/source/6LoWPAN/IPHC_Decode/iphc_compress.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/IPHC_Decode/iphc_decompress.c b/source/6LoWPAN/IPHC_Decode/iphc_decompress.c
index eeeb48c2e19..988be702578 100644
--- a/source/6LoWPAN/IPHC_Decode/iphc_decompress.c
+++ b/source/6LoWPAN/IPHC_Decode/iphc_decompress.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/IPHC_Decode/iphc_decompress.h b/source/6LoWPAN/IPHC_Decode/iphc_decompress.h
index e2cd8d55dc8..7949fae7095 100644
--- a/source/6LoWPAN/IPHC_Decode/iphc_decompress.h
+++ b/source/6LoWPAN/IPHC_Decode/iphc_decompress.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/IPHC_Decode/lowpan_context.c b/source/6LoWPAN/IPHC_Decode/lowpan_context.c
index 1d9a68904a7..6a2d4e644f1 100644
--- a/source/6LoWPAN/IPHC_Decode/lowpan_context.c
+++ b/source/6LoWPAN/IPHC_Decode/lowpan_context.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/IPHC_Decode/lowpan_context.h b/source/6LoWPAN/IPHC_Decode/lowpan_context.h
index 0b8daf32cce..e9eb21be772 100644
--- a/source/6LoWPAN/IPHC_Decode/lowpan_context.h
+++ b/source/6LoWPAN/IPHC_Decode/lowpan_context.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/MAC/beacon_handler.c b/source/6LoWPAN/MAC/beacon_handler.c
index 34c7b3c98b3..d3d9a37f350 100644
--- a/source/6LoWPAN/MAC/beacon_handler.c
+++ b/source/6LoWPAN/MAC/beacon_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/MAC/beacon_handler.h b/source/6LoWPAN/MAC/beacon_handler.h
index c08680f60fb..11f7164b006 100644
--- a/source/6LoWPAN/MAC/beacon_handler.h
+++ b/source/6LoWPAN/MAC/beacon_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/MAC/mac_data_poll.c b/source/6LoWPAN/MAC/mac_data_poll.c
index 04491a4832c..c7af05a97ed 100644
--- a/source/6LoWPAN/MAC/mac_data_poll.c
+++ b/source/6LoWPAN/MAC/mac_data_poll.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/MAC/mac_data_poll.h b/source/6LoWPAN/MAC/mac_data_poll.h
index 877e3708628..8d31424ae20 100644
--- a/source/6LoWPAN/MAC/mac_data_poll.h
+++ b/source/6LoWPAN/MAC/mac_data_poll.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/MAC/mac_helper.c b/source/6LoWPAN/MAC/mac_helper.c
index 73d6690f972..515c16ce186 100644
--- a/source/6LoWPAN/MAC/mac_helper.c
+++ b/source/6LoWPAN/MAC/mac_helper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/MAC/mac_helper.h b/source/6LoWPAN/MAC/mac_helper.h
index f85916bcf78..ee04da6e969 100644
--- a/source/6LoWPAN/MAC/mac_helper.h
+++ b/source/6LoWPAN/MAC/mac_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/MAC/mac_ie_lib.c b/source/6LoWPAN/MAC/mac_ie_lib.c
index a4fab39a445..e6329bfbca0 100644
--- a/source/6LoWPAN/MAC/mac_ie_lib.c
+++ b/source/6LoWPAN/MAC/mac_ie_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/MAC/mac_ie_lib.h b/source/6LoWPAN/MAC/mac_ie_lib.h
index cd00984dcee..6cd0f5f82e9 100644
--- a/source/6LoWPAN/MAC/mac_ie_lib.h
+++ b/source/6LoWPAN/MAC/mac_ie_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/MAC/mac_pairwise_key.c b/source/6LoWPAN/MAC/mac_pairwise_key.c
index a9e61f77d46..34eaae54827 100644
--- a/source/6LoWPAN/MAC/mac_pairwise_key.c
+++ b/source/6LoWPAN/MAC/mac_pairwise_key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/MAC/mac_pairwise_key.h b/source/6LoWPAN/MAC/mac_pairwise_key.h
index a28cac60a73..dc7a7ba4de1 100644
--- a/source/6LoWPAN/MAC/mac_pairwise_key.h
+++ b/source/6LoWPAN/MAC/mac_pairwise_key.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/MAC/mac_response_handler.c b/source/6LoWPAN/MAC/mac_response_handler.c
index 68054aa1ce6..7b36644952e 100644
--- a/source/6LoWPAN/MAC/mac_response_handler.c
+++ b/source/6LoWPAN/MAC/mac_response_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/MAC/mac_response_handler.h b/source/6LoWPAN/MAC/mac_response_handler.h
index dc58042ee7c..7aa5a91c580 100644
--- a/source/6LoWPAN/MAC/mac_response_handler.h
+++ b/source/6LoWPAN/MAC/mac_response_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/MAC/mpx_api.h b/source/6LoWPAN/MAC/mpx_api.h
index b210e4a3954..0a3042ce2bb 100644
--- a/source/6LoWPAN/MAC/mpx_api.h
+++ b/source/6LoWPAN/MAC/mpx_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/Mesh/mesh.c b/source/6LoWPAN/Mesh/mesh.c
index 4cdbbb138c2..5ee8d2cf455 100644
--- a/source/6LoWPAN/Mesh/mesh.c
+++ b/source/6LoWPAN/Mesh/mesh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/Mesh/mesh.h b/source/6LoWPAN/Mesh/mesh.h
index 469d19f7aa3..32ef979f088 100644
--- a/source/6LoWPAN/Mesh/mesh.h
+++ b/source/6LoWPAN/Mesh/mesh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ND/nd_defines.h b/source/6LoWPAN/ND/nd_defines.h
index 6cc37bd17c8..36f381e0a3d 100644
--- a/source/6LoWPAN/ND/nd_defines.h
+++ b/source/6LoWPAN/ND/nd_defines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ND/nd_router_object.c b/source/6LoWPAN/ND/nd_router_object.c
index 25441af0a3f..40aa092de52 100644
--- a/source/6LoWPAN/ND/nd_router_object.c
+++ b/source/6LoWPAN/ND/nd_router_object.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ND/nd_router_object.h b/source/6LoWPAN/ND/nd_router_object.h
index 78d494fbf4e..a369ed84c34 100644
--- a/source/6LoWPAN/ND/nd_router_object.h
+++ b/source/6LoWPAN/ND/nd_router_object.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/NVM/nwk_nvm.c b/source/6LoWPAN/NVM/nwk_nvm.c
index 1da43f28cf4..4a57e129a9f 100644
--- a/source/6LoWPAN/NVM/nwk_nvm.c
+++ b/source/6LoWPAN/NVM/nwk_nvm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/NVM/nwk_nvm.h b/source/6LoWPAN/NVM/nwk_nvm.h
index 5b4c82dc416..6950f4d2a1c 100644
--- a/source/6LoWPAN/NVM/nwk_nvm.h
+++ b/source/6LoWPAN/NVM/nwk_nvm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/Thread/thread_bbr_api.c b/source/6LoWPAN/Thread/thread_bbr_api.c
index bab9f73d6f9..bae8e8a3c79 100644
--- a/source/6LoWPAN/Thread/thread_bbr_api.c
+++ b/source/6LoWPAN/Thread/thread_bbr_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2020, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_bbr_api_internal.h b/source/6LoWPAN/Thread/thread_bbr_api_internal.h
index e9074ebd67b..ca71446a213 100644
--- a/source/6LoWPAN/Thread/thread_bbr_api_internal.h
+++ b/source/6LoWPAN/Thread/thread_bbr_api_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_bbr_commercial.c b/source/6LoWPAN/Thread/thread_bbr_commercial.c
index 6bab9b0c8a4..3abd7735e22 100644
--- a/source/6LoWPAN/Thread/thread_bbr_commercial.c
+++ b/source/6LoWPAN/Thread/thread_bbr_commercial.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_bbr_commercial.h b/source/6LoWPAN/Thread/thread_bbr_commercial.h
index ebe3aa7705f..eedf71cbce7 100644
--- a/source/6LoWPAN/Thread/thread_bbr_commercial.h
+++ b/source/6LoWPAN/Thread/thread_bbr_commercial.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_beacon.c b/source/6LoWPAN/Thread/thread_beacon.c
index 115cf021344..e9e8bf91d2b 100644
--- a/source/6LoWPAN/Thread/thread_beacon.c
+++ b/source/6LoWPAN/Thread/thread_beacon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_beacon.h b/source/6LoWPAN/Thread/thread_beacon.h
index bd50f1a15ae..69a924ad08a 100644
--- a/source/6LoWPAN/Thread/thread_beacon.h
+++ b/source/6LoWPAN/Thread/thread_beacon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_bootstrap.c b/source/6LoWPAN/Thread/thread_bootstrap.c
index 1d0537d3438..af16058f13d 100644
--- a/source/6LoWPAN/Thread/thread_bootstrap.c
+++ b/source/6LoWPAN/Thread/thread_bootstrap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2020, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_bootstrap.h b/source/6LoWPAN/Thread/thread_bootstrap.h
index c1e155a504a..13383e8a188 100644
--- a/source/6LoWPAN/Thread/thread_bootstrap.h
+++ b/source/6LoWPAN/Thread/thread_bootstrap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_border_router_api.c b/source/6LoWPAN/Thread/thread_border_router_api.c
index fc7a009bf98..d035b16d082 100644
--- a/source/6LoWPAN/Thread/thread_border_router_api.c
+++ b/source/6LoWPAN/Thread/thread_border_router_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_border_router_api_internal.h b/source/6LoWPAN/Thread/thread_border_router_api_internal.h
index 53db69b22bd..88d9494acaf 100644
--- a/source/6LoWPAN/Thread/thread_border_router_api_internal.h
+++ b/source/6LoWPAN/Thread/thread_border_router_api_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_ccm.c b/source/6LoWPAN/Thread/thread_ccm.c
index e4da36ce640..0795599e8b5 100644
--- a/source/6LoWPAN/Thread/thread_ccm.c
+++ b/source/6LoWPAN/Thread/thread_ccm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_ccm.h b/source/6LoWPAN/Thread/thread_ccm.h
index ca84cb6dfe0..72958da2f68 100644
--- a/source/6LoWPAN/Thread/thread_ccm.h
+++ b/source/6LoWPAN/Thread/thread_ccm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_commissioning_api.c b/source/6LoWPAN/Thread/thread_commissioning_api.c
index 2b498bb1512..f9939a1cc2f 100644
--- a/source/6LoWPAN/Thread/thread_commissioning_api.c
+++ b/source/6LoWPAN/Thread/thread_commissioning_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_commissioning_if.c b/source/6LoWPAN/Thread/thread_commissioning_if.c
index af327f6cb33..29274f10b36 100644
--- a/source/6LoWPAN/Thread/thread_commissioning_if.c
+++ b/source/6LoWPAN/Thread/thread_commissioning_if.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_commissioning_if.h b/source/6LoWPAN/Thread/thread_commissioning_if.h
index 448c0ce3c4c..3aba2c31e43 100644
--- a/source/6LoWPAN/Thread/thread_commissioning_if.h
+++ b/source/6LoWPAN/Thread/thread_commissioning_if.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_common.c b/source/6LoWPAN/Thread/thread_common.c
index 8e843f5673a..a5146cc29b4 100644
--- a/source/6LoWPAN/Thread/thread_common.c
+++ b/source/6LoWPAN/Thread/thread_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017-2020, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_common.h b/source/6LoWPAN/Thread/thread_common.h
index 9e3d6a971f0..2850c9481f0 100644
--- a/source/6LoWPAN/Thread/thread_common.h
+++ b/source/6LoWPAN/Thread/thread_common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_config.h b/source/6LoWPAN/Thread/thread_config.h
index 4b8d41db186..574b5d69e1e 100644
--- a/source/6LoWPAN/Thread/thread_config.h
+++ b/source/6LoWPAN/Thread/thread_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_constants.h b/source/6LoWPAN/Thread/thread_constants.h
index 2ad12b4271c..12cd1ee8d9c 100644
--- a/source/6LoWPAN/Thread/thread_constants.h
+++ b/source/6LoWPAN/Thread/thread_constants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_dhcpv6_server.c b/source/6LoWPAN/Thread/thread_dhcpv6_server.c
index c01e385bb05..951ed6b1009 100644
--- a/source/6LoWPAN/Thread/thread_dhcpv6_server.c
+++ b/source/6LoWPAN/Thread/thread_dhcpv6_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_dhcpv6_server.h b/source/6LoWPAN/Thread/thread_dhcpv6_server.h
index b8e56a63f0b..ed17352db5d 100644
--- a/source/6LoWPAN/Thread/thread_dhcpv6_server.h
+++ b/source/6LoWPAN/Thread/thread_dhcpv6_server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_diagnostic.c b/source/6LoWPAN/Thread/thread_diagnostic.c
index 4dafbd34bda..23f627dea5f 100644
--- a/source/6LoWPAN/Thread/thread_diagnostic.c
+++ b/source/6LoWPAN/Thread/thread_diagnostic.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_diagnostic.h b/source/6LoWPAN/Thread/thread_diagnostic.h
index 5e787e44012..fe217ed7d7f 100644
--- a/source/6LoWPAN/Thread/thread_diagnostic.h
+++ b/source/6LoWPAN/Thread/thread_diagnostic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_discovery.c b/source/6LoWPAN/Thread/thread_discovery.c
index 278e69a5410..61dfe6e2c2d 100644
--- a/source/6LoWPAN/Thread/thread_discovery.c
+++ b/source/6LoWPAN/Thread/thread_discovery.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_discovery.h b/source/6LoWPAN/Thread/thread_discovery.h
index 1e44c1b2be9..336173d2738 100644
--- a/source/6LoWPAN/Thread/thread_discovery.h
+++ b/source/6LoWPAN/Thread/thread_discovery.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_host_bootstrap.c b/source/6LoWPAN/Thread/thread_host_bootstrap.c
index 35a95c6227c..64f48b7b3d9 100644
--- a/source/6LoWPAN/Thread/thread_host_bootstrap.c
+++ b/source/6LoWPAN/Thread/thread_host_bootstrap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_host_bootstrap.h b/source/6LoWPAN/Thread/thread_host_bootstrap.h
index b5411545273..b76bcc2e5c9 100644
--- a/source/6LoWPAN/Thread/thread_host_bootstrap.h
+++ b/source/6LoWPAN/Thread/thread_host_bootstrap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_joiner_application.c b/source/6LoWPAN/Thread/thread_joiner_application.c
index e880b7e0a82..481dc23775e 100644
--- a/source/6LoWPAN/Thread/thread_joiner_application.c
+++ b/source/6LoWPAN/Thread/thread_joiner_application.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_joiner_application.h b/source/6LoWPAN/Thread/thread_joiner_application.h
index 9f5dc88a4c5..90646ae8131 100644
--- a/source/6LoWPAN/Thread/thread_joiner_application.h
+++ b/source/6LoWPAN/Thread/thread_joiner_application.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_leader_service.c b/source/6LoWPAN/Thread/thread_leader_service.c
index 73a6000893b..404b701c8e7 100644
--- a/source/6LoWPAN/Thread/thread_leader_service.c
+++ b/source/6LoWPAN/Thread/thread_leader_service.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_leader_service.h b/source/6LoWPAN/Thread/thread_leader_service.h
index a28bb9202f5..b1a0cc212e4 100644
--- a/source/6LoWPAN/Thread/thread_leader_service.h
+++ b/source/6LoWPAN/Thread/thread_leader_service.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_lowpower_api.c b/source/6LoWPAN/Thread/thread_lowpower_api.c
index bfae858d6b7..c953d323ca8 100644
--- a/source/6LoWPAN/Thread/thread_lowpower_api.c
+++ b/source/6LoWPAN/Thread/thread_lowpower_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_lowpower_private_api.c b/source/6LoWPAN/Thread/thread_lowpower_private_api.c
index 06ba84d684e..0d78c4f361e 100644
--- a/source/6LoWPAN/Thread/thread_lowpower_private_api.c
+++ b/source/6LoWPAN/Thread/thread_lowpower_private_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_lowpower_private_api.h b/source/6LoWPAN/Thread/thread_lowpower_private_api.h
index faed87cbbab..9a1c3d614ef 100644
--- a/source/6LoWPAN/Thread/thread_lowpower_private_api.h
+++ b/source/6LoWPAN/Thread/thread_lowpower_private_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_management_api.c b/source/6LoWPAN/Thread/thread_management_api.c
index 60e02e3aee3..9b41ad0e9bf 100644
--- a/source/6LoWPAN/Thread/thread_management_api.c
+++ b/source/6LoWPAN/Thread/thread_management_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_management_client.c b/source/6LoWPAN/Thread/thread_management_client.c
index 50950f5b2b7..fb8ea1138ca 100644
--- a/source/6LoWPAN/Thread/thread_management_client.c
+++ b/source/6LoWPAN/Thread/thread_management_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_management_client.h b/source/6LoWPAN/Thread/thread_management_client.h
index 7822b5757c7..86d61de2c80 100644
--- a/source/6LoWPAN/Thread/thread_management_client.h
+++ b/source/6LoWPAN/Thread/thread_management_client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_management_if.c b/source/6LoWPAN/Thread/thread_management_if.c
index 2a35d85dfeb..76fd5739a62 100644
--- a/source/6LoWPAN/Thread/thread_management_if.c
+++ b/source/6LoWPAN/Thread/thread_management_if.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_management_internal.h b/source/6LoWPAN/Thread/thread_management_internal.h
index 3e3dac832fe..e4e3891d8a9 100644
--- a/source/6LoWPAN/Thread/thread_management_internal.h
+++ b/source/6LoWPAN/Thread/thread_management_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_management_server.c b/source/6LoWPAN/Thread/thread_management_server.c
index 5d602813ada..cbab57d3ab3 100644
--- a/source/6LoWPAN/Thread/thread_management_server.c
+++ b/source/6LoWPAN/Thread/thread_management_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_management_server.h b/source/6LoWPAN/Thread/thread_management_server.h
index 8f3552791a8..c2d41dfc976 100644
--- a/source/6LoWPAN/Thread/thread_management_server.h
+++ b/source/6LoWPAN/Thread/thread_management_server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_mdns.c b/source/6LoWPAN/Thread/thread_mdns.c
index 168bff5e81e..4607f3f7221 100644
--- a/source/6LoWPAN/Thread/thread_mdns.c
+++ b/source/6LoWPAN/Thread/thread_mdns.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_mdns.h b/source/6LoWPAN/Thread/thread_mdns.h
index 0f9a1547f9e..a9a603db109 100644
--- a/source/6LoWPAN/Thread/thread_mdns.h
+++ b/source/6LoWPAN/Thread/thread_mdns.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_meshcop_lib.c b/source/6LoWPAN/Thread/thread_meshcop_lib.c
index 09a70ce6827..acd798c2c39 100644
--- a/source/6LoWPAN/Thread/thread_meshcop_lib.c
+++ b/source/6LoWPAN/Thread/thread_meshcop_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_mle_message_handler.c b/source/6LoWPAN/Thread/thread_mle_message_handler.c
index 9a465fbc272..716aa2ef02b 100644
--- a/source/6LoWPAN/Thread/thread_mle_message_handler.c
+++ b/source/6LoWPAN/Thread/thread_mle_message_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_mle_message_handler.h b/source/6LoWPAN/Thread/thread_mle_message_handler.h
index 6eb6dd7dbc4..5ea3e327bcd 100644
--- a/source/6LoWPAN/Thread/thread_mle_message_handler.h
+++ b/source/6LoWPAN/Thread/thread_mle_message_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_nd.c b/source/6LoWPAN/Thread/thread_nd.c
index ceff56d07f1..89429438a55 100644
--- a/source/6LoWPAN/Thread/thread_nd.c
+++ b/source/6LoWPAN/Thread/thread_nd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_nd.h b/source/6LoWPAN/Thread/thread_nd.h
index 60277db436c..bcc47c599db 100644
--- a/source/6LoWPAN/Thread/thread_nd.h
+++ b/source/6LoWPAN/Thread/thread_nd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_neighbor_class.c b/source/6LoWPAN/Thread/thread_neighbor_class.c
index bf0eead1b6f..95f2a43cc6d 100644
--- a/source/6LoWPAN/Thread/thread_neighbor_class.c
+++ b/source/6LoWPAN/Thread/thread_neighbor_class.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_neighbor_class.h b/source/6LoWPAN/Thread/thread_neighbor_class.h
index 5244441741c..4d82195cf21 100644
--- a/source/6LoWPAN/Thread/thread_neighbor_class.h
+++ b/source/6LoWPAN/Thread/thread_neighbor_class.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_net_config_api.c b/source/6LoWPAN/Thread/thread_net_config_api.c
index 62831be013d..84ad064604c 100644
--- a/source/6LoWPAN/Thread/thread_net_config_api.c
+++ b/source/6LoWPAN/Thread/thread_net_config_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_network_data_lib.c b/source/6LoWPAN/Thread/thread_network_data_lib.c
index c7167e59375..8f1d9865ea8 100644
--- a/source/6LoWPAN/Thread/thread_network_data_lib.c
+++ b/source/6LoWPAN/Thread/thread_network_data_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_network_data_lib.h b/source/6LoWPAN/Thread/thread_network_data_lib.h
index 5c379011115..144af502d93 100644
--- a/source/6LoWPAN/Thread/thread_network_data_lib.h
+++ b/source/6LoWPAN/Thread/thread_network_data_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_network_data_storage.c b/source/6LoWPAN/Thread/thread_network_data_storage.c
index 38576ac17e7..2b43176ce70 100755
--- a/source/6LoWPAN/Thread/thread_network_data_storage.c
+++ b/source/6LoWPAN/Thread/thread_network_data_storage.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_network_data_storage.h b/source/6LoWPAN/Thread/thread_network_data_storage.h
index 54bef09e9b0..8269821f3b7 100644
--- a/source/6LoWPAN/Thread/thread_network_data_storage.h
+++ b/source/6LoWPAN/Thread/thread_network_data_storage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_network_synch.c b/source/6LoWPAN/Thread/thread_network_synch.c
index 1ffbdc8da97..19c858e648d 100644
--- a/source/6LoWPAN/Thread/thread_network_synch.c
+++ b/source/6LoWPAN/Thread/thread_network_synch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_network_synch.h b/source/6LoWPAN/Thread/thread_network_synch.h
index eb85ae0a03f..36adc78b693 100644
--- a/source/6LoWPAN/Thread/thread_network_synch.h
+++ b/source/6LoWPAN/Thread/thread_network_synch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_nvm_store.c b/source/6LoWPAN/Thread/thread_nvm_store.c
index 876639933c5..bc97297094c 100644
--- a/source/6LoWPAN/Thread/thread_nvm_store.c
+++ b/source/6LoWPAN/Thread/thread_nvm_store.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2020, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_nvm_store.h b/source/6LoWPAN/Thread/thread_nvm_store.h
index bba95038a5e..5c03f9f7161 100644
--- a/source/6LoWPAN/Thread/thread_nvm_store.h
+++ b/source/6LoWPAN/Thread/thread_nvm_store.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_resolution_client.c b/source/6LoWPAN/Thread/thread_resolution_client.c
index 79740a0296c..7ff35498717 100644
--- a/source/6LoWPAN/Thread/thread_resolution_client.c
+++ b/source/6LoWPAN/Thread/thread_resolution_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_resolution_client.h b/source/6LoWPAN/Thread/thread_resolution_client.h
index aec6f3911ac..4f42a527a5d 100644
--- a/source/6LoWPAN/Thread/thread_resolution_client.h
+++ b/source/6LoWPAN/Thread/thread_resolution_client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_resolution_server.c b/source/6LoWPAN/Thread/thread_resolution_server.c
index bbf2821eff4..e21c71d9d42 100644
--- a/source/6LoWPAN/Thread/thread_resolution_server.c
+++ b/source/6LoWPAN/Thread/thread_resolution_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_resolution_server.h b/source/6LoWPAN/Thread/thread_resolution_server.h
index 77fa6110454..ea003a0bab3 100644
--- a/source/6LoWPAN/Thread/thread_resolution_server.h
+++ b/source/6LoWPAN/Thread/thread_resolution_server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_router_bootstrap.c b/source/6LoWPAN/Thread/thread_router_bootstrap.c
index df32d174f6c..29066cf88fa 100644
--- a/source/6LoWPAN/Thread/thread_router_bootstrap.c
+++ b/source/6LoWPAN/Thread/thread_router_bootstrap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_router_bootstrap.h b/source/6LoWPAN/Thread/thread_router_bootstrap.h
index 6874a01b0bb..b32982aa938 100644
--- a/source/6LoWPAN/Thread/thread_router_bootstrap.h
+++ b/source/6LoWPAN/Thread/thread_router_bootstrap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_routing.c b/source/6LoWPAN/Thread/thread_routing.c
index 18a6f04f6a8..1bb410f6f07 100644
--- a/source/6LoWPAN/Thread/thread_routing.c
+++ b/source/6LoWPAN/Thread/thread_routing.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_routing.h b/source/6LoWPAN/Thread/thread_routing.h
index 720cecbe3ee..ef53fcc1e8d 100644
--- a/source/6LoWPAN/Thread/thread_routing.h
+++ b/source/6LoWPAN/Thread/thread_routing.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_test_api.c b/source/6LoWPAN/Thread/thread_test_api.c
index 79a39724251..ac9faec8965 100644
--- a/source/6LoWPAN/Thread/thread_test_api.c
+++ b/source/6LoWPAN/Thread/thread_test_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/Thread/thread_tmfcop_lib.h b/source/6LoWPAN/Thread/thread_tmfcop_lib.h
index d6ab869f50e..7827a019f95 100644
--- a/source/6LoWPAN/Thread/thread_tmfcop_lib.h
+++ b/source/6LoWPAN/Thread/thread_tmfcop_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/source/6LoWPAN/adaptation_interface.c b/source/6LoWPAN/adaptation_interface.c
index e2e3ce6f97e..58bd7154de5 100644
--- a/source/6LoWPAN/adaptation_interface.c
+++ b/source/6LoWPAN/adaptation_interface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/lowpan_adaptation_interface.h b/source/6LoWPAN/lowpan_adaptation_interface.h
index 0ea712ec40e..7e8227bb25d 100644
--- a/source/6LoWPAN/lowpan_adaptation_interface.h
+++ b/source/6LoWPAN/lowpan_adaptation_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_bbr_api.c b/source/6LoWPAN/ws/ws_bbr_api.c
index 1fc5a5940c3..6daa996c80a 100644
--- a/source/6LoWPAN/ws/ws_bbr_api.c
+++ b/source/6LoWPAN/ws/ws_bbr_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_bbr_api_internal.h b/source/6LoWPAN/ws/ws_bbr_api_internal.h
index 24779fdc220..dab05547eb9 100644
--- a/source/6LoWPAN/ws/ws_bbr_api_internal.h
+++ b/source/6LoWPAN/ws/ws_bbr_api_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
index 7c455e2e6fa..332fe782a6e 100644
--- a/source/6LoWPAN/ws/ws_bootstrap.c
+++ b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_bootstrap.h b/source/6LoWPAN/ws/ws_bootstrap.h
index a1a5451e8dc..1d41c80a75e 100644
--- a/source/6LoWPAN/ws/ws_bootstrap.h
+++ b/source/6LoWPAN/ws/ws_bootstrap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_cfg_settings.c b/source/6LoWPAN/ws/ws_cfg_settings.c
index 32254b214b6..5da0292b1d9 100644
--- a/source/6LoWPAN/ws/ws_cfg_settings.c
+++ b/source/6LoWPAN/ws/ws_cfg_settings.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_cfg_settings.h b/source/6LoWPAN/ws/ws_cfg_settings.h
index 6b5dd98bce6..6fcfeec2b5c 100644
--- a/source/6LoWPAN/ws/ws_cfg_settings.h
+++ b/source/6LoWPAN/ws/ws_cfg_settings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_common.c b/source/6LoWPAN/ws/ws_common.c
index 4a77f37bab6..61537832df7 100644
--- a/source/6LoWPAN/ws/ws_common.c
+++ b/source/6LoWPAN/ws/ws_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_common.h b/source/6LoWPAN/ws/ws_common.h
index c93ba400ebe..40fbd0a16de 100644
--- a/source/6LoWPAN/ws/ws_common.h
+++ b/source/6LoWPAN/ws/ws_common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_common_defines.h b/source/6LoWPAN/ws/ws_common_defines.h
index 1657d9ee6b8..8ea6ab3f068 100644
--- a/source/6LoWPAN/ws/ws_common_defines.h
+++ b/source/6LoWPAN/ws/ws_common_defines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_config.h b/source/6LoWPAN/ws/ws_config.h
index b18d0fe493d..c65ab94570b 100644
--- a/source/6LoWPAN/ws/ws_config.h
+++ b/source/6LoWPAN/ws/ws_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_eapol_auth_relay.c b/source/6LoWPAN/ws/ws_eapol_auth_relay.c
index da121c33d93..f3ef62c9694 100644
--- a/source/6LoWPAN/ws/ws_eapol_auth_relay.c
+++ b/source/6LoWPAN/ws/ws_eapol_auth_relay.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_eapol_auth_relay.h b/source/6LoWPAN/ws/ws_eapol_auth_relay.h
index d0a7aa6c09d..6f517500ce8 100644
--- a/source/6LoWPAN/ws/ws_eapol_auth_relay.h
+++ b/source/6LoWPAN/ws/ws_eapol_auth_relay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_eapol_pdu.c b/source/6LoWPAN/ws/ws_eapol_pdu.c
index e5c2f64c843..6ca3287e26d 100644
--- a/source/6LoWPAN/ws/ws_eapol_pdu.c
+++ b/source/6LoWPAN/ws/ws_eapol_pdu.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_eapol_pdu.h b/source/6LoWPAN/ws/ws_eapol_pdu.h
index 5c5320c0a8c..48a4cfe50a5 100644
--- a/source/6LoWPAN/ws/ws_eapol_pdu.h
+++ b/source/6LoWPAN/ws/ws_eapol_pdu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_eapol_relay.c b/source/6LoWPAN/ws/ws_eapol_relay.c
index 2c2a6a3b93c..e1cfbf8d08a 100644
--- a/source/6LoWPAN/ws/ws_eapol_relay.c
+++ b/source/6LoWPAN/ws/ws_eapol_relay.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_eapol_relay.h b/source/6LoWPAN/ws/ws_eapol_relay.h
index dbbfbc584a8..94a8f44c560 100644
--- a/source/6LoWPAN/ws/ws_eapol_relay.h
+++ b/source/6LoWPAN/ws/ws_eapol_relay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_eapol_relay_lib.c b/source/6LoWPAN/ws/ws_eapol_relay_lib.c
index 4352d77149d..17fb0e221a1 100644
--- a/source/6LoWPAN/ws/ws_eapol_relay_lib.c
+++ b/source/6LoWPAN/ws/ws_eapol_relay_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_eapol_relay_lib.h b/source/6LoWPAN/ws/ws_eapol_relay_lib.h
index b1c387951aa..36ff5584ae8 100644
--- a/source/6LoWPAN/ws/ws_eapol_relay_lib.h
+++ b/source/6LoWPAN/ws/ws_eapol_relay_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_empty_functions.c b/source/6LoWPAN/ws/ws_empty_functions.c
index 3f6279685d4..83bb511f147 100644
--- a/source/6LoWPAN/ws/ws_empty_functions.c
+++ b/source/6LoWPAN/ws/ws_empty_functions.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_ie_lib.c b/source/6LoWPAN/ws/ws_ie_lib.c
index 633b01c60ed..5edd436dbce 100644
--- a/source/6LoWPAN/ws/ws_ie_lib.c
+++ b/source/6LoWPAN/ws/ws_ie_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_ie_lib.h b/source/6LoWPAN/ws/ws_ie_lib.h
index 3be8bff8b5a..3198763c07b 100644
--- a/source/6LoWPAN/ws/ws_ie_lib.h
+++ b/source/6LoWPAN/ws/ws_ie_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_llc.h b/source/6LoWPAN/ws/ws_llc.h
index 3fc2a195527..9e905b7bbc7 100644
--- a/source/6LoWPAN/ws/ws_llc.h
+++ b/source/6LoWPAN/ws/ws_llc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_llc_data_service.c b/source/6LoWPAN/ws/ws_llc_data_service.c
index 3ec99557331..35e87582e77 100644
--- a/source/6LoWPAN/ws/ws_llc_data_service.c
+++ b/source/6LoWPAN/ws/ws_llc_data_service.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_management_api.c b/source/6LoWPAN/ws/ws_management_api.c
index d1bb845d8e0..61c9e4b6e55 100644
--- a/source/6LoWPAN/ws/ws_management_api.c
+++ b/source/6LoWPAN/ws/ws_management_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_mpx_header.c b/source/6LoWPAN/ws/ws_mpx_header.c
index 6d0ad5ae56b..14a805c207f 100644
--- a/source/6LoWPAN/ws/ws_mpx_header.c
+++ b/source/6LoWPAN/ws/ws_mpx_header.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_mpx_header.h b/source/6LoWPAN/ws/ws_mpx_header.h
index 2e64b0571b1..ee1d48d669e 100644
--- a/source/6LoWPAN/ws/ws_mpx_header.h
+++ b/source/6LoWPAN/ws/ws_mpx_header.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_neighbor_class.c b/source/6LoWPAN/ws/ws_neighbor_class.c
index ab24bf0ed83..20d29cbc4d2 100644
--- a/source/6LoWPAN/ws/ws_neighbor_class.c
+++ b/source/6LoWPAN/ws/ws_neighbor_class.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_neighbor_class.h b/source/6LoWPAN/ws/ws_neighbor_class.h
index 516196abdf8..1bb82adb28c 100644
--- a/source/6LoWPAN/ws/ws_neighbor_class.h
+++ b/source/6LoWPAN/ws/ws_neighbor_class.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_auth.c b/source/6LoWPAN/ws/ws_pae_auth.c
index 452f3c5015d..4a1b4c1e7c6 100644
--- a/source/6LoWPAN/ws/ws_pae_auth.c
+++ b/source/6LoWPAN/ws/ws_pae_auth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_auth.h b/source/6LoWPAN/ws/ws_pae_auth.h
index 506ee4ee7bb..4b6dd074323 100644
--- a/source/6LoWPAN/ws/ws_pae_auth.h
+++ b/source/6LoWPAN/ws/ws_pae_auth.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_controller.c b/source/6LoWPAN/ws/ws_pae_controller.c
index 0f299ce55d6..3d1a6f81f4e 100644
--- a/source/6LoWPAN/ws/ws_pae_controller.c
+++ b/source/6LoWPAN/ws/ws_pae_controller.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_controller.h b/source/6LoWPAN/ws/ws_pae_controller.h
index 516a6cf22d3..40cd01fb0b9 100644
--- a/source/6LoWPAN/ws/ws_pae_controller.h
+++ b/source/6LoWPAN/ws/ws_pae_controller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_key_storage.c b/source/6LoWPAN/ws/ws_pae_key_storage.c
index e8026364a3d..373f2c0619f 100644
--- a/source/6LoWPAN/ws/ws_pae_key_storage.c
+++ b/source/6LoWPAN/ws/ws_pae_key_storage.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_key_storage.h b/source/6LoWPAN/ws/ws_pae_key_storage.h
index c0ca7cac04a..39e6df60e03 100644
--- a/source/6LoWPAN/ws/ws_pae_key_storage.h
+++ b/source/6LoWPAN/ws/ws_pae_key_storage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_lib.c b/source/6LoWPAN/ws/ws_pae_lib.c
index fb635e7741e..bc14ba93ab9 100644
--- a/source/6LoWPAN/ws/ws_pae_lib.c
+++ b/source/6LoWPAN/ws/ws_pae_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_lib.h b/source/6LoWPAN/ws/ws_pae_lib.h
index e29ef5bd0f2..3d1c8a148e3 100644
--- a/source/6LoWPAN/ws/ws_pae_lib.h
+++ b/source/6LoWPAN/ws/ws_pae_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_nvm_data.c b/source/6LoWPAN/ws/ws_pae_nvm_data.c
index ba575c2acb0..27eacbc45f0 100644
--- a/source/6LoWPAN/ws/ws_pae_nvm_data.c
+++ b/source/6LoWPAN/ws/ws_pae_nvm_data.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_nvm_data.h b/source/6LoWPAN/ws/ws_pae_nvm_data.h
index 3d6e6432312..9194e2b5b98 100644
--- a/source/6LoWPAN/ws/ws_pae_nvm_data.h
+++ b/source/6LoWPAN/ws/ws_pae_nvm_data.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_nvm_store.c b/source/6LoWPAN/ws/ws_pae_nvm_store.c
index b4a9108bcad..065d9d0598f 100644
--- a/source/6LoWPAN/ws/ws_pae_nvm_store.c
+++ b/source/6LoWPAN/ws/ws_pae_nvm_store.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_nvm_store.h b/source/6LoWPAN/ws/ws_pae_nvm_store.h
index bf18915c1b3..32fd0bafdec 100644
--- a/source/6LoWPAN/ws/ws_pae_nvm_store.h
+++ b/source/6LoWPAN/ws/ws_pae_nvm_store.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_supp.c b/source/6LoWPAN/ws/ws_pae_supp.c
index d73de75a2be..ea72ed6ddd4 100644
--- a/source/6LoWPAN/ws/ws_pae_supp.c
+++ b/source/6LoWPAN/ws/ws_pae_supp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_supp.h b/source/6LoWPAN/ws/ws_pae_supp.h
index 0642872896a..1ccd78c21ea 100644
--- a/source/6LoWPAN/ws/ws_pae_supp.h
+++ b/source/6LoWPAN/ws/ws_pae_supp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_time.c b/source/6LoWPAN/ws/ws_pae_time.c
index a962b9415d5..9b5b16d7c73 100644
--- a/source/6LoWPAN/ws/ws_pae_time.c
+++ b/source/6LoWPAN/ws/ws_pae_time.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_time.h b/source/6LoWPAN/ws/ws_pae_time.h
index 12655e2c2a5..41f77ef9fe7 100644
--- a/source/6LoWPAN/ws/ws_pae_time.h
+++ b/source/6LoWPAN/ws/ws_pae_time.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_timers.c b/source/6LoWPAN/ws/ws_pae_timers.c
index fb1abbe275d..735917102b3 100644
--- a/source/6LoWPAN/ws/ws_pae_timers.c
+++ b/source/6LoWPAN/ws/ws_pae_timers.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_pae_timers.h b/source/6LoWPAN/ws/ws_pae_timers.h
index 57fceb97cbf..ba8fe1141fc 100644
--- a/source/6LoWPAN/ws/ws_pae_timers.h
+++ b/source/6LoWPAN/ws/ws_pae_timers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_stats.c b/source/6LoWPAN/ws/ws_stats.c
index a6e794e4b54..d2351c6e343 100644
--- a/source/6LoWPAN/ws/ws_stats.c
+++ b/source/6LoWPAN/ws/ws_stats.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_stats.h b/source/6LoWPAN/ws/ws_stats.h
index 5a315556f88..2d7dd938829 100644
--- a/source/6LoWPAN/ws/ws_stats.h
+++ b/source/6LoWPAN/ws/ws_stats.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/6LoWPAN/ws/ws_test_api.c b/source/6LoWPAN/ws/ws_test_api.c
index 682bbf7dd18..9dd322a752f 100644
--- a/source/6LoWPAN/ws/ws_test_api.c
+++ b/source/6LoWPAN/ws/ws_test_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/BorderRouter/border_router.c b/source/BorderRouter/border_router.c
index dd12919d020..02836da0d85 100644
--- a/source/BorderRouter/border_router.c
+++ b/source/BorderRouter/border_router.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018, Arm Limited and affiliates.
+ * Copyright (c) 2012-2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/BorderRouter/border_router.h b/source/BorderRouter/border_router.h
index f8bbaba7a65..e693fbc302b 100644
--- a/source/BorderRouter/border_router.h
+++ b/source/BorderRouter/border_router.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/icmpv6.c b/source/Common_Protocols/icmpv6.c
index ba9bb0b684e..b3721de7422 100644
--- a/source/Common_Protocols/icmpv6.c
+++ b/source/Common_Protocols/icmpv6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/icmpv6.h b/source/Common_Protocols/icmpv6.h
index 1e705945547..14eaf1941c0 100644
--- a/source/Common_Protocols/icmpv6.h
+++ b/source/Common_Protocols/icmpv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018, Arm Limited and affiliates.
+ * Copyright (c) 2013-2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/icmpv6_prefix.c b/source/Common_Protocols/icmpv6_prefix.c
index 2c63ddd7b23..62c7602b703 100644
--- a/source/Common_Protocols/icmpv6_prefix.c
+++ b/source/Common_Protocols/icmpv6_prefix.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/icmpv6_prefix.h b/source/Common_Protocols/icmpv6_prefix.h
index 81baeb08874..ae7f365d045 100644
--- a/source/Common_Protocols/icmpv6_prefix.h
+++ b/source/Common_Protocols/icmpv6_prefix.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/icmpv6_radv.c b/source/Common_Protocols/icmpv6_radv.c
index 446d05f38ec..9ad0544322d 100644
--- a/source/Common_Protocols/icmpv6_radv.c
+++ b/source/Common_Protocols/icmpv6_radv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/icmpv6_radv.h b/source/Common_Protocols/icmpv6_radv.h
index c526bdc4410..2d6035a5c0d 100644
--- a/source/Common_Protocols/icmpv6_radv.h
+++ b/source/Common_Protocols/icmpv6_radv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/ip.h b/source/Common_Protocols/ip.h
index 110ddd4b280..1007fb6d6f8 100644
--- a/source/Common_Protocols/ip.h
+++ b/source/Common_Protocols/ip.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/ipv6.c b/source/Common_Protocols/ipv6.c
index 045e6c471c3..161845b7c10 100644
--- a/source/Common_Protocols/ipv6.c
+++ b/source/Common_Protocols/ipv6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/ipv6.h b/source/Common_Protocols/ipv6.h
index 0927891c594..8890d9448f4 100644
--- a/source/Common_Protocols/ipv6.h
+++ b/source/Common_Protocols/ipv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/ipv6_constants.h b/source/Common_Protocols/ipv6_constants.h
index fec095738c7..524e97e4c11 100644
--- a/source/Common_Protocols/ipv6_constants.h
+++ b/source/Common_Protocols/ipv6_constants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/ipv6_flow.c b/source/Common_Protocols/ipv6_flow.c
index 60e1657881e..574b8094a91 100644
--- a/source/Common_Protocols/ipv6_flow.c
+++ b/source/Common_Protocols/ipv6_flow.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/ipv6_flow.h b/source/Common_Protocols/ipv6_flow.h
index 88edccfce40..34c9fd71797 100644
--- a/source/Common_Protocols/ipv6_flow.h
+++ b/source/Common_Protocols/ipv6_flow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/ipv6_fragmentation.c b/source/Common_Protocols/ipv6_fragmentation.c
index 1386b398ea7..9fcec3e3798 100644
--- a/source/Common_Protocols/ipv6_fragmentation.c
+++ b/source/Common_Protocols/ipv6_fragmentation.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/ipv6_fragmentation.h b/source/Common_Protocols/ipv6_fragmentation.h
index 7adbe0148fa..1ef642b64f6 100644
--- a/source/Common_Protocols/ipv6_fragmentation.h
+++ b/source/Common_Protocols/ipv6_fragmentation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/ipv6_resolution.c b/source/Common_Protocols/ipv6_resolution.c
index 790b226b8a0..20294caeac9 100644
--- a/source/Common_Protocols/ipv6_resolution.c
+++ b/source/Common_Protocols/ipv6_resolution.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/ipv6_resolution.h b/source/Common_Protocols/ipv6_resolution.h
index 63b6d4b5bcf..34b204c895e 100644
--- a/source/Common_Protocols/ipv6_resolution.h
+++ b/source/Common_Protocols/ipv6_resolution.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/mld.c b/source/Common_Protocols/mld.c
index 9a90d66da0a..dddfe0baa7b 100644
--- a/source/Common_Protocols/mld.c
+++ b/source/Common_Protocols/mld.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/mld.h b/source/Common_Protocols/mld.h
index 2661dea68db..aa12ba17bdd 100644
--- a/source/Common_Protocols/mld.h
+++ b/source/Common_Protocols/mld.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/tcp.c b/source/Common_Protocols/tcp.c
index 2a0b6d498a7..18d25146b46 100644
--- a/source/Common_Protocols/tcp.c
+++ b/source/Common_Protocols/tcp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/tcp.h b/source/Common_Protocols/tcp.h
index dbe0cb345c6..cfd4cc5b40e 100644
--- a/source/Common_Protocols/tcp.h
+++ b/source/Common_Protocols/tcp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/udp.c b/source/Common_Protocols/udp.c
index 0159f450d1b..0be6e0a1da2 100644
--- a/source/Common_Protocols/udp.c
+++ b/source/Common_Protocols/udp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Common_Protocols/udp.h b/source/Common_Protocols/udp.h
index f32a42a0f5f..c45a1d3bb6e 100644
--- a/source/Common_Protocols/udp.h
+++ b/source/Common_Protocols/udp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Core/buffer_dyn.c b/source/Core/buffer_dyn.c
index 268ee815ab9..89fbd44b9f1 100644
--- a/source/Core/buffer_dyn.c
+++ b/source/Core/buffer_dyn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2019, Arm Limited and affiliates.
+ * Copyright (c) 2011-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Core/include/ns_address_internal.h b/source/Core/include/ns_address_internal.h
index 79bf398b70f..cc4398ad9e1 100644
--- a/source/Core/include/ns_address_internal.h
+++ b/source/Core/include/ns_address_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010-2019, Arm Limited and affiliates.
+ * Copyright (c) 2008, 2010-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Core/include/ns_buffer.h b/source/Core/include/ns_buffer.h
index 0447aa1a997..c24749407ce 100644
--- a/source/Core/include/ns_buffer.h
+++ b/source/Core/include/ns_buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2019, Arm Limited and affiliates.
+ * Copyright (c) 2008-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Core/include/ns_error_types.h b/source/Core/include/ns_error_types.h
index 31d15d3f324..a43af9dfe6b 100644
--- a/source/Core/include/ns_error_types.h
+++ b/source/Core/include/ns_error_types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Core/include/ns_monitor.h b/source/Core/include/ns_monitor.h
index 867cff47fcd..13724dcfe01 100644
--- a/source/Core/include/ns_monitor.h
+++ b/source/Core/include/ns_monitor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Core/include/ns_socket.h b/source/Core/include/ns_socket.h
index 4af22a42498..ba5d1b62869 100644
--- a/source/Core/include/ns_socket.h
+++ b/source/Core/include/ns_socket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2008-2017, 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Core/include/sockbuf.h b/source/Core/include/sockbuf.h
index b02d00bf9fa..6e5d8027015 100644
--- a/source/Core/include/sockbuf.h
+++ b/source/Core/include/sockbuf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Core/ns_address_internal.c b/source/Core/ns_address_internal.c
index 6131df7a01a..c7c69d2d39e 100644
--- a/source/Core/ns_address_internal.c
+++ b/source/Core/ns_address_internal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010-2019, Arm Limited and affiliates.
+ * Copyright (c) 2008, 2010-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Core/ns_monitor.c b/source/Core/ns_monitor.c
index 83c4d3512c3..ca20e3f4963 100644
--- a/source/Core/ns_monitor.c
+++ b/source/Core/ns_monitor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Core/ns_socket.c b/source/Core/ns_socket.c
index 60b5c96b755..77dade5ccf4 100644
--- a/source/Core/ns_socket.c
+++ b/source/Core/ns_socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015, 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2008-2015, 2017-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Core/sockbuf.c b/source/Core/sockbuf.c
index 80e1bdd1da0..fa459182ee7 100644
--- a/source/Core/sockbuf.c
+++ b/source/Core/sockbuf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/DHCPv6_Server/DHCPv6_Server_service.c b/source/DHCPv6_Server/DHCPv6_Server_service.c
index 86dcdf09a32..625dd859a0e 100644
--- a/source/DHCPv6_Server/DHCPv6_Server_service.c
+++ b/source/DHCPv6_Server/DHCPv6_Server_service.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/DHCPv6_Server/DHCPv6_server_service.h b/source/DHCPv6_Server/DHCPv6_server_service.h
index 5a9fb86949c..20dbdb5d432 100644
--- a/source/DHCPv6_Server/DHCPv6_server_service.h
+++ b/source/DHCPv6_Server/DHCPv6_server_service.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/DHCPv6_client/dhcpv6_client_api.h b/source/DHCPv6_client/dhcpv6_client_api.h
index 566d3e7e3ae..f9cadbca64f 100644
--- a/source/DHCPv6_client/dhcpv6_client_api.h
+++ b/source/DHCPv6_client/dhcpv6_client_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/DHCPv6_client/dhcpv6_client_service.c b/source/DHCPv6_client/dhcpv6_client_service.c
index 264e7ab0529..4b894a5cb90 100644
--- a/source/DHCPv6_client/dhcpv6_client_service.c
+++ b/source/DHCPv6_client/dhcpv6_client_service.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_cca_threshold.c b/source/MAC/IEEE802_15_4/mac_cca_threshold.c
index ffb40f16bf5..1b3a94253b6 100644
--- a/source/MAC/IEEE802_15_4/mac_cca_threshold.c
+++ b/source/MAC/IEEE802_15_4/mac_cca_threshold.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_cca_threshold.h b/source/MAC/IEEE802_15_4/mac_cca_threshold.h
index 6e0da89bd05..ac1bb8b9999 100644
--- a/source/MAC/IEEE802_15_4/mac_cca_threshold.h
+++ b/source/MAC/IEEE802_15_4/mac_cca_threshold.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_data_buffer.h b/source/MAC/IEEE802_15_4/mac_data_buffer.h
index 80f36b6b2c1..a76016cb4d5 100644
--- a/source/MAC/IEEE802_15_4/mac_data_buffer.h
+++ b/source/MAC/IEEE802_15_4/mac_data_buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_defines.h b/source/MAC/IEEE802_15_4/mac_defines.h
index c13c708e088..c55b5085f40 100644
--- a/source/MAC/IEEE802_15_4/mac_defines.h
+++ b/source/MAC/IEEE802_15_4/mac_defines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_fhss_callbacks.c b/source/MAC/IEEE802_15_4/mac_fhss_callbacks.c
index 8925c5ae4a6..3770c3f9447 100644
--- a/source/MAC/IEEE802_15_4/mac_fhss_callbacks.c
+++ b/source/MAC/IEEE802_15_4/mac_fhss_callbacks.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_fhss_callbacks.h b/source/MAC/IEEE802_15_4/mac_fhss_callbacks.h
index 744e7c24850..b5132a265b8 100644
--- a/source/MAC/IEEE802_15_4/mac_fhss_callbacks.h
+++ b/source/MAC/IEEE802_15_4/mac_fhss_callbacks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_filter.c b/source/MAC/IEEE802_15_4/mac_filter.c
index a1a3ea94721..6475ddfd661 100644
--- a/source/MAC/IEEE802_15_4/mac_filter.c
+++ b/source/MAC/IEEE802_15_4/mac_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_filter.h b/source/MAC/IEEE802_15_4/mac_filter.h
index 2df4e901cd8..72247504710 100644
--- a/source/MAC/IEEE802_15_4/mac_filter.h
+++ b/source/MAC/IEEE802_15_4/mac_filter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_header_helper_functions.c b/source/MAC/IEEE802_15_4/mac_header_helper_functions.c
index 65f6e05f6b9..001b258cf56 100644
--- a/source/MAC/IEEE802_15_4/mac_header_helper_functions.c
+++ b/source/MAC/IEEE802_15_4/mac_header_helper_functions.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_header_helper_functions.h b/source/MAC/IEEE802_15_4/mac_header_helper_functions.h
index ce3d10d2a56..fa7bc0550c0 100644
--- a/source/MAC/IEEE802_15_4/mac_header_helper_functions.h
+++ b/source/MAC/IEEE802_15_4/mac_header_helper_functions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_indirect_data.c b/source/MAC/IEEE802_15_4/mac_indirect_data.c
index 51af386bddd..c4d1a6f7360 100644
--- a/source/MAC/IEEE802_15_4/mac_indirect_data.c
+++ b/source/MAC/IEEE802_15_4/mac_indirect_data.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_indirect_data.h b/source/MAC/IEEE802_15_4/mac_indirect_data.h
index 3f78932a34f..d27338f1bc3 100644
--- a/source/MAC/IEEE802_15_4/mac_indirect_data.h
+++ b/source/MAC/IEEE802_15_4/mac_indirect_data.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_mcps_sap.c b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
index 12d8979fae7..70ae3491b6c 100644
--- a/source/MAC/IEEE802_15_4/mac_mcps_sap.c
+++ b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_mcps_sap.h b/source/MAC/IEEE802_15_4/mac_mcps_sap.h
index d79343546ef..b357447f0fd 100644
--- a/source/MAC/IEEE802_15_4/mac_mcps_sap.h
+++ b/source/MAC/IEEE802_15_4/mac_mcps_sap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_mlme.c b/source/MAC/IEEE802_15_4/mac_mlme.c
index c6c0d01cc43..21357c7db85 100644
--- a/source/MAC/IEEE802_15_4/mac_mlme.c
+++ b/source/MAC/IEEE802_15_4/mac_mlme.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_mlme.h b/source/MAC/IEEE802_15_4/mac_mlme.h
index 2cf6a79a70d..f436a5cceb8 100644
--- a/source/MAC/IEEE802_15_4/mac_mlme.h
+++ b/source/MAC/IEEE802_15_4/mac_mlme.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_pd_sap.c b/source/MAC/IEEE802_15_4/mac_pd_sap.c
index 2a61f10ee9d..da3b6b7a538 100644
--- a/source/MAC/IEEE802_15_4/mac_pd_sap.c
+++ b/source/MAC/IEEE802_15_4/mac_pd_sap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_pd_sap.h b/source/MAC/IEEE802_15_4/mac_pd_sap.h
index 396e92bc7f4..730c9b0e3ee 100644
--- a/source/MAC/IEEE802_15_4/mac_pd_sap.h
+++ b/source/MAC/IEEE802_15_4/mac_pd_sap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_security_mib.c b/source/MAC/IEEE802_15_4/mac_security_mib.c
index ed06964ab5d..13d2032a994 100644
--- a/source/MAC/IEEE802_15_4/mac_security_mib.c
+++ b/source/MAC/IEEE802_15_4/mac_security_mib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_security_mib.h b/source/MAC/IEEE802_15_4/mac_security_mib.h
index 150d8ea64a0..84fb3ad1310 100644
--- a/source/MAC/IEEE802_15_4/mac_security_mib.h
+++ b/source/MAC/IEEE802_15_4/mac_security_mib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_timer.c b/source/MAC/IEEE802_15_4/mac_timer.c
index a14aeaff2ff..764cd25a736 100644
--- a/source/MAC/IEEE802_15_4/mac_timer.c
+++ b/source/MAC/IEEE802_15_4/mac_timer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/mac_timer.h b/source/MAC/IEEE802_15_4/mac_timer.h
index d4f6958cdab..aa0bee3efd2 100644
--- a/source/MAC/IEEE802_15_4/mac_timer.h
+++ b/source/MAC/IEEE802_15_4/mac_timer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/sw_mac.c b/source/MAC/IEEE802_15_4/sw_mac.c
index 46c65021d05..675eda3b5cb 100644
--- a/source/MAC/IEEE802_15_4/sw_mac.c
+++ b/source/MAC/IEEE802_15_4/sw_mac.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/IEEE802_15_4/sw_mac_internal.h b/source/MAC/IEEE802_15_4/sw_mac_internal.h
index 44877527fb7..ecac04c7ffd 100644
--- a/source/MAC/IEEE802_15_4/sw_mac_internal.h
+++ b/source/MAC/IEEE802_15_4/sw_mac_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/ethernet/ethernet_mac_api.c b/source/MAC/ethernet/ethernet_mac_api.c
index fb4d9d21769..6bf5fdba5ba 100644
--- a/source/MAC/ethernet/ethernet_mac_api.c
+++ b/source/MAC/ethernet/ethernet_mac_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/rf_driver_storage.c b/source/MAC/rf_driver_storage.c
index 6257406c3ef..8033dbddc61 100644
--- a/source/MAC/rf_driver_storage.c
+++ b/source/MAC/rf_driver_storage.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/rf_driver_storage.h b/source/MAC/rf_driver_storage.h
index d9a82d95312..c0c451b8ab2 100644
--- a/source/MAC/rf_driver_storage.h
+++ b/source/MAC/rf_driver_storage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/serial/serial_mac_api.c b/source/MAC/serial/serial_mac_api.c
index b3ffa24bea3..295848de306 100644
--- a/source/MAC/serial/serial_mac_api.c
+++ b/source/MAC/serial/serial_mac_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/virtual_rf/virtual_rf_client.c b/source/MAC/virtual_rf/virtual_rf_client.c
index 81395991f35..9afa782b5a6 100644
--- a/source/MAC/virtual_rf/virtual_rf_client.c
+++ b/source/MAC/virtual_rf/virtual_rf_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/virtual_rf/virtual_rf_defines.h b/source/MAC/virtual_rf/virtual_rf_defines.h
index 01919dabcc0..dc38ccd15f6 100644
--- a/source/MAC/virtual_rf/virtual_rf_defines.h
+++ b/source/MAC/virtual_rf/virtual_rf_defines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MAC/virtual_rf/virtual_rf_driver.c b/source/MAC/virtual_rf/virtual_rf_driver.c
index 78e8b9ef2cb..0f3503fcb9d 100644
--- a/source/MAC/virtual_rf/virtual_rf_driver.c
+++ b/source/MAC/virtual_rf/virtual_rf_driver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MLE/mle.c b/source/MLE/mle.c
index 8c24f6b0b13..4e2d0a876d6 100644
--- a/source/MLE/mle.c
+++ b/source/MLE/mle.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MLE/mle.h b/source/MLE/mle.h
index 7d4389b4336..0302886aa17 100644
--- a/source/MLE/mle.h
+++ b/source/MLE/mle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MLE/mle_tlv.c b/source/MLE/mle_tlv.c
index 284fb435ff1..d878ca9b80a 100644
--- a/source/MLE/mle_tlv.c
+++ b/source/MLE/mle_tlv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MLE/mle_tlv.h b/source/MLE/mle_tlv.h
index f7a3829bafc..9ccf8721386 100644
--- a/source/MLE/mle_tlv.h
+++ b/source/MLE/mle_tlv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MPL/mpl.c b/source/MPL/mpl.c
index 1ab5b21cf1a..face25a0f32 100644
--- a/source/MPL/mpl.c
+++ b/source/MPL/mpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/MPL/mpl.h b/source/MPL/mpl.h
index d5cd8152e41..557fd484595 100644
--- a/source/MPL/mpl.h
+++ b/source/MPL/mpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/NWK_INTERFACE/Include/protocol.h b/source/NWK_INTERFACE/Include/protocol.h
index 0ca9c30a655..a3a845ffba7 100644
--- a/source/NWK_INTERFACE/Include/protocol.h
+++ b/source/NWK_INTERFACE/Include/protocol.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/NWK_INTERFACE/Include/protocol_abstract.h b/source/NWK_INTERFACE/Include/protocol_abstract.h
index 78aa552c386..f59ca2bf9e8 100644
--- a/source/NWK_INTERFACE/Include/protocol_abstract.h
+++ b/source/NWK_INTERFACE/Include/protocol_abstract.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/NWK_INTERFACE/Include/protocol_stats.h b/source/NWK_INTERFACE/Include/protocol_stats.h
index 00f6c508e79..0bf2e01f596 100644
--- a/source/NWK_INTERFACE/Include/protocol_stats.h
+++ b/source/NWK_INTERFACE/Include/protocol_stats.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/NWK_INTERFACE/Include/protocol_timer.h b/source/NWK_INTERFACE/Include/protocol_timer.h
index 2af1e35591d..630770c2449 100644
--- a/source/NWK_INTERFACE/Include/protocol_timer.h
+++ b/source/NWK_INTERFACE/Include/protocol_timer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/NWK_INTERFACE/protocol_core.c b/source/NWK_INTERFACE/protocol_core.c
index 45f0c413841..cab954193b9 100644
--- a/source/NWK_INTERFACE/protocol_core.c
+++ b/source/NWK_INTERFACE/protocol_core.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/NWK_INTERFACE/protocol_core_sleep.c b/source/NWK_INTERFACE/protocol_core_sleep.c
index bc11ad738b8..a0a1acbfe33 100644
--- a/source/NWK_INTERFACE/protocol_core_sleep.c
+++ b/source/NWK_INTERFACE/protocol_core_sleep.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/NWK_INTERFACE/protocol_stats.c b/source/NWK_INTERFACE/protocol_stats.c
index 6ef7ea7ecff..6fecc591f02 100644
--- a/source/NWK_INTERFACE/protocol_stats.c
+++ b/source/NWK_INTERFACE/protocol_stats.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/NWK_INTERFACE/protocol_timer.c b/source/NWK_INTERFACE/protocol_timer.c
index 6997849ee77..0c518ecf5d7 100644
--- a/source/NWK_INTERFACE/protocol_timer.c
+++ b/source/NWK_INTERFACE/protocol_timer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_control.c b/source/RPL/rpl_control.c
index 522d85107a8..282eea4f6e5 100644
--- a/source/RPL/rpl_control.c
+++ b/source/RPL/rpl_control.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_control.h b/source/RPL/rpl_control.h
index e13f552a09b..e5381afefd7 100644
--- a/source/RPL/rpl_control.h
+++ b/source/RPL/rpl_control.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_data.c b/source/RPL/rpl_data.c
index 099192a1079..d9841aef967 100644
--- a/source/RPL/rpl_data.c
+++ b/source/RPL/rpl_data.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_data.h b/source/RPL/rpl_data.h
index 694106ff4e1..4fa5635f27f 100644
--- a/source/RPL/rpl_data.h
+++ b/source/RPL/rpl_data.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_downward.c b/source/RPL/rpl_downward.c
index 4b7fe15dd26..984c24953ef 100644
--- a/source/RPL/rpl_downward.c
+++ b/source/RPL/rpl_downward.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_downward.h b/source/RPL/rpl_downward.h
index 73cceeb856c..73ec79aa8ce 100644
--- a/source/RPL/rpl_downward.h
+++ b/source/RPL/rpl_downward.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_mrhof.c b/source/RPL/rpl_mrhof.c
index be3fd9a8229..248838953fc 100644
--- a/source/RPL/rpl_mrhof.c
+++ b/source/RPL/rpl_mrhof.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_mrhof.h b/source/RPL/rpl_mrhof.h
index e38d7c101aa..42ac7d7efb3 100644
--- a/source/RPL/rpl_mrhof.h
+++ b/source/RPL/rpl_mrhof.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_objective.c b/source/RPL/rpl_objective.c
index 5ffa3ab9243..4a5948cf544 100644
--- a/source/RPL/rpl_objective.c
+++ b/source/RPL/rpl_objective.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_objective.h b/source/RPL/rpl_objective.h
index 7e8293a396a..1d3bc66fda1 100644
--- a/source/RPL/rpl_objective.h
+++ b/source/RPL/rpl_objective.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_of0.c b/source/RPL/rpl_of0.c
index bfdee2a4962..49df8573305 100644
--- a/source/RPL/rpl_of0.c
+++ b/source/RPL/rpl_of0.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_of0.h b/source/RPL/rpl_of0.h
index 6e7db0a6f8c..0f09658bab3 100644
--- a/source/RPL/rpl_of0.h
+++ b/source/RPL/rpl_of0.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_policy.c b/source/RPL/rpl_policy.c
index 11a67375979..5f669c591c7 100644
--- a/source/RPL/rpl_policy.c
+++ b/source/RPL/rpl_policy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_policy.h b/source/RPL/rpl_policy.h
index 91e49175879..b80e0e9f2a5 100644
--- a/source/RPL/rpl_policy.h
+++ b/source/RPL/rpl_policy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_protocol.h b/source/RPL/rpl_protocol.h
index 27d3b837030..bb6ac92126d 100644
--- a/source/RPL/rpl_protocol.h
+++ b/source/RPL/rpl_protocol.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_structures.h b/source/RPL/rpl_structures.h
index 837d0fa9ab5..0adeaacbf91 100644
--- a/source/RPL/rpl_structures.h
+++ b/source/RPL/rpl_structures.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_upward.c b/source/RPL/rpl_upward.c
index e25c4a675f6..283dff2b9c1 100644
--- a/source/RPL/rpl_upward.c
+++ b/source/RPL/rpl_upward.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/RPL/rpl_upward.h b/source/RPL/rpl_upward.h
index b3b51b38bc6..3a3cb183c24 100644
--- a/source/RPL/rpl_upward.h
+++ b/source/RPL/rpl_upward.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/Common/sec_lib.h b/source/Security/Common/sec_lib.h
index a1601e7fcc5..6091457380b 100644
--- a/source/Security/Common/sec_lib.h
+++ b/source/Security/Common/sec_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/Common/sec_lib_definitions.h b/source/Security/Common/sec_lib_definitions.h
index d52883e19c2..5eb91a74c15 100644
--- a/source/Security/Common/sec_lib_definitions.h
+++ b/source/Security/Common/sec_lib_definitions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/Common/security_lib.c b/source/Security/Common/security_lib.c
index a48616a086f..4d2c58d02b4 100644
--- a/source/Security/Common/security_lib.c
+++ b/source/Security/Common/security_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/eap_protocol.c b/source/Security/PANA/eap_protocol.c
index 8de694d335d..33bd7c72296 100644
--- a/source/Security/PANA/eap_protocol.c
+++ b/source/Security/PANA/eap_protocol.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/eap_protocol.h b/source/Security/PANA/eap_protocol.h
index 93e14051618..1faa5e55bc7 100644
--- a/source/Security/PANA/eap_protocol.h
+++ b/source/Security/PANA/eap_protocol.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/pana.c b/source/Security/PANA/pana.c
index f09eca992b0..c46d14898a0 100644
--- a/source/Security/PANA/pana.c
+++ b/source/Security/PANA/pana.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/pana.h b/source/Security/PANA/pana.h
index a8b3f372560..7e463052dcc 100644
--- a/source/Security/PANA/pana.h
+++ b/source/Security/PANA/pana.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/pana_avp.c b/source/Security/PANA/pana_avp.c
index f9f32dbaa83..16d0b15167c 100644
--- a/source/Security/PANA/pana_avp.c
+++ b/source/Security/PANA/pana_avp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/pana_avp.h b/source/Security/PANA/pana_avp.h
index 5ee046c9290..0603a95be5a 100644
--- a/source/Security/PANA/pana_avp.h
+++ b/source/Security/PANA/pana_avp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/pana_client.c b/source/Security/PANA/pana_client.c
index d724e285398..8947f0f446c 100644
--- a/source/Security/PANA/pana_client.c
+++ b/source/Security/PANA/pana_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/pana_eap_header.c b/source/Security/PANA/pana_eap_header.c
index 8d9ae327280..9c32471cc9e 100644
--- a/source/Security/PANA/pana_eap_header.c
+++ b/source/Security/PANA/pana_eap_header.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/pana_eap_header.h b/source/Security/PANA/pana_eap_header.h
index 2498134433a..96113c3d981 100644
--- a/source/Security/PANA/pana_eap_header.h
+++ b/source/Security/PANA/pana_eap_header.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/pana_header.c b/source/Security/PANA/pana_header.c
index fc3135db43d..31341301a32 100644
--- a/source/Security/PANA/pana_header.c
+++ b/source/Security/PANA/pana_header.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/pana_header.h b/source/Security/PANA/pana_header.h
index c70c6d40920..bf50b35da5c 100644
--- a/source/Security/PANA/pana_header.h
+++ b/source/Security/PANA/pana_header.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/pana_internal_api.h b/source/Security/PANA/pana_internal_api.h
index 927f7ee18ad..2ebaed41ddd 100644
--- a/source/Security/PANA/pana_internal_api.h
+++ b/source/Security/PANA/pana_internal_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/pana_nvm.h b/source/Security/PANA/pana_nvm.h
index 325acd6b0ec..341114c2c9e 100644
--- a/source/Security/PANA/pana_nvm.h
+++ b/source/Security/PANA/pana_nvm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/pana_relay_table.c b/source/Security/PANA/pana_relay_table.c
index 355aad1a4c2..4dc6f07bdb1 100644
--- a/source/Security/PANA/pana_relay_table.c
+++ b/source/Security/PANA/pana_relay_table.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/pana_relay_table.h b/source/Security/PANA/pana_relay_table.h
index 23c9f075ca0..6a1356c06ff 100644
--- a/source/Security/PANA/pana_relay_table.h
+++ b/source/Security/PANA/pana_relay_table.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/PANA/pana_server.c b/source/Security/PANA/pana_server.c
index 092b4ad59c9..354ca5f6b17 100644
--- a/source/Security/PANA/pana_server.c
+++ b/source/Security/PANA/pana_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/TLS/tls_ccm_crypt.c b/source/Security/TLS/tls_ccm_crypt.c
index 8c98b7bde08..ce0cf3679d0 100644
--- a/source/Security/TLS/tls_ccm_crypt.c
+++ b/source/Security/TLS/tls_ccm_crypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/TLS/tls_ccm_crypt.h b/source/Security/TLS/tls_ccm_crypt.h
index b82de082073..6ef1aff07eb 100644
--- a/source/Security/TLS/tls_ccm_crypt.h
+++ b/source/Security/TLS/tls_ccm_crypt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/TLS/tls_lib.c b/source/Security/TLS/tls_lib.c
index dcd4f8e53f5..aa70856c185 100644
--- a/source/Security/TLS/tls_lib.c
+++ b/source/Security/TLS/tls_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/TLS/tls_lib.h b/source/Security/TLS/tls_lib.h
index c369e20635a..a26aa4ff2d8 100644
--- a/source/Security/TLS/tls_lib.h
+++ b/source/Security/TLS/tls_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/eapol/eapol_helper.c b/source/Security/eapol/eapol_helper.c
index 03d2afcb8a2..b2c009fc4a5 100644
--- a/source/Security/eapol/eapol_helper.c
+++ b/source/Security/eapol/eapol_helper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/eapol/eapol_helper.h b/source/Security/eapol/eapol_helper.h
index d7fc8d5fe01..0454c122a92 100644
--- a/source/Security/eapol/eapol_helper.h
+++ b/source/Security/eapol/eapol_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/eapol/kde_helper.c b/source/Security/eapol/kde_helper.c
index 13be8926ce9..aa27d248e44 100644
--- a/source/Security/eapol/kde_helper.c
+++ b/source/Security/eapol/kde_helper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/eapol/kde_helper.h b/source/Security/eapol/kde_helper.h
index b735828e61c..153e86f3650 100644
--- a/source/Security/eapol/kde_helper.h
+++ b/source/Security/eapol/kde_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/kmp/kmp_addr.c b/source/Security/kmp/kmp_addr.c
index a09ab4ea741..facc28d1f39 100644
--- a/source/Security/kmp/kmp_addr.c
+++ b/source/Security/kmp/kmp_addr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/kmp/kmp_addr.h b/source/Security/kmp/kmp_addr.h
index 43b549a77cb..9873b9ede1e 100644
--- a/source/Security/kmp/kmp_addr.h
+++ b/source/Security/kmp/kmp_addr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/kmp/kmp_api.c b/source/Security/kmp/kmp_api.c
index 296f76362d5..d7f114c5fe3 100644
--- a/source/Security/kmp/kmp_api.c
+++ b/source/Security/kmp/kmp_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/kmp/kmp_api.h b/source/Security/kmp/kmp_api.h
index 3c880de2921..5aff18b9cd7 100644
--- a/source/Security/kmp/kmp_api.h
+++ b/source/Security/kmp/kmp_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/kmp/kmp_eapol_pdu_if.c b/source/Security/kmp/kmp_eapol_pdu_if.c
index afcae84571b..a51bb2e98f3 100644
--- a/source/Security/kmp/kmp_eapol_pdu_if.c
+++ b/source/Security/kmp/kmp_eapol_pdu_if.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/kmp/kmp_eapol_pdu_if.h b/source/Security/kmp/kmp_eapol_pdu_if.h
index eaad14b0753..294079bb438 100644
--- a/source/Security/kmp/kmp_eapol_pdu_if.h
+++ b/source/Security/kmp/kmp_eapol_pdu_if.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/kmp/kmp_socket_if.c b/source/Security/kmp/kmp_socket_if.c
index 6197e4304d2..f586b90a9dd 100644
--- a/source/Security/kmp/kmp_socket_if.c
+++ b/source/Security/kmp/kmp_socket_if.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/kmp/kmp_socket_if.h b/source/Security/kmp/kmp_socket_if.h
index 20a55c8f45f..4d30260b67d 100644
--- a/source/Security/kmp/kmp_socket_if.h
+++ b/source/Security/kmp/kmp_socket_if.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.c b/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.c
index 122cfe4e023..4f1d3a725bb 100644
--- a/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.c
+++ b/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.h b/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.h
index 8c3e1185b9c..b3c9c792a90 100644
--- a/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.h
+++ b/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.c b/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.c
index 9592059724d..34f79d3906a 100644
--- a/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.c
+++ b/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.h b/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.h
index 6af3687869c..a645e21b637 100644
--- a/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.h
+++ b/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/eap_tls_sec_prot/radius_eap_tls_sec_prot.c b/source/Security/protocols/eap_tls_sec_prot/radius_eap_tls_sec_prot.c
index b37cdf028a7..09944249d93 100644
--- a/source/Security/protocols/eap_tls_sec_prot/radius_eap_tls_sec_prot.c
+++ b/source/Security/protocols/eap_tls_sec_prot/radius_eap_tls_sec_prot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/eap_tls_sec_prot/radius_eap_tls_sec_prot.h b/source/Security/protocols/eap_tls_sec_prot/radius_eap_tls_sec_prot.h
index 03f510985fd..5e2b2e19b1a 100644
--- a/source/Security/protocols/eap_tls_sec_prot/radius_eap_tls_sec_prot.h
+++ b/source/Security/protocols/eap_tls_sec_prot/radius_eap_tls_sec_prot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.c b/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.c
index 3384716879e..aa296c39d1e 100644
--- a/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.c
+++ b/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.h b/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.h
index 78ececd7bce..30dfcda048a 100644
--- a/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.h
+++ b/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.c b/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.c
index ec89a9a09e4..8138fe8ed4f 100644
--- a/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.c
+++ b/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.h b/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.h
index 67b96a41e01..beda6df752f 100644
--- a/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.h
+++ b/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.c b/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.c
index a1074f7ec20..84e91e61ca3 100644
--- a/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.c
+++ b/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.h b/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.h
index 2cb2284e3c1..0335b5713d8 100644
--- a/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.h
+++ b/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.c b/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.c
index 4424b55a2c6..b01d60c824e 100644
--- a/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.c
+++ b/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.h b/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.h
index daf09a4c3b4..341a2c8be9d 100644
--- a/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.h
+++ b/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.c b/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.c
index 064f2bec760..a836e5870bd 100644
--- a/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.c
+++ b/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.h b/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.h
index a8832db62f2..d1ba7d378d5 100644
--- a/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.h
+++ b/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/key_sec_prot/key_sec_prot.c b/source/Security/protocols/key_sec_prot/key_sec_prot.c
index 6467839c46b..540ed35c71a 100644
--- a/source/Security/protocols/key_sec_prot/key_sec_prot.c
+++ b/source/Security/protocols/key_sec_prot/key_sec_prot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/key_sec_prot/key_sec_prot.h b/source/Security/protocols/key_sec_prot/key_sec_prot.h
index e059ab7bc05..ed0436d5d28 100644
--- a/source/Security/protocols/key_sec_prot/key_sec_prot.h
+++ b/source/Security/protocols/key_sec_prot/key_sec_prot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/radius_sec_prot/avp_helper.c b/source/Security/protocols/radius_sec_prot/avp_helper.c
index 73cc2d98e5e..9d0530495ad 100644
--- a/source/Security/protocols/radius_sec_prot/avp_helper.c
+++ b/source/Security/protocols/radius_sec_prot/avp_helper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/radius_sec_prot/avp_helper.h b/source/Security/protocols/radius_sec_prot/avp_helper.h
index 8687a112fa4..ecb8f22e9e6 100644
--- a/source/Security/protocols/radius_sec_prot/avp_helper.h
+++ b/source/Security/protocols/radius_sec_prot/avp_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/radius_sec_prot/radius_client_sec_prot.c b/source/Security/protocols/radius_sec_prot/radius_client_sec_prot.c
index b75cfecf35e..21dc0bf7e0b 100644
--- a/source/Security/protocols/radius_sec_prot/radius_client_sec_prot.c
+++ b/source/Security/protocols/radius_sec_prot/radius_client_sec_prot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/radius_sec_prot/radius_client_sec_prot.h b/source/Security/protocols/radius_sec_prot/radius_client_sec_prot.h
index 9d3a467284d..efedcbd6d1e 100644
--- a/source/Security/protocols/radius_sec_prot/radius_client_sec_prot.h
+++ b/source/Security/protocols/radius_sec_prot/radius_client_sec_prot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/sec_prot.h b/source/Security/protocols/sec_prot.h
index ac283a00c18..b32f91777cb 100644
--- a/source/Security/protocols/sec_prot.h
+++ b/source/Security/protocols/sec_prot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/sec_prot_certs.c b/source/Security/protocols/sec_prot_certs.c
index dc76a22ba94..4c5045fa144 100644
--- a/source/Security/protocols/sec_prot_certs.c
+++ b/source/Security/protocols/sec_prot_certs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/sec_prot_certs.h b/source/Security/protocols/sec_prot_certs.h
index 9a204aaa099..755a9741de9 100644
--- a/source/Security/protocols/sec_prot_certs.h
+++ b/source/Security/protocols/sec_prot_certs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/sec_prot_cfg.h b/source/Security/protocols/sec_prot_cfg.h
index 17efc2b5894..d5fd1d218f3 100644
--- a/source/Security/protocols/sec_prot_cfg.h
+++ b/source/Security/protocols/sec_prot_cfg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/sec_prot_keys.c b/source/Security/protocols/sec_prot_keys.c
index ff08f74942a..02748f08fcd 100644
--- a/source/Security/protocols/sec_prot_keys.c
+++ b/source/Security/protocols/sec_prot_keys.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/sec_prot_keys.h b/source/Security/protocols/sec_prot_keys.h
index 0304d9eb444..bd114d5c8ae 100644
--- a/source/Security/protocols/sec_prot_keys.h
+++ b/source/Security/protocols/sec_prot_keys.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/sec_prot_lib.c b/source/Security/protocols/sec_prot_lib.c
index a6ba018ae66..fc812572a84 100644
--- a/source/Security/protocols/sec_prot_lib.c
+++ b/source/Security/protocols/sec_prot_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/sec_prot_lib.h b/source/Security/protocols/sec_prot_lib.h
index 4d7fd088eee..83a01879c2e 100644
--- a/source/Security/protocols/sec_prot_lib.h
+++ b/source/Security/protocols/sec_prot_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/tls_sec_prot/tls_sec_prot.c b/source/Security/protocols/tls_sec_prot/tls_sec_prot.c
index 472c0411dc3..545dbbcb87f 100644
--- a/source/Security/protocols/tls_sec_prot/tls_sec_prot.c
+++ b/source/Security/protocols/tls_sec_prot/tls_sec_prot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/tls_sec_prot/tls_sec_prot.h b/source/Security/protocols/tls_sec_prot/tls_sec_prot.h
index 129648e1cc1..23f2a82879c 100644
--- a/source/Security/protocols/tls_sec_prot/tls_sec_prot.h
+++ b/source/Security/protocols/tls_sec_prot/tls_sec_prot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.c b/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.c
index 1ba7f109ab1..36f50a8b098 100644
--- a/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.c
+++ b/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.h b/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.h
index fc4a40b9f00..209064b332d 100644
--- a/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.h
+++ b/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/CCM_lib/ccm_security.c b/source/Service_Libs/CCM_lib/ccm_security.c
index 14deaa52268..04d1fe55d31 100644
--- a/source/Service_Libs/CCM_lib/ccm_security.c
+++ b/source/Service_Libs/CCM_lib/ccm_security.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls.c b/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls.c
index 36bdd0f590b..03594467bb8 100644
--- a/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls.c
+++ b/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018, Arm Limited and affiliates.
+ * Copyright (c) 2006-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls_adapter.c b/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls_adapter.c
index afc9132db8f..c9aeeedebd5 100644
--- a/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls_adapter.c
+++ b/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls_adapter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/Neighbor_cache/neighbor_cache.c b/source/Service_Libs/Neighbor_cache/neighbor_cache.c
index 4f057a55740..c7ffeee88e2 100644
--- a/source/Service_Libs/Neighbor_cache/neighbor_cache.c
+++ b/source/Service_Libs/Neighbor_cache/neighbor_cache.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/Neighbor_cache/neighbor_table_definition.h b/source/Service_Libs/Neighbor_cache/neighbor_table_definition.h
index 4141691095b..783d7e75b7d 100644
--- a/source/Service_Libs/Neighbor_cache/neighbor_table_definition.h
+++ b/source/Service_Libs/Neighbor_cache/neighbor_table_definition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/SHA256_Lib/ns_sha256.c b/source/Service_Libs/SHA256_Lib/ns_sha256.c
index 10fce9c06ac..cdbded6b9b3 100644
--- a/source/Service_Libs/SHA256_Lib/ns_sha256.c
+++ b/source/Service_Libs/SHA256_Lib/ns_sha256.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018, Arm Limited and affiliates.
+ * Copyright (c) 2006-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/SHA256_Lib/shalib.c b/source/Service_Libs/SHA256_Lib/shalib.c
index 6f1120f45c4..bb3a71197b4 100644
--- a/source/Service_Libs/SHA256_Lib/shalib.c
+++ b/source/Service_Libs/SHA256_Lib/shalib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/Trickle/trickle.c b/source/Service_Libs/Trickle/trickle.c
index 77e58d09ad6..2bab1f368aa 100644
--- a/source/Service_Libs/Trickle/trickle.c
+++ b/source/Service_Libs/Trickle/trickle.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/Trickle/trickle.h b/source/Service_Libs/Trickle/trickle.h
index a6c957826c9..e12cfe2f82a 100644
--- a/source/Service_Libs/Trickle/trickle.h
+++ b/source/Service_Libs/Trickle/trickle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/blacklist/blacklist.c b/source/Service_Libs/blacklist/blacklist.c
index f47b2097bff..d195ef93dc7 100644
--- a/source/Service_Libs/blacklist/blacklist.c
+++ b/source/Service_Libs/blacklist/blacklist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/blacklist/blacklist.h b/source/Service_Libs/blacklist/blacklist.h
index 224490194af..d2d1c072fc7 100644
--- a/source/Service_Libs/blacklist/blacklist.h
+++ b/source/Service_Libs/blacklist/blacklist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/etx/etx.c b/source/Service_Libs/etx/etx.c
index 64a878bd85c..73c0d12ecad 100644
--- a/source/Service_Libs/etx/etx.c
+++ b/source/Service_Libs/etx/etx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/etx/etx.h b/source/Service_Libs/etx/etx.h
index 9329d201b20..7b6a68760b0 100644
--- a/source/Service_Libs/etx/etx.h
+++ b/source/Service_Libs/etx/etx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/channel_functions.c b/source/Service_Libs/fhss/channel_functions.c
index 594686b9bbb..27848430a2d 100644
--- a/source/Service_Libs/fhss/channel_functions.c
+++ b/source/Service_Libs/fhss/channel_functions.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/channel_functions.h b/source/Service_Libs/fhss/channel_functions.h
index f6ceab73bb8..14ed7561140 100644
--- a/source/Service_Libs/fhss/channel_functions.h
+++ b/source/Service_Libs/fhss/channel_functions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/channel_list.c b/source/Service_Libs/fhss/channel_list.c
index 0f59f584cfe..a25ffe12b41 100644
--- a/source/Service_Libs/fhss/channel_list.c
+++ b/source/Service_Libs/fhss/channel_list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/channel_list.h b/source/Service_Libs/fhss/channel_list.h
index 7e283b3dbe1..d84918c87fd 100644
--- a/source/Service_Libs/fhss/channel_list.h
+++ b/source/Service_Libs/fhss/channel_list.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/fhss.c b/source/Service_Libs/fhss/fhss.c
index ae960bc8d07..532a57c6696 100644
--- a/source/Service_Libs/fhss/fhss.c
+++ b/source/Service_Libs/fhss/fhss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/fhss.h b/source/Service_Libs/fhss/fhss.h
index 1f09840cbd1..77b0aa75f38 100644
--- a/source/Service_Libs/fhss/fhss.h
+++ b/source/Service_Libs/fhss/fhss.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/fhss_channel.c b/source/Service_Libs/fhss/fhss_channel.c
index 8ad6c3cf52d..901a02c9456 100644
--- a/source/Service_Libs/fhss/fhss_channel.c
+++ b/source/Service_Libs/fhss/fhss_channel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/fhss_channel.h b/source/Service_Libs/fhss/fhss_channel.h
index af35ba6475e..98fe9157e78 100644
--- a/source/Service_Libs/fhss/fhss_channel.h
+++ b/source/Service_Libs/fhss/fhss_channel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/fhss_common.c b/source/Service_Libs/fhss/fhss_common.c
index 0d9dc7c505b..c968751c852 100644
--- a/source/Service_Libs/fhss/fhss_common.c
+++ b/source/Service_Libs/fhss/fhss_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/fhss_common.h b/source/Service_Libs/fhss/fhss_common.h
index 71c2d9a4d11..7bc5e88ab7d 100644
--- a/source/Service_Libs/fhss/fhss_common.h
+++ b/source/Service_Libs/fhss/fhss_common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/fhss_configuration_interface.c b/source/Service_Libs/fhss/fhss_configuration_interface.c
index df247c80b51..6684d265cac 100644
--- a/source/Service_Libs/fhss/fhss_configuration_interface.c
+++ b/source/Service_Libs/fhss/fhss_configuration_interface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/fhss_statistics.c b/source/Service_Libs/fhss/fhss_statistics.c
index b4ee75c48f9..c8ee23a9739 100644
--- a/source/Service_Libs/fhss/fhss_statistics.c
+++ b/source/Service_Libs/fhss/fhss_statistics.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/fhss_statistics.h b/source/Service_Libs/fhss/fhss_statistics.h
index bd2f81eaef4..765df79b1f4 100644
--- a/source/Service_Libs/fhss/fhss_statistics.h
+++ b/source/Service_Libs/fhss/fhss_statistics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/fhss_test_api.c b/source/Service_Libs/fhss/fhss_test_api.c
index 02e63af682c..421143e4fe5 100644
--- a/source/Service_Libs/fhss/fhss_test_api.c
+++ b/source/Service_Libs/fhss/fhss_test_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/fhss_ws.c b/source/Service_Libs/fhss/fhss_ws.c
index 6c4e62e0d99..74b36b708e3 100644
--- a/source/Service_Libs/fhss/fhss_ws.c
+++ b/source/Service_Libs/fhss/fhss_ws.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/fhss_ws.h b/source/Service_Libs/fhss/fhss_ws.h
index 6e3b3d5d482..0aa98872899 100644
--- a/source/Service_Libs/fhss/fhss_ws.h
+++ b/source/Service_Libs/fhss/fhss_ws.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fhss/fhss_ws_empty_functions.c b/source/Service_Libs/fhss/fhss_ws_empty_functions.c
index 4a68275472e..9a43fff87fb 100644
--- a/source/Service_Libs/fhss/fhss_ws_empty_functions.c
+++ b/source/Service_Libs/fhss/fhss_ws_empty_functions.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fnv_hash/fnv_hash.c b/source/Service_Libs/fnv_hash/fnv_hash.c
index fb93f180855..bcc5c124964 100644
--- a/source/Service_Libs/fnv_hash/fnv_hash.c
+++ b/source/Service_Libs/fnv_hash/fnv_hash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/fnv_hash/fnv_hash.h b/source/Service_Libs/fnv_hash/fnv_hash.h
index 5be95a6a700..7ee5f02b9c0 100644
--- a/source/Service_Libs/fnv_hash/fnv_hash.h
+++ b/source/Service_Libs/fnv_hash/fnv_hash.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/hmac/hmac_md.c b/source/Service_Libs/hmac/hmac_md.c
index a3eb539b61e..0ef22158e11 100644
--- a/source/Service_Libs/hmac/hmac_md.c
+++ b/source/Service_Libs/hmac/hmac_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/hmac/hmac_md.h b/source/Service_Libs/hmac/hmac_md.h
index 7c55b77a459..fbb57bf18aa 100644
--- a/source/Service_Libs/hmac/hmac_md.h
+++ b/source/Service_Libs/hmac/hmac_md.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/ieee_802_11/ieee_802_11.c b/source/Service_Libs/ieee_802_11/ieee_802_11.c
index 6200ae0eb99..bfd0724f62c 100644
--- a/source/Service_Libs/ieee_802_11/ieee_802_11.c
+++ b/source/Service_Libs/ieee_802_11/ieee_802_11.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/ieee_802_11/ieee_802_11.h b/source/Service_Libs/ieee_802_11/ieee_802_11.h
index 80dc118633e..e7737297c26 100644
--- a/source/Service_Libs/ieee_802_11/ieee_802_11.h
+++ b/source/Service_Libs/ieee_802_11/ieee_802_11.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/load_balance/load_balance.c b/source/Service_Libs/load_balance/load_balance.c
index 74d02ae4428..7d91760139d 100644
--- a/source/Service_Libs/load_balance/load_balance.c
+++ b/source/Service_Libs/load_balance/load_balance.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/load_balance/load_balance_api.h b/source/Service_Libs/load_balance/load_balance_api.h
index 498847da8f1..586505f1ff4 100644
--- a/source/Service_Libs/load_balance/load_balance_api.h
+++ b/source/Service_Libs/load_balance/load_balance_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.c b/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.c
index 19691592777..4784d8824c5 100644
--- a/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.c
+++ b/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.h b/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.h
index 7b2c6d4ef4e..37908a03792 100644
--- a/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.h
+++ b/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mle_service/mle_service.c b/source/Service_Libs/mle_service/mle_service.c
index 37e53276fec..27ff6fda9ae 100644
--- a/source/Service_Libs/mle_service/mle_service.c
+++ b/source/Service_Libs/mle_service/mle_service.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mle_service/mle_service_api.h b/source/Service_Libs/mle_service/mle_service_api.h
index 76a91950dcc..d22f2b5e479 100644
--- a/source/Service_Libs/mle_service/mle_service_api.h
+++ b/source/Service_Libs/mle_service/mle_service_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mle_service/mle_service_buffer.c b/source/Service_Libs/mle_service/mle_service_buffer.c
index 834f96edf00..ec115fde199 100644
--- a/source/Service_Libs/mle_service/mle_service_buffer.c
+++ b/source/Service_Libs/mle_service/mle_service_buffer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mle_service/mle_service_buffer.h b/source/Service_Libs/mle_service/mle_service_buffer.h
index 4f104759201..3c16bd309be 100644
--- a/source/Service_Libs/mle_service/mle_service_buffer.h
+++ b/source/Service_Libs/mle_service/mle_service_buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mle_service/mle_service_frame_counter_table.c b/source/Service_Libs/mle_service/mle_service_frame_counter_table.c
index 14af37f30d1..161d1388d20 100644
--- a/source/Service_Libs/mle_service/mle_service_frame_counter_table.c
+++ b/source/Service_Libs/mle_service/mle_service_frame_counter_table.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mle_service/mle_service_frame_counter_table.h b/source/Service_Libs/mle_service/mle_service_frame_counter_table.h
index 3505a5f458d..4b0fab63fa9 100644
--- a/source/Service_Libs/mle_service/mle_service_frame_counter_table.h
+++ b/source/Service_Libs/mle_service/mle_service_frame_counter_table.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mle_service/mle_service_interface.c b/source/Service_Libs/mle_service/mle_service_interface.c
index 63ce08e351c..4709e51041f 100644
--- a/source/Service_Libs/mle_service/mle_service_interface.c
+++ b/source/Service_Libs/mle_service/mle_service_interface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mle_service/mle_service_interface.h b/source/Service_Libs/mle_service/mle_service_interface.h
index 32166cf3438..b42c175876b 100644
--- a/source/Service_Libs/mle_service/mle_service_interface.h
+++ b/source/Service_Libs/mle_service/mle_service_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mle_service/mle_service_security.c b/source/Service_Libs/mle_service/mle_service_security.c
index 33c11d2e483..bcb8cf2949b 100644
--- a/source/Service_Libs/mle_service/mle_service_security.c
+++ b/source/Service_Libs/mle_service/mle_service_security.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mle_service/mle_service_security.h b/source/Service_Libs/mle_service/mle_service_security.h
index 1d3e3f033ea..1be73812c69 100644
--- a/source/Service_Libs/mle_service/mle_service_security.h
+++ b/source/Service_Libs/mle_service/mle_service_security.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/nd_proxy/nd_proxy.c b/source/Service_Libs/nd_proxy/nd_proxy.c
index d1501b865a5..6d75180313e 100644
--- a/source/Service_Libs/nd_proxy/nd_proxy.c
+++ b/source/Service_Libs/nd_proxy/nd_proxy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/nd_proxy/nd_proxy.h b/source/Service_Libs/nd_proxy/nd_proxy.h
index 004d10f325d..66ef8033081 100644
--- a/source/Service_Libs/nd_proxy/nd_proxy.h
+++ b/source/Service_Libs/nd_proxy/nd_proxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/nist_aes_kw/nist_aes_kw.c b/source/Service_Libs/nist_aes_kw/nist_aes_kw.c
index 5345c0deda2..98f6a698128 100644
--- a/source/Service_Libs/nist_aes_kw/nist_aes_kw.c
+++ b/source/Service_Libs/nist_aes_kw/nist_aes_kw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/nist_aes_kw/nist_aes_kw.h b/source/Service_Libs/nist_aes_kw/nist_aes_kw.h
index 9f2eed8aab0..216787cacbb 100644
--- a/source/Service_Libs/nist_aes_kw/nist_aes_kw.h
+++ b/source/Service_Libs/nist_aes_kw/nist_aes_kw.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/pan_blacklist/pan_blacklist.c b/source/Service_Libs/pan_blacklist/pan_blacklist.c
index 0efcffc970e..7fe33be24d4 100644
--- a/source/Service_Libs/pan_blacklist/pan_blacklist.c
+++ b/source/Service_Libs/pan_blacklist/pan_blacklist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/pan_blacklist/pan_blacklist_api.h b/source/Service_Libs/pan_blacklist/pan_blacklist_api.h
index f71cd800146..1c1a007e97f 100644
--- a/source/Service_Libs/pan_blacklist/pan_blacklist_api.h
+++ b/source/Service_Libs/pan_blacklist/pan_blacklist_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/random_early_detection/random_early_detection.c b/source/Service_Libs/random_early_detection/random_early_detection.c
index b1a4b73d74d..2dd82535df2 100644
--- a/source/Service_Libs/random_early_detection/random_early_detection.c
+++ b/source/Service_Libs/random_early_detection/random_early_detection.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/random_early_detection/random_early_detection.h b/source/Service_Libs/random_early_detection/random_early_detection.h
index 9f81ed660c4..fc4ede2e00b 100644
--- a/source/Service_Libs/random_early_detection/random_early_detection.h
+++ b/source/Service_Libs/random_early_detection/random_early_detection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/random_early_detection/random_early_detection_api.h b/source/Service_Libs/random_early_detection/random_early_detection_api.h
index dcefc35ec84..9fe9e595f4d 100644
--- a/source/Service_Libs/random_early_detection/random_early_detection_api.h
+++ b/source/Service_Libs/random_early_detection/random_early_detection_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/utils/isqrt.c b/source/Service_Libs/utils/isqrt.c
index 85ca0c07f3e..3b087d2b448 100644
--- a/source/Service_Libs/utils/isqrt.c
+++ b/source/Service_Libs/utils/isqrt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/utils/isqrt.h b/source/Service_Libs/utils/isqrt.h
index 373a74244aa..7d5f7d495bc 100644
--- a/source/Service_Libs/utils/isqrt.h
+++ b/source/Service_Libs/utils/isqrt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/utils/ns_conf.c b/source/Service_Libs/utils/ns_conf.c
index affc32cc8be..e6f105c0e38 100644
--- a/source/Service_Libs/utils/ns_conf.c
+++ b/source/Service_Libs/utils/ns_conf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/utils/ns_crc.c b/source/Service_Libs/utils/ns_crc.c
index 40e85f96f25..505f3bee99b 100644
--- a/source/Service_Libs/utils/ns_crc.c
+++ b/source/Service_Libs/utils/ns_crc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/utils/ns_crc.h b/source/Service_Libs/utils/ns_crc.h
index 92fad32272f..4011fb33a47 100644
--- a/source/Service_Libs/utils/ns_crc.h
+++ b/source/Service_Libs/utils/ns_crc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/utils/ns_file.h b/source/Service_Libs/utils/ns_file.h
index 8ba32133a64..0ec436c59d3 100644
--- a/source/Service_Libs/utils/ns_file.h
+++ b/source/Service_Libs/utils/ns_file.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/utils/ns_file_system.c b/source/Service_Libs/utils/ns_file_system.c
index a7202ccdd02..729f7eaf4a8 100644
--- a/source/Service_Libs/utils/ns_file_system.c
+++ b/source/Service_Libs/utils/ns_file_system.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/whiteboard/whiteboard.c b/source/Service_Libs/whiteboard/whiteboard.c
index eb6c205bdbf..7f9f723498e 100644
--- a/source/Service_Libs/whiteboard/whiteboard.c
+++ b/source/Service_Libs/whiteboard/whiteboard.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/whiteboard/whiteboard.h b/source/Service_Libs/whiteboard/whiteboard.h
index e3e22db3952..a345ad794b3 100644
--- a/source/Service_Libs/whiteboard/whiteboard.h
+++ b/source/Service_Libs/whiteboard/whiteboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/base/cfg_ethernet.h b/source/configs/base/cfg_ethernet.h
index 6c1b6c0156c..bbede4f1348 100644
--- a/source/configs/base/cfg_ethernet.h
+++ b/source/configs/base/cfg_ethernet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/base/cfg_local_socket.h b/source/configs/base/cfg_local_socket.h
index 4eed70c5314..9863bb429ce 100644
--- a/source/configs/base/cfg_local_socket.h
+++ b/source/configs/base/cfg_local_socket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/base/cfg_lowpan_border_router.h b/source/configs/base/cfg_lowpan_border_router.h
index 56b598e7f14..a84e36f619e 100644
--- a/source/configs/base/cfg_lowpan_border_router.h
+++ b/source/configs/base/cfg_lowpan_border_router.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/base/cfg_lowpan_host.h b/source/configs/base/cfg_lowpan_host.h
index 11484d1b451..edc1452ca47 100644
--- a/source/configs/base/cfg_lowpan_host.h
+++ b/source/configs/base/cfg_lowpan_host.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/base/cfg_lowpan_router.h b/source/configs/base/cfg_lowpan_router.h
index 6dd4a93471f..2da787699c7 100644
--- a/source/configs/base/cfg_lowpan_router.h
+++ b/source/configs/base/cfg_lowpan_router.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/base/cfg_rf_tunnel.h b/source/configs/base/cfg_rf_tunnel.h
index 6e6b09acb01..7b149ef3457 100644
--- a/source/configs/base/cfg_rf_tunnel.h
+++ b/source/configs/base/cfg_rf_tunnel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/base/cfg_thread_border_router.h b/source/configs/base/cfg_thread_border_router.h
index be579f1e39b..94bd589ee7b 100644
--- a/source/configs/base/cfg_thread_border_router.h
+++ b/source/configs/base/cfg_thread_border_router.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/base/cfg_thread_end_device.h b/source/configs/base/cfg_thread_end_device.h
index 4cab9f26a18..4bd01abb708 100644
--- a/source/configs/base/cfg_thread_end_device.h
+++ b/source/configs/base/cfg_thread_end_device.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/base/cfg_thread_full_end_device.h b/source/configs/base/cfg_thread_full_end_device.h
index 7a605f4d1dc..94a65ec3527 100644
--- a/source/configs/base/cfg_thread_full_end_device.h
+++ b/source/configs/base/cfg_thread_full_end_device.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/base/cfg_thread_router.h b/source/configs/base/cfg_thread_router.h
index a15d0ba5a36..216d897c611 100644
--- a/source/configs/base/cfg_thread_router.h
+++ b/source/configs/base/cfg_thread_router.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/base/cfg_ws_border_router.h b/source/configs/base/cfg_ws_border_router.h
index d2fec898899..b3df78d00af 100644
--- a/source/configs/base/cfg_ws_border_router.h
+++ b/source/configs/base/cfg_ws_border_router.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/base/cfg_ws_router.h b/source/configs/base/cfg_ws_router.h
index 4822bbc37eb..a8a07c57004 100644
--- a/source/configs/base/cfg_ws_router.h
+++ b/source/configs/base/cfg_ws_router.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_ethernet_host.h b/source/configs/cfg_ethernet_host.h
index 7a68772bc19..38ed1114c6f 100644
--- a/source/configs/cfg_ethernet_host.h
+++ b/source/configs/cfg_ethernet_host.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2016, 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_generic.h b/source/configs/cfg_generic.h
index 9ed2d221e50..d17b1378500 100644
--- a/source/configs/cfg_generic.h
+++ b/source/configs/cfg_generic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014, 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_lowpan_border_router.h b/source/configs/cfg_lowpan_border_router.h
index 6ec843c10e0..589fa2755a9 100644
--- a/source/configs/cfg_lowpan_border_router.h
+++ b/source/configs/cfg_lowpan_border_router.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2016, 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_lowpan_border_router_rf_tunnel.h b/source/configs/cfg_lowpan_border_router_rf_tunnel.h
index bad93740196..e5128b87990 100644
--- a/source/configs/cfg_lowpan_border_router_rf_tunnel.h
+++ b/source/configs/cfg_lowpan_border_router_rf_tunnel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc.h b/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc.h
index 63fd2ca007f..195cd839800 100644
--- a/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc.h
+++ b/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2016, 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc_release.h b/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc_release.h
index 2a7ae8bf99c..c0df866a629 100644
--- a/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc_release.h
+++ b/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc_release.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2016, 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_lowpan_host.h b/source/configs/cfg_lowpan_host.h
index 03533192aa9..36fd6500208 100644
--- a/source/configs/cfg_lowpan_host.h
+++ b/source/configs/cfg_lowpan_host.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2016, 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_lowpan_router.h b/source/configs/cfg_lowpan_router.h
index b119cc3e9df..58449203e7e 100644
--- a/source/configs/cfg_lowpan_router.h
+++ b/source/configs/cfg_lowpan_router.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2016, 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_lowpan_router_ecc.h b/source/configs/cfg_lowpan_router_ecc.h
index be863e9c5bd..37dc24ef6fa 100644
--- a/source/configs/cfg_lowpan_router_ecc.h
+++ b/source/configs/cfg_lowpan_router_ecc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_lowpan_router_ecc_release.h b/source/configs/cfg_lowpan_router_ecc_release.h
index f189344917b..c1ddcb53157 100644
--- a/source/configs/cfg_lowpan_router_ecc_release.h
+++ b/source/configs/cfg_lowpan_router_ecc_release.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_nanostack_full.h b/source/configs/cfg_nanostack_full.h
index 9aa6ba0738f..0510e0cb3f8 100644
--- a/source/configs/cfg_nanostack_full.h
+++ b/source/configs/cfg_nanostack_full.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2016, 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_nanostack_full_debug.h b/source/configs/cfg_nanostack_full_debug.h
index 980a0499e41..19658939a6d 100644
--- a/source/configs/cfg_nanostack_full_debug.h
+++ b/source/configs/cfg_nanostack_full_debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2016, 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_rf_interface.h b/source/configs/cfg_rf_interface.h
index e4d1787adfd..e046bcf4a75 100644
--- a/source/configs/cfg_rf_interface.h
+++ b/source/configs/cfg_rf_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_thread_border_router.h b/source/configs/cfg_thread_border_router.h
index bf0df9a149d..0a992bd360b 100644
--- a/source/configs/cfg_thread_border_router.h
+++ b/source/configs/cfg_thread_border_router.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_thread_end_device.h b/source/configs/cfg_thread_end_device.h
index 1b7d93d89c9..b4ae613d6af 100644
--- a/source/configs/cfg_thread_end_device.h
+++ b/source/configs/cfg_thread_end_device.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2016, 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_thread_full_end_device.h b/source/configs/cfg_thread_full_end_device.h
index 92ebdccc05d..f14397da44e 100644
--- a/source/configs/cfg_thread_full_end_device.h
+++ b/source/configs/cfg_thread_full_end_device.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2016, 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_thread_router.h b/source/configs/cfg_thread_router.h
index f348ccd5de6..850b030bb2e 100644
--- a/source/configs/cfg_thread_router.h
+++ b/source/configs/cfg_thread_router.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2016, 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_thread_thci.h b/source/configs/cfg_thread_thci.h
index ad66413a0a2..d2257b0e71d 100644
--- a/source/configs/cfg_thread_thci.h
+++ b/source/configs/cfg_thread_thci.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_ws_border_router.h b/source/configs/cfg_ws_border_router.h
index 102890cc60d..8927f82837a 100644
--- a/source/configs/cfg_ws_border_router.h
+++ b/source/configs/cfg_ws_border_router.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/configs/cfg_ws_router.h b/source/configs/cfg_ws_router.h
index b3ce93f785a..a4cf9525016 100644
--- a/source/configs/cfg_ws_router.h
+++ b/source/configs/cfg_ws_router.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/ipv6_stack/ipv6_routing_table.c b/source/ipv6_stack/ipv6_routing_table.c
index 0cbc0a4065d..d036455eca8 100644
--- a/source/ipv6_stack/ipv6_routing_table.c
+++ b/source/ipv6_stack/ipv6_routing_table.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2019, Arm Limited and affiliates.
+ * Copyright (c) 2012-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/ipv6_stack/ipv6_routing_table.h b/source/ipv6_stack/ipv6_routing_table.h
index ce7eb224762..735ab3f56be 100644
--- a/source/ipv6_stack/ipv6_routing_table.h
+++ b/source/ipv6_stack/ipv6_routing_table.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2012, 2014-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/ipv6_stack/protocol_ipv6.c b/source/ipv6_stack/protocol_ipv6.c
index b7cd9218fae..6041ac623a4 100644
--- a/source/ipv6_stack/protocol_ipv6.c
+++ b/source/ipv6_stack/protocol_ipv6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2019, Arm Limited and affiliates.
+ * Copyright (c) 2012-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/ipv6_stack/protocol_ipv6.h b/source/ipv6_stack/protocol_ipv6.h
index 51bbc911a77..4370cdbee08 100644
--- a/source/ipv6_stack/protocol_ipv6.h
+++ b/source/ipv6_stack/protocol_ipv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libDHCPv6/dhcp_service_api.c b/source/libDHCPv6/dhcp_service_api.c
index 13bfaf62db1..44822e46771 100644
--- a/source/libDHCPv6/dhcp_service_api.c
+++ b/source/libDHCPv6/dhcp_service_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018, Arm Limited and affiliates.
+ * Copyright (c) 2013-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libDHCPv6/libDHCPv6.c b/source/libDHCPv6/libDHCPv6.c
index abc29b22728..4c32076c4b0 100644
--- a/source/libDHCPv6/libDHCPv6.c
+++ b/source/libDHCPv6/libDHCPv6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libDHCPv6/libDHCPv6.h b/source/libDHCPv6/libDHCPv6.h
index 5910bab1907..247a251ee57 100644
--- a/source/libDHCPv6/libDHCPv6.h
+++ b/source/libDHCPv6/libDHCPv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libDHCPv6/libDHCPv6_server.c b/source/libDHCPv6/libDHCPv6_server.c
index 858d2f09318..5cb06bc1930 100644
--- a/source/libDHCPv6/libDHCPv6_server.c
+++ b/source/libDHCPv6/libDHCPv6_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libDHCPv6/libDHCPv6_server.h b/source/libDHCPv6/libDHCPv6_server.h
index 4dab618b924..bf26c679d13 100644
--- a/source/libDHCPv6/libDHCPv6_server.h
+++ b/source/libDHCPv6/libDHCPv6_server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libDHCPv6/libDHCPv6_vendordata.c b/source/libDHCPv6/libDHCPv6_vendordata.c
index 2854517d5e3..88b87fe005d 100644
--- a/source/libDHCPv6/libDHCPv6_vendordata.c
+++ b/source/libDHCPv6/libDHCPv6_vendordata.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libDHCPv6/libDHCPv6_vendordata.h b/source/libDHCPv6/libDHCPv6_vendordata.h
index 1a1ef44f7f6..bc50fca81d7 100644
--- a/source/libDHCPv6/libDHCPv6_vendordata.h
+++ b/source/libDHCPv6/libDHCPv6_vendordata.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libNET/src/multicast_api.c b/source/libNET/src/multicast_api.c
index 2f654dacb5a..dfc64cf97c9 100644
--- a/source/libNET/src/multicast_api.c
+++ b/source/libNET/src/multicast_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libNET/src/net_6lowpan_parameter_api.c b/source/libNET/src/net_6lowpan_parameter_api.c
index cd1649df3c8..776c09f0697 100644
--- a/source/libNET/src/net_6lowpan_parameter_api.c
+++ b/source/libNET/src/net_6lowpan_parameter_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libNET/src/net_dns.c b/source/libNET/src/net_dns.c
index 7975ba89b69..7e4dc8d78c9 100644
--- a/source/libNET/src/net_dns.c
+++ b/source/libNET/src/net_dns.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libNET/src/net_dns_internal.h b/source/libNET/src/net_dns_internal.h
index bd58dbb51b2..7f2d15ef310 100644
--- a/source/libNET/src/net_dns_internal.h
+++ b/source/libNET/src/net_dns_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libNET/src/net_ipv6.c b/source/libNET/src/net_ipv6.c
index f990c1b2b30..b9387b2d4c6 100644
--- a/source/libNET/src/net_ipv6.c
+++ b/source/libNET/src/net_ipv6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libNET/src/net_load_balance.c b/source/libNET/src/net_load_balance.c
index a643d90fde3..7dbbe1ae298 100644
--- a/source/libNET/src/net_load_balance.c
+++ b/source/libNET/src/net_load_balance.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libNET/src/net_load_balance_internal.h b/source/libNET/src/net_load_balance_internal.h
index 7c073eb4fec..2b3dd926ee1 100644
--- a/source/libNET/src/net_load_balance_internal.h
+++ b/source/libNET/src/net_load_balance_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libNET/src/net_mle.c b/source/libNET/src/net_mle.c
index 39be3ee252e..58c4776c490 100644
--- a/source/libNET/src/net_mle.c
+++ b/source/libNET/src/net_mle.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libNET/src/net_rpl.c b/source/libNET/src/net_rpl.c
index 70e26a5c292..e15dcdc7ac1 100644
--- a/source/libNET/src/net_rpl.c
+++ b/source/libNET/src/net_rpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libNET/src/net_short_address_extension.c b/source/libNET/src/net_short_address_extension.c
index 3af8a11a6ef..32e64edb5a2 100644
--- a/source/libNET/src/net_short_address_extension.c
+++ b/source/libNET/src/net_short_address_extension.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libNET/src/net_test.c b/source/libNET/src/net_test.c
index 89cb141eaf2..ad1c9b236d7 100644
--- a/source/libNET/src/net_test.c
+++ b/source/libNET/src/net_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libNET/src/ns_net.c b/source/libNET/src/ns_net.c
index 09c3fc1b7b3..dd3883c6efb 100644
--- a/source/libNET/src/ns_net.c
+++ b/source/libNET/src/ns_net.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/libNET/src/socket_api.c b/source/libNET/src/socket_api.c
index d02df10121d..2de5d0d2986 100644
--- a/source/libNET/src/socket_api.c
+++ b/source/libNET/src/socket_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/nsconfig.h b/source/nsconfig.h
index dfb182a5aff..0f55f1fdcf1 100644
--- a/source/nsconfig.h
+++ b/source/nsconfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/Mesh/main.cpp b/test/nanostack/unittest/6LoWPAN/Mesh/main.cpp
index 1e56e8c4ac3..848397ee8d6 100644
--- a/test/nanostack/unittest/6LoWPAN/Mesh/main.cpp
+++ b/test/nanostack/unittest/6LoWPAN/Mesh/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/Mesh/mesh_test.cpp b/test/nanostack/unittest/6LoWPAN/Mesh/mesh_test.cpp
index af106d81adf..4a6f6ba7882 100644
--- a/test/nanostack/unittest/6LoWPAN/Mesh/mesh_test.cpp
+++ b/test/nanostack/unittest/6LoWPAN/Mesh/mesh_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/Mesh/test_mesh.cpp b/test/nanostack/unittest/6LoWPAN/Mesh/test_mesh.cpp
index 67de26f976e..e0092b31710 100644
--- a/test/nanostack/unittest/6LoWPAN/Mesh/test_mesh.cpp
+++ b/test/nanostack/unittest/6LoWPAN/Mesh/test_mesh.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/Mesh/test_mesh.h b/test/nanostack/unittest/6LoWPAN/Mesh/test_mesh.h
index f340e8c7b8a..b72714b360d 100644
--- a/test/nanostack/unittest/6LoWPAN/Mesh/test_mesh.h
+++ b/test/nanostack/unittest/6LoWPAN/Mesh/test_mesh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/NVM/main.cpp b/test/nanostack/unittest/6LoWPAN/NVM/main.cpp
index feb1ed182b3..9c473e4abf8 100644
--- a/test/nanostack/unittest/6LoWPAN/NVM/main.cpp
+++ b/test/nanostack/unittest/6LoWPAN/NVM/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/NVM/nwk_nvmtest.cpp b/test/nanostack/unittest/6LoWPAN/NVM/nwk_nvmtest.cpp
index e1613f6cb78..93c82481bac 100644
--- a/test/nanostack/unittest/6LoWPAN/NVM/nwk_nvmtest.cpp
+++ b/test/nanostack/unittest/6LoWPAN/NVM/nwk_nvmtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/NVM/test_nwk_nvm.c b/test/nanostack/unittest/6LoWPAN/NVM/test_nwk_nvm.c
index 51f8285ada5..c4a234e1d7b 100644
--- a/test/nanostack/unittest/6LoWPAN/NVM/test_nwk_nvm.c
+++ b/test/nanostack/unittest/6LoWPAN/NVM/test_nwk_nvm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/NVM/test_nwk_nvm.h b/test/nanostack/unittest/6LoWPAN/NVM/test_nwk_nvm.h
index 99bf815d59b..b31a7ba7640 100644
--- a/test/nanostack/unittest/6LoWPAN/NVM/test_nwk_nvm.h
+++ b/test/nanostack/unittest/6LoWPAN/NVM/test_nwk_nvm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/adaptation_interface/adaptation_interfacetest.cpp b/test/nanostack/unittest/6LoWPAN/adaptation_interface/adaptation_interfacetest.cpp
index 59727cf52f9..1e37f89c828 100644
--- a/test/nanostack/unittest/6LoWPAN/adaptation_interface/adaptation_interfacetest.cpp
+++ b/test/nanostack/unittest/6LoWPAN/adaptation_interface/adaptation_interfacetest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/adaptation_interface/main.cpp b/test/nanostack/unittest/6LoWPAN/adaptation_interface/main.cpp
index c1c98c3a77d..c90cd0ed330 100644
--- a/test/nanostack/unittest/6LoWPAN/adaptation_interface/main.cpp
+++ b/test/nanostack/unittest/6LoWPAN/adaptation_interface/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/adaptation_interface/test_adaptation_interface.c b/test/nanostack/unittest/6LoWPAN/adaptation_interface/test_adaptation_interface.c
index f74d5607144..20458ae175b 100644
--- a/test/nanostack/unittest/6LoWPAN/adaptation_interface/test_adaptation_interface.c
+++ b/test/nanostack/unittest/6LoWPAN/adaptation_interface/test_adaptation_interface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/adaptation_interface/test_adaptation_interface.h b/test/nanostack/unittest/6LoWPAN/adaptation_interface/test_adaptation_interface.h
index ccef6bfef55..81d935e59ab 100644
--- a/test/nanostack/unittest/6LoWPAN/adaptation_interface/test_adaptation_interface.h
+++ b/test/nanostack/unittest/6LoWPAN/adaptation_interface/test_adaptation_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/nd_router_object/main.cpp b/test/nanostack/unittest/6LoWPAN/nd_router_object/main.cpp
index 29680a6d590..8388cbbab5f 100644
--- a/test/nanostack/unittest/6LoWPAN/nd_router_object/main.cpp
+++ b/test/nanostack/unittest/6LoWPAN/nd_router_object/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/nd_router_object/nd_router_objecttest.cpp b/test/nanostack/unittest/6LoWPAN/nd_router_object/nd_router_objecttest.cpp
index 95de4bb84e3..bea38e08f5f 100644
--- a/test/nanostack/unittest/6LoWPAN/nd_router_object/nd_router_objecttest.cpp
+++ b/test/nanostack/unittest/6LoWPAN/nd_router_object/nd_router_objecttest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/nd_router_object/test_nd_router_object.c b/test/nanostack/unittest/6LoWPAN/nd_router_object/test_nd_router_object.c
index c8acb1abd37..d109bb48134 100644
--- a/test/nanostack/unittest/6LoWPAN/nd_router_object/test_nd_router_object.c
+++ b/test/nanostack/unittest/6LoWPAN/nd_router_object/test_nd_router_object.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/nd_router_object/test_nd_router_object.h b/test/nanostack/unittest/6LoWPAN/nd_router_object/test_nd_router_object.h
index 9d57bb485fc..e6e12ed9f09 100644
--- a/test/nanostack/unittest/6LoWPAN/nd_router_object/test_nd_router_object.h
+++ b/test/nanostack/unittest/6LoWPAN/nd_router_object/test_nd_router_object.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/reassemly_interface/main.cpp b/test/nanostack/unittest/6LoWPAN/reassemly_interface/main.cpp
index 171a2606487..6963462ada4 100644
--- a/test/nanostack/unittest/6LoWPAN/reassemly_interface/main.cpp
+++ b/test/nanostack/unittest/6LoWPAN/reassemly_interface/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/reassemly_interface/reassembly_interfacetest.cpp b/test/nanostack/unittest/6LoWPAN/reassemly_interface/reassembly_interfacetest.cpp
index 578b36ae2dd..48f510b3a67 100644
--- a/test/nanostack/unittest/6LoWPAN/reassemly_interface/reassembly_interfacetest.cpp
+++ b/test/nanostack/unittest/6LoWPAN/reassemly_interface/reassembly_interfacetest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/reassemly_interface/test_cipv6_reassembly_interface.c b/test/nanostack/unittest/6LoWPAN/reassemly_interface/test_cipv6_reassembly_interface.c
index 9fa8ee9436b..287d785c7db 100644
--- a/test/nanostack/unittest/6LoWPAN/reassemly_interface/test_cipv6_reassembly_interface.c
+++ b/test/nanostack/unittest/6LoWPAN/reassemly_interface/test_cipv6_reassembly_interface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/reassemly_interface/test_cipv6_reassembly_interface.h b/test/nanostack/unittest/6LoWPAN/reassemly_interface/test_cipv6_reassembly_interface.h
index 250e99ed203..2960a7f7b87 100644
--- a/test/nanostack/unittest/6LoWPAN/reassemly_interface/test_cipv6_reassembly_interface.h
+++ b/test/nanostack/unittest/6LoWPAN/reassemly_interface/test_cipv6_reassembly_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/main.cpp b/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/main.cpp
index a02f8e0ce32..6801a418cad 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/main.cpp
+++ b/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.c b/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.c
index d654fea4bb1..fd55216c00e 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.c
+++ b/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.c
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020-2021, Pelion 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 cofhssiance with the License.
+ * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or isec_timeried.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
diff --git a/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.h b/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.h
index eaf4ca5d30d..6ef4830bb5b 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.h
+++ b/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/ws_cfg_settings_test.cpp b/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/ws_cfg_settings_test.cpp
index 24a85ea00d5..826d76824f1 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/ws_cfg_settings_test.cpp
+++ b/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/ws_cfg_settings_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_ie_lib/main.cpp b/test/nanostack/unittest/6LoWPAN/ws_ie_lib/main.cpp
index c2d6c08dcd0..239bb0697af 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_ie_lib/main.cpp
+++ b/test/nanostack/unittest/6LoWPAN/ws_ie_lib/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2016, 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_ie_lib/test_ws_ie_lib.c b/test/nanostack/unittest/6LoWPAN/ws_ie_lib/test_ws_ie_lib.c
index a2976b99b55..d08b0e4f584 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_ie_lib/test_ws_ie_lib.c
+++ b/test/nanostack/unittest/6LoWPAN/ws_ie_lib/test_ws_ie_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_ie_lib/test_ws_ie_lib.h b/test/nanostack/unittest/6LoWPAN/ws_ie_lib/test_ws_ie_lib.h
index d90078ceee9..62872d9abf9 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_ie_lib/test_ws_ie_lib.h
+++ b/test/nanostack/unittest/6LoWPAN/ws_ie_lib/test_ws_ie_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_ie_lib/ws_ie_libtest.cpp b/test/nanostack/unittest/6LoWPAN/ws_ie_lib/ws_ie_libtest.cpp
index ba745b085e2..842938ed031 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_ie_lib/ws_ie_libtest.cpp
+++ b/test/nanostack/unittest/6LoWPAN/ws_ie_lib/ws_ie_libtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/main.cpp b/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/main.cpp
index 70b3c4922ee..bc63d130911 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/main.cpp
+++ b/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2016, 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/test_ws_llc_data_service.c b/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/test_ws_llc_data_service.c
index d2209f1610c..87072b03da7 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/test_ws_llc_data_service.c
+++ b/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/test_ws_llc_data_service.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/test_ws_llc_data_service.h b/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/test_ws_llc_data_service.h
index 7a40abb709a..6a388cbb0ca 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/test_ws_llc_data_service.h
+++ b/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/test_ws_llc_data_service.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/ws_llc_data_servicetest.cpp b/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/ws_llc_data_servicetest.cpp
index 1e2e28b5217..7fb3d92c3f4 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/ws_llc_data_servicetest.cpp
+++ b/test/nanostack/unittest/6LoWPAN/ws_llc_data_service/ws_llc_data_servicetest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_management_api/main.cpp b/test/nanostack/unittest/6LoWPAN/ws_management_api/main.cpp
index e7a12069495..b4f934f8321 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_management_api/main.cpp
+++ b/test/nanostack/unittest/6LoWPAN/ws_management_api/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_management_api/test_ws_management_api.c b/test/nanostack/unittest/6LoWPAN/ws_management_api/test_ws_management_api.c
index 9181d8253c2..bc7c15b4132 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_management_api/test_ws_management_api.c
+++ b/test/nanostack/unittest/6LoWPAN/ws_management_api/test_ws_management_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_management_api/test_ws_management_api.h b/test/nanostack/unittest/6LoWPAN/ws_management_api/test_ws_management_api.h
index f90cb1d34ad..7c50f7b2c27 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_management_api/test_ws_management_api.h
+++ b/test/nanostack/unittest/6LoWPAN/ws_management_api/test_ws_management_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_management_api/ws_management_api_test.cpp b/test/nanostack/unittest/6LoWPAN/ws_management_api/ws_management_api_test.cpp
index 6cd4c61348e..5bf37d19abe 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_management_api/ws_management_api_test.cpp
+++ b/test/nanostack/unittest/6LoWPAN/ws_management_api/ws_management_api_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_mpx_header/main.cpp b/test/nanostack/unittest/6LoWPAN/ws_mpx_header/main.cpp
index a6836ec9f7d..21fd87254e7 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_mpx_header/main.cpp
+++ b/test/nanostack/unittest/6LoWPAN/ws_mpx_header/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2016, 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_mpx_header/test_ws_mpx_header.c b/test/nanostack/unittest/6LoWPAN/ws_mpx_header/test_ws_mpx_header.c
index f5ac2000f2b..b52a9165d61 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_mpx_header/test_ws_mpx_header.c
+++ b/test/nanostack/unittest/6LoWPAN/ws_mpx_header/test_ws_mpx_header.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_mpx_header/test_ws_mpx_header.h b/test/nanostack/unittest/6LoWPAN/ws_mpx_header/test_ws_mpx_header.h
index ff5733e90d2..54278859fe2 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_mpx_header/test_ws_mpx_header.h
+++ b/test/nanostack/unittest/6LoWPAN/ws_mpx_header/test_ws_mpx_header.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_mpx_header/ws_mpx_headertest.cpp b/test/nanostack/unittest/6LoWPAN/ws_mpx_header/ws_mpx_headertest.cpp
index 8c94fdee335..ee915fc6a64 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_mpx_header/ws_mpx_headertest.cpp
+++ b/test/nanostack/unittest/6LoWPAN/ws_mpx_header/ws_mpx_headertest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/beacon_handler/beacon_handlertest.cpp b/test/nanostack/unittest/6lp_mac/beacon_handler/beacon_handlertest.cpp
index 597ffbf6314..aef641bbae2 100644
--- a/test/nanostack/unittest/6lp_mac/beacon_handler/beacon_handlertest.cpp
+++ b/test/nanostack/unittest/6lp_mac/beacon_handler/beacon_handlertest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/beacon_handler/main.cpp b/test/nanostack/unittest/6lp_mac/beacon_handler/main.cpp
index 86d4532e23e..5e3496b39c3 100644
--- a/test/nanostack/unittest/6lp_mac/beacon_handler/main.cpp
+++ b/test/nanostack/unittest/6lp_mac/beacon_handler/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/beacon_handler/test_beacon_handler.c b/test/nanostack/unittest/6lp_mac/beacon_handler/test_beacon_handler.c
index a0cd044f42d..4de4be30f57 100644
--- a/test/nanostack/unittest/6lp_mac/beacon_handler/test_beacon_handler.c
+++ b/test/nanostack/unittest/6lp_mac/beacon_handler/test_beacon_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/beacon_handler/test_beacon_handler.h b/test/nanostack/unittest/6lp_mac/beacon_handler/test_beacon_handler.h
index 515c23d5352..002e8c05921 100644
--- a/test/nanostack/unittest/6lp_mac/beacon_handler/test_beacon_handler.h
+++ b/test/nanostack/unittest/6lp_mac/beacon_handler/test_beacon_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_data_poll/mac_data_polltest.cpp b/test/nanostack/unittest/6lp_mac/mac_data_poll/mac_data_polltest.cpp
index b0985bbae67..83daab45d3f 100644
--- a/test/nanostack/unittest/6lp_mac/mac_data_poll/mac_data_polltest.cpp
+++ b/test/nanostack/unittest/6lp_mac/mac_data_poll/mac_data_polltest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_data_poll/main.cpp b/test/nanostack/unittest/6lp_mac/mac_data_poll/main.cpp
index 65406131811..c18491056cd 100644
--- a/test/nanostack/unittest/6lp_mac/mac_data_poll/main.cpp
+++ b/test/nanostack/unittest/6lp_mac/mac_data_poll/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_data_poll/test_mac_data_poll.c b/test/nanostack/unittest/6lp_mac/mac_data_poll/test_mac_data_poll.c
index 0497cfbe01d..5d12d6f072a 100644
--- a/test/nanostack/unittest/6lp_mac/mac_data_poll/test_mac_data_poll.c
+++ b/test/nanostack/unittest/6lp_mac/mac_data_poll/test_mac_data_poll.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_data_poll/test_mac_data_poll.h b/test/nanostack/unittest/6lp_mac/mac_data_poll/test_mac_data_poll.h
index d0b9a5076cf..5dba269c7d0 100644
--- a/test/nanostack/unittest/6lp_mac/mac_data_poll/test_mac_data_poll.h
+++ b/test/nanostack/unittest/6lp_mac/mac_data_poll/test_mac_data_poll.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_helper/mac_helpertest.cpp b/test/nanostack/unittest/6lp_mac/mac_helper/mac_helpertest.cpp
index b3ff81b39d3..06bd739f420 100644
--- a/test/nanostack/unittest/6lp_mac/mac_helper/mac_helpertest.cpp
+++ b/test/nanostack/unittest/6lp_mac/mac_helper/mac_helpertest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_helper/main.cpp b/test/nanostack/unittest/6lp_mac/mac_helper/main.cpp
index 9d08683ebb1..46284103e1b 100644
--- a/test/nanostack/unittest/6lp_mac/mac_helper/main.cpp
+++ b/test/nanostack/unittest/6lp_mac/mac_helper/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_helper/test_mac_helper.c b/test/nanostack/unittest/6lp_mac/mac_helper/test_mac_helper.c
index ced03eba2d5..79a36fc7f49 100644
--- a/test/nanostack/unittest/6lp_mac/mac_helper/test_mac_helper.c
+++ b/test/nanostack/unittest/6lp_mac/mac_helper/test_mac_helper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_helper/test_mac_helper.h b/test/nanostack/unittest/6lp_mac/mac_helper/test_mac_helper.h
index 5ec94a7d5d0..15f8bc4a3bf 100644
--- a/test/nanostack/unittest/6lp_mac/mac_helper/test_mac_helper.h
+++ b/test/nanostack/unittest/6lp_mac/mac_helper/test_mac_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_ie_lib/mac_ie_libtest.cpp b/test/nanostack/unittest/6lp_mac/mac_ie_lib/mac_ie_libtest.cpp
index 6d57ac5f833..51119782824 100644
--- a/test/nanostack/unittest/6lp_mac/mac_ie_lib/mac_ie_libtest.cpp
+++ b/test/nanostack/unittest/6lp_mac/mac_ie_lib/mac_ie_libtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_ie_lib/main.cpp b/test/nanostack/unittest/6lp_mac/mac_ie_lib/main.cpp
index 7b029490e52..616a2eb4393 100644
--- a/test/nanostack/unittest/6lp_mac/mac_ie_lib/main.cpp
+++ b/test/nanostack/unittest/6lp_mac/mac_ie_lib/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_ie_lib/test_mac_ie_lib.c b/test/nanostack/unittest/6lp_mac/mac_ie_lib/test_mac_ie_lib.c
index 3da34a03a2f..59e15637c7a 100644
--- a/test/nanostack/unittest/6lp_mac/mac_ie_lib/test_mac_ie_lib.c
+++ b/test/nanostack/unittest/6lp_mac/mac_ie_lib/test_mac_ie_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_ie_lib/test_mac_ie_lib.h b/test/nanostack/unittest/6lp_mac/mac_ie_lib/test_mac_ie_lib.h
index 5695ff5d521..22b76f42e38 100644
--- a/test/nanostack/unittest/6lp_mac/mac_ie_lib/test_mac_ie_lib.h
+++ b/test/nanostack/unittest/6lp_mac/mac_ie_lib/test_mac_ie_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_pairwise_key/mac_pairwise_keytest.cpp b/test/nanostack/unittest/6lp_mac/mac_pairwise_key/mac_pairwise_keytest.cpp
index 7f1dadc0cbe..243629f7d79 100644
--- a/test/nanostack/unittest/6lp_mac/mac_pairwise_key/mac_pairwise_keytest.cpp
+++ b/test/nanostack/unittest/6lp_mac/mac_pairwise_key/mac_pairwise_keytest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_pairwise_key/main.cpp b/test/nanostack/unittest/6lp_mac/mac_pairwise_key/main.cpp
index 74d885c2d60..c8e20e8f008 100644
--- a/test/nanostack/unittest/6lp_mac/mac_pairwise_key/main.cpp
+++ b/test/nanostack/unittest/6lp_mac/mac_pairwise_key/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_pairwise_key/test_mac_pairwise_key.c b/test/nanostack/unittest/6lp_mac/mac_pairwise_key/test_mac_pairwise_key.c
index 28740f98d94..2ecbe5de30e 100644
--- a/test/nanostack/unittest/6lp_mac/mac_pairwise_key/test_mac_pairwise_key.c
+++ b/test/nanostack/unittest/6lp_mac/mac_pairwise_key/test_mac_pairwise_key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_pairwise_key/test_mac_pairwise_key.h b/test/nanostack/unittest/6lp_mac/mac_pairwise_key/test_mac_pairwise_key.h
index bf4ccde0e3c..1216895d790 100644
--- a/test/nanostack/unittest/6lp_mac/mac_pairwise_key/test_mac_pairwise_key.h
+++ b/test/nanostack/unittest/6lp_mac/mac_pairwise_key/test_mac_pairwise_key.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_response_handler/mac_response_handlertest.cpp b/test/nanostack/unittest/6lp_mac/mac_response_handler/mac_response_handlertest.cpp
index 77a208d67fb..da13497acab 100644
--- a/test/nanostack/unittest/6lp_mac/mac_response_handler/mac_response_handlertest.cpp
+++ b/test/nanostack/unittest/6lp_mac/mac_response_handler/mac_response_handlertest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_response_handler/main.cpp b/test/nanostack/unittest/6lp_mac/mac_response_handler/main.cpp
index 9bf8834358b..24b097ef8ca 100644
--- a/test/nanostack/unittest/6lp_mac/mac_response_handler/main.cpp
+++ b/test/nanostack/unittest/6lp_mac/mac_response_handler/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_response_handler/test_mac_response_handler.c b/test/nanostack/unittest/6lp_mac/mac_response_handler/test_mac_response_handler.c
index 4771fae3c4f..e607dc29fa9 100644
--- a/test/nanostack/unittest/6lp_mac/mac_response_handler/test_mac_response_handler.c
+++ b/test/nanostack/unittest/6lp_mac/mac_response_handler/test_mac_response_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6lp_mac/mac_response_handler/test_mac_response_handler.h b/test/nanostack/unittest/6lp_mac/mac_response_handler/test_mac_response_handler.h
index 7e3f650c0df..6c443b2e35a 100644
--- a/test/nanostack/unittest/6lp_mac/mac_response_handler/test_mac_response_handler.h
+++ b/test/nanostack/unittest/6lp_mac/mac_response_handler/test_mac_response_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/network_lib/main.cpp b/test/nanostack/unittest/Bootstraps/network_lib/main.cpp
index 8378ceb0627..f6793ae4a71 100644
--- a/test/nanostack/unittest/Bootstraps/network_lib/main.cpp
+++ b/test/nanostack/unittest/Bootstraps/network_lib/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/network_lib/network_libtest.cpp b/test/nanostack/unittest/Bootstraps/network_lib/network_libtest.cpp
index d45c1a6b3d0..56da5d08bca 100644
--- a/test/nanostack/unittest/Bootstraps/network_lib/network_libtest.cpp
+++ b/test/nanostack/unittest/Bootstraps/network_lib/network_libtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/network_lib/test_network_lib.c b/test/nanostack/unittest/Bootstraps/network_lib/test_network_lib.c
index 7962945e032..43cbcbd8957 100644
--- a/test/nanostack/unittest/Bootstraps/network_lib/test_network_lib.c
+++ b/test/nanostack/unittest/Bootstraps/network_lib/test_network_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/network_lib/test_network_lib.h b/test/nanostack/unittest/Bootstraps/network_lib/test_network_lib.h
index c3b27c707f0..8e69bf7f88d 100644
--- a/test/nanostack/unittest/Bootstraps/network_lib/test_network_lib.h
+++ b/test/nanostack/unittest/Bootstraps/network_lib/test_network_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/protocol_6lowpan/main.cpp b/test/nanostack/unittest/Bootstraps/protocol_6lowpan/main.cpp
index 39751ecd559..1eada32830b 100644
--- a/test/nanostack/unittest/Bootstraps/protocol_6lowpan/main.cpp
+++ b/test/nanostack/unittest/Bootstraps/protocol_6lowpan/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/protocol_6lowpan/protocol_6lowpantest.cpp b/test/nanostack/unittest/Bootstraps/protocol_6lowpan/protocol_6lowpantest.cpp
index 77d9a1a49bc..9998bb1e5fd 100644
--- a/test/nanostack/unittest/Bootstraps/protocol_6lowpan/protocol_6lowpantest.cpp
+++ b/test/nanostack/unittest/Bootstraps/protocol_6lowpan/protocol_6lowpantest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/protocol_6lowpan/test_protocol_6lowpan.c b/test/nanostack/unittest/Bootstraps/protocol_6lowpan/test_protocol_6lowpan.c
index d64869832ea..64da58e7735 100644
--- a/test/nanostack/unittest/Bootstraps/protocol_6lowpan/test_protocol_6lowpan.c
+++ b/test/nanostack/unittest/Bootstraps/protocol_6lowpan/test_protocol_6lowpan.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/protocol_6lowpan/test_protocol_6lowpan.h b/test/nanostack/unittest/Bootstraps/protocol_6lowpan/test_protocol_6lowpan.h
index be97a506c26..d5e8c2b2030 100644
--- a/test/nanostack/unittest/Bootstraps/protocol_6lowpan/test_protocol_6lowpan.h
+++ b/test/nanostack/unittest/Bootstraps/protocol_6lowpan/test_protocol_6lowpan.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/main.cpp b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/main.cpp
index 97730af1573..3bef1e9199d 100644
--- a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/main.cpp
+++ b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/protocol_6lowpan_bootstraptest.cpp b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/protocol_6lowpan_bootstraptest.cpp
index a959801398b..a4cb486f88f 100644
--- a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/protocol_6lowpan_bootstraptest.cpp
+++ b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/protocol_6lowpan_bootstraptest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/test_protocol_6lowpan_bootstrap.c b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/test_protocol_6lowpan_bootstrap.c
index 94ba5ed424e..eb71a89e69b 100644
--- a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/test_protocol_6lowpan_bootstrap.c
+++ b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/test_protocol_6lowpan_bootstrap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/test_protocol_6lowpan_bootstrap.h b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/test_protocol_6lowpan_bootstrap.h
index fdcb510a31a..abd9fc9db61 100644
--- a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/test_protocol_6lowpan_bootstrap.h
+++ b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_bootstrap/test_protocol_6lowpan_bootstrap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/main.cpp b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/main.cpp
index a88bf1ebb4d..49f37cb0ba2 100644
--- a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/main.cpp
+++ b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/protocol_6lowpan_interfacetest.cpp b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/protocol_6lowpan_interfacetest.cpp
index 5738b1df580..cf68f1b152b 100644
--- a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/protocol_6lowpan_interfacetest.cpp
+++ b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/protocol_6lowpan_interfacetest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/test_protocol_6lowpan_interface.c b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/test_protocol_6lowpan_interface.c
index 52379a8d3f9..4130955859a 100644
--- a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/test_protocol_6lowpan_interface.c
+++ b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/test_protocol_6lowpan_interface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/test_protocol_6lowpan_interface.h b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/test_protocol_6lowpan_interface.h
index 1cb0cf74d40..31068189af2 100644
--- a/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/test_protocol_6lowpan_interface.h
+++ b/test/nanostack/unittest/Bootstraps/protocol_6lowpan_interface/test_protocol_6lowpan_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/BorderRouter/border_router/border_routertest.cpp b/test/nanostack/unittest/BorderRouter/border_router/border_routertest.cpp
index 5fa192272c9..70e7bf34d84 100644
--- a/test/nanostack/unittest/BorderRouter/border_router/border_routertest.cpp
+++ b/test/nanostack/unittest/BorderRouter/border_router/border_routertest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/BorderRouter/border_router/main.cpp b/test/nanostack/unittest/BorderRouter/border_router/main.cpp
index 5eba2d3a0c8..aa2e82b17e0 100644
--- a/test/nanostack/unittest/BorderRouter/border_router/main.cpp
+++ b/test/nanostack/unittest/BorderRouter/border_router/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/BorderRouter/border_router/test_border_router.c b/test/nanostack/unittest/BorderRouter/border_router/test_border_router.c
index c32c2409c41..e34219fca8a 100644
--- a/test/nanostack/unittest/BorderRouter/border_router/test_border_router.c
+++ b/test/nanostack/unittest/BorderRouter/border_router/test_border_router.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/BorderRouter/border_router/test_border_router.h b/test/nanostack/unittest/BorderRouter/border_router/test_border_router.h
index 0d0cfd08462..f147f8eb4e3 100644
--- a/test/nanostack/unittest/BorderRouter/border_router/test_border_router.h
+++ b/test/nanostack/unittest/BorderRouter/border_router/test_border_router.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/icmpv6/icmpv6test.cpp b/test/nanostack/unittest/Common_Protocols/icmpv6/icmpv6test.cpp
index 0bb9882db34..47bf3d53dec 100644
--- a/test/nanostack/unittest/Common_Protocols/icmpv6/icmpv6test.cpp
+++ b/test/nanostack/unittest/Common_Protocols/icmpv6/icmpv6test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/icmpv6/main.cpp b/test/nanostack/unittest/Common_Protocols/icmpv6/main.cpp
index d1b53a98c15..77a3d9c4d70 100644
--- a/test/nanostack/unittest/Common_Protocols/icmpv6/main.cpp
+++ b/test/nanostack/unittest/Common_Protocols/icmpv6/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/icmpv6/test_icmpv6.c b/test/nanostack/unittest/Common_Protocols/icmpv6/test_icmpv6.c
index dbf9c882581..b82ac135ab8 100644
--- a/test/nanostack/unittest/Common_Protocols/icmpv6/test_icmpv6.c
+++ b/test/nanostack/unittest/Common_Protocols/icmpv6/test_icmpv6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/icmpv6/test_icmpv6.h b/test/nanostack/unittest/Common_Protocols/icmpv6/test_icmpv6.h
index c50795db549..68e5da92c2e 100644
--- a/test/nanostack/unittest/Common_Protocols/icmpv6/test_icmpv6.h
+++ b/test/nanostack/unittest/Common_Protocols/icmpv6/test_icmpv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/icmpv6_prefixtest.cpp b/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/icmpv6_prefixtest.cpp
index ab726dfcda4..21d03fffd61 100644
--- a/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/icmpv6_prefixtest.cpp
+++ b/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/icmpv6_prefixtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/main.cpp b/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/main.cpp
index 64d2187c6f9..c096febefe7 100644
--- a/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/main.cpp
+++ b/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/test_icmpv6_prefix.c b/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/test_icmpv6_prefix.c
index 8f46e6642bd..b27e9562a86 100644
--- a/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/test_icmpv6_prefix.c
+++ b/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/test_icmpv6_prefix.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/test_icmpv6_prefix.h b/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/test_icmpv6_prefix.h
index 982e74639e2..696392673a7 100644
--- a/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/test_icmpv6_prefix.h
+++ b/test/nanostack/unittest/Common_Protocols/icmpv6_prefix/test_icmpv6_prefix.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/icmpv6_radv/icmpv6_radvtest.cpp b/test/nanostack/unittest/Common_Protocols/icmpv6_radv/icmpv6_radvtest.cpp
index e50f3292f4d..5de264a930f 100644
--- a/test/nanostack/unittest/Common_Protocols/icmpv6_radv/icmpv6_radvtest.cpp
+++ b/test/nanostack/unittest/Common_Protocols/icmpv6_radv/icmpv6_radvtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/icmpv6_radv/main.cpp b/test/nanostack/unittest/Common_Protocols/icmpv6_radv/main.cpp
index 7d6f2e07039..9ff1bc78a64 100644
--- a/test/nanostack/unittest/Common_Protocols/icmpv6_radv/main.cpp
+++ b/test/nanostack/unittest/Common_Protocols/icmpv6_radv/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/icmpv6_radv/test_icmpv6_radv.c b/test/nanostack/unittest/Common_Protocols/icmpv6_radv/test_icmpv6_radv.c
index feef424e1ca..6c87208cee4 100644
--- a/test/nanostack/unittest/Common_Protocols/icmpv6_radv/test_icmpv6_radv.c
+++ b/test/nanostack/unittest/Common_Protocols/icmpv6_radv/test_icmpv6_radv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/icmpv6_radv/test_icmpv6_radv.h b/test/nanostack/unittest/Common_Protocols/icmpv6_radv/test_icmpv6_radv.h
index 243e41f7545..9e80b68d58e 100644
--- a/test/nanostack/unittest/Common_Protocols/icmpv6_radv/test_icmpv6_radv.h
+++ b/test/nanostack/unittest/Common_Protocols/icmpv6_radv/test_icmpv6_radv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6/ipv6test.cpp b/test/nanostack/unittest/Common_Protocols/ipv6/ipv6test.cpp
index bc053b9d5ed..649c4b4c57f 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6/ipv6test.cpp
+++ b/test/nanostack/unittest/Common_Protocols/ipv6/ipv6test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6/main.cpp b/test/nanostack/unittest/Common_Protocols/ipv6/main.cpp
index 05bde0af19c..6b5ce9a5ea3 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6/main.cpp
+++ b/test/nanostack/unittest/Common_Protocols/ipv6/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6/test_ipv6.c b/test/nanostack/unittest/Common_Protocols/ipv6/test_ipv6.c
index 023523087e9..f469b78af5d 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6/test_ipv6.c
+++ b/test/nanostack/unittest/Common_Protocols/ipv6/test_ipv6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6/test_ipv6.h b/test/nanostack/unittest/Common_Protocols/ipv6/test_ipv6.h
index 7c636cb4c55..765c529b96c 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6/test_ipv6.h
+++ b/test/nanostack/unittest/Common_Protocols/ipv6/test_ipv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6_flow/ipv6_flowtest.cpp b/test/nanostack/unittest/Common_Protocols/ipv6_flow/ipv6_flowtest.cpp
index 800038ed5e6..7def7c4c35e 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6_flow/ipv6_flowtest.cpp
+++ b/test/nanostack/unittest/Common_Protocols/ipv6_flow/ipv6_flowtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6_flow/main.cpp b/test/nanostack/unittest/Common_Protocols/ipv6_flow/main.cpp
index e01edb2395a..1f2e055c967 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6_flow/main.cpp
+++ b/test/nanostack/unittest/Common_Protocols/ipv6_flow/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6_flow/test_ipv6_flow.c b/test/nanostack/unittest/Common_Protocols/ipv6_flow/test_ipv6_flow.c
index 956b641d408..0ecd2b588bb 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6_flow/test_ipv6_flow.c
+++ b/test/nanostack/unittest/Common_Protocols/ipv6_flow/test_ipv6_flow.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6_flow/test_ipv6_flow.h b/test/nanostack/unittest/Common_Protocols/ipv6_flow/test_ipv6_flow.h
index be7b2f9ff4e..3ce00ff1264 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6_flow/test_ipv6_flow.h
+++ b/test/nanostack/unittest/Common_Protocols/ipv6_flow/test_ipv6_flow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/ipv6_fragmentationtest.cpp b/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/ipv6_fragmentationtest.cpp
index 82a53b13392..58fa8522960 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/ipv6_fragmentationtest.cpp
+++ b/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/ipv6_fragmentationtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/main.cpp b/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/main.cpp
index 41f65dcab42..c542fef9661 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/main.cpp
+++ b/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/test_ipv6_fragmentation.c b/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/test_ipv6_fragmentation.c
index 508c100d542..ca781534abc 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/test_ipv6_fragmentation.c
+++ b/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/test_ipv6_fragmentation.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/test_ipv6_fragmentation.h b/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/test_ipv6_fragmentation.h
index 6da2556a3d6..544d52f5e2a 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/test_ipv6_fragmentation.h
+++ b/test/nanostack/unittest/Common_Protocols/ipv6_fragmentation/test_ipv6_fragmentation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6_resolution/ipv6_resolutiontest.cpp b/test/nanostack/unittest/Common_Protocols/ipv6_resolution/ipv6_resolutiontest.cpp
index 058ad175a7e..2e51c139671 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6_resolution/ipv6_resolutiontest.cpp
+++ b/test/nanostack/unittest/Common_Protocols/ipv6_resolution/ipv6_resolutiontest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6_resolution/main.cpp b/test/nanostack/unittest/Common_Protocols/ipv6_resolution/main.cpp
index 6fa3a2003ca..c0e5f8f4dc1 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6_resolution/main.cpp
+++ b/test/nanostack/unittest/Common_Protocols/ipv6_resolution/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6_resolution/test_ipv6_resolution.c b/test/nanostack/unittest/Common_Protocols/ipv6_resolution/test_ipv6_resolution.c
index ae25fe9745d..fc553d279aa 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6_resolution/test_ipv6_resolution.c
+++ b/test/nanostack/unittest/Common_Protocols/ipv6_resolution/test_ipv6_resolution.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/ipv6_resolution/test_ipv6_resolution.h b/test/nanostack/unittest/Common_Protocols/ipv6_resolution/test_ipv6_resolution.h
index 904f1515941..dd546d3771d 100644
--- a/test/nanostack/unittest/Common_Protocols/ipv6_resolution/test_ipv6_resolution.h
+++ b/test/nanostack/unittest/Common_Protocols/ipv6_resolution/test_ipv6_resolution.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/tcp/main.cpp b/test/nanostack/unittest/Common_Protocols/tcp/main.cpp
index d64843b05c3..c31dbb9426f 100644
--- a/test/nanostack/unittest/Common_Protocols/tcp/main.cpp
+++ b/test/nanostack/unittest/Common_Protocols/tcp/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/tcp/tcptest.cpp b/test/nanostack/unittest/Common_Protocols/tcp/tcptest.cpp
index 7b94f807d48..f770c435071 100644
--- a/test/nanostack/unittest/Common_Protocols/tcp/tcptest.cpp
+++ b/test/nanostack/unittest/Common_Protocols/tcp/tcptest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/tcp/test_tcp.c b/test/nanostack/unittest/Common_Protocols/tcp/test_tcp.c
index 745daa6dbce..0886e2f77a7 100644
--- a/test/nanostack/unittest/Common_Protocols/tcp/test_tcp.c
+++ b/test/nanostack/unittest/Common_Protocols/tcp/test_tcp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/tcp/test_tcp.h b/test/nanostack/unittest/Common_Protocols/tcp/test_tcp.h
index 38be97a7923..60a133980a9 100644
--- a/test/nanostack/unittest/Common_Protocols/tcp/test_tcp.h
+++ b/test/nanostack/unittest/Common_Protocols/tcp/test_tcp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/udp/main.cpp b/test/nanostack/unittest/Common_Protocols/udp/main.cpp
index dfd8563278a..3a8ac6c4b7f 100644
--- a/test/nanostack/unittest/Common_Protocols/udp/main.cpp
+++ b/test/nanostack/unittest/Common_Protocols/udp/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/udp/test_udp.c b/test/nanostack/unittest/Common_Protocols/udp/test_udp.c
index af8ca2c8099..7d6c064c831 100644
--- a/test/nanostack/unittest/Common_Protocols/udp/test_udp.c
+++ b/test/nanostack/unittest/Common_Protocols/udp/test_udp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/udp/test_udp.h b/test/nanostack/unittest/Common_Protocols/udp/test_udp.h
index 7e5f241f455..a0c035a99e4 100644
--- a/test/nanostack/unittest/Common_Protocols/udp/test_udp.h
+++ b/test/nanostack/unittest/Common_Protocols/udp/test_udp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Common_Protocols/udp/udptest.cpp b/test/nanostack/unittest/Common_Protocols/udp/udptest.cpp
index b4521276cc9..cadcca78691 100644
--- a/test/nanostack/unittest/Common_Protocols/udp/udptest.cpp
+++ b/test/nanostack/unittest/Common_Protocols/udp/udptest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/address/addresstest.cpp b/test/nanostack/unittest/Core/address/addresstest.cpp
index 06dbc4f8882..2c6140f8565 100644
--- a/test/nanostack/unittest/Core/address/addresstest.cpp
+++ b/test/nanostack/unittest/Core/address/addresstest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/address/main.cpp b/test/nanostack/unittest/Core/address/main.cpp
index 7b9a3408f04..e99580f3562 100644
--- a/test/nanostack/unittest/Core/address/main.cpp
+++ b/test/nanostack/unittest/Core/address/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/address/test_address.c b/test/nanostack/unittest/Core/address/test_address.c
index eb44ecee695..5d4773c2e71 100644
--- a/test/nanostack/unittest/Core/address/test_address.c
+++ b/test/nanostack/unittest/Core/address/test_address.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/address/test_address.h b/test/nanostack/unittest/Core/address/test_address.h
index 342d99c9855..0c4adf47d72 100644
--- a/test/nanostack/unittest/Core/address/test_address.h
+++ b/test/nanostack/unittest/Core/address/test_address.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/buffer_dyn/buffer_dyntest.cpp b/test/nanostack/unittest/Core/buffer_dyn/buffer_dyntest.cpp
index be6c0d2a358..fea79f3b001 100644
--- a/test/nanostack/unittest/Core/buffer_dyn/buffer_dyntest.cpp
+++ b/test/nanostack/unittest/Core/buffer_dyn/buffer_dyntest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/buffer_dyn/main.cpp b/test/nanostack/unittest/Core/buffer_dyn/main.cpp
index 86a69c28a5d..5bb1db50f24 100644
--- a/test/nanostack/unittest/Core/buffer_dyn/main.cpp
+++ b/test/nanostack/unittest/Core/buffer_dyn/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/buffer_dyn/test_buffer_dyn.c b/test/nanostack/unittest/Core/buffer_dyn/test_buffer_dyn.c
index c6e1ea98771..cea667254fe 100644
--- a/test/nanostack/unittest/Core/buffer_dyn/test_buffer_dyn.c
+++ b/test/nanostack/unittest/Core/buffer_dyn/test_buffer_dyn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/buffer_dyn/test_buffer_dyn.h b/test/nanostack/unittest/Core/buffer_dyn/test_buffer_dyn.h
index b21cc1914c5..b937803664a 100644
--- a/test/nanostack/unittest/Core/buffer_dyn/test_buffer_dyn.h
+++ b/test/nanostack/unittest/Core/buffer_dyn/test_buffer_dyn.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/monitor/main.cpp b/test/nanostack/unittest/Core/monitor/main.cpp
index 8d0becb9a01..390bfddb302 100644
--- a/test/nanostack/unittest/Core/monitor/main.cpp
+++ b/test/nanostack/unittest/Core/monitor/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/monitor/monitortest.cpp b/test/nanostack/unittest/Core/monitor/monitortest.cpp
index 137044a1d14..2164d0941e7 100644
--- a/test/nanostack/unittest/Core/monitor/monitortest.cpp
+++ b/test/nanostack/unittest/Core/monitor/monitortest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/monitor/test_monitor.c b/test/nanostack/unittest/Core/monitor/test_monitor.c
index 5f196a7a8f0..ef520b17169 100644
--- a/test/nanostack/unittest/Core/monitor/test_monitor.c
+++ b/test/nanostack/unittest/Core/monitor/test_monitor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/monitor/test_monitor.h b/test/nanostack/unittest/Core/monitor/test_monitor.h
index 0dde0bd6dd9..eab56403603 100644
--- a/test/nanostack/unittest/Core/monitor/test_monitor.h
+++ b/test/nanostack/unittest/Core/monitor/test_monitor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/socket/main.cpp b/test/nanostack/unittest/Core/socket/main.cpp
index 715e829c503..9b97cd73282 100644
--- a/test/nanostack/unittest/Core/socket/main.cpp
+++ b/test/nanostack/unittest/Core/socket/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/socket/sockettest.cpp b/test/nanostack/unittest/Core/socket/sockettest.cpp
index 0bf305d414f..b89f12f6a46 100644
--- a/test/nanostack/unittest/Core/socket/sockettest.cpp
+++ b/test/nanostack/unittest/Core/socket/sockettest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/socket/test_socket.c b/test/nanostack/unittest/Core/socket/test_socket.c
index 20eb946edf3..f1f4f2de612 100644
--- a/test/nanostack/unittest/Core/socket/test_socket.c
+++ b/test/nanostack/unittest/Core/socket/test_socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/Core/socket/test_socket.h b/test/nanostack/unittest/Core/socket/test_socket.h
index 0ba499dd6b4..3cd5ae64793 100644
--- a/test/nanostack/unittest/Core/socket/test_socket.h
+++ b/test/nanostack/unittest/Core/socket/test_socket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/dhcpv6_server_servicetest.cpp b/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/dhcpv6_server_servicetest.cpp
index 3090fa945f1..605a36ee2d2 100644
--- a/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/dhcpv6_server_servicetest.cpp
+++ b/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/dhcpv6_server_servicetest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/main.cpp b/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/main.cpp
index 4fd7abc3dc4..8554797cda9 100644
--- a/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/main.cpp
+++ b/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/test_dhcpv6_server_service.c b/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/test_dhcpv6_server_service.c
index 6bc6e596acd..20ee7228572 100644
--- a/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/test_dhcpv6_server_service.c
+++ b/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/test_dhcpv6_server_service.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/test_dhcpv6_server_service.h b/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/test_dhcpv6_server_service.h
index 57cb83a0452..a0254c9f1f2 100644
--- a/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/test_dhcpv6_server_service.h
+++ b/test/nanostack/unittest/DHCPv6_Server/dhcpv6_server_service/test_dhcpv6_server_service.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/6lowpan_iphc/6lowpan_iphctest.cpp b/test/nanostack/unittest/IPHC/6lowpan_iphc/6lowpan_iphctest.cpp
index 33cea7385a6..405193adf2d 100644
--- a/test/nanostack/unittest/IPHC/6lowpan_iphc/6lowpan_iphctest.cpp
+++ b/test/nanostack/unittest/IPHC/6lowpan_iphc/6lowpan_iphctest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/6lowpan_iphc/main.cpp b/test/nanostack/unittest/IPHC/6lowpan_iphc/main.cpp
index b1714905541..1ae890d2018 100644
--- a/test/nanostack/unittest/IPHC/6lowpan_iphc/main.cpp
+++ b/test/nanostack/unittest/IPHC/6lowpan_iphc/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/6lowpan_iphc/test_6lowpan_iphc.c b/test/nanostack/unittest/IPHC/6lowpan_iphc/test_6lowpan_iphc.c
index 459351effe6..2cfbce4f1b0 100644
--- a/test/nanostack/unittest/IPHC/6lowpan_iphc/test_6lowpan_iphc.c
+++ b/test/nanostack/unittest/IPHC/6lowpan_iphc/test_6lowpan_iphc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/6lowpan_iphc/test_6lowpan_iphc.h b/test/nanostack/unittest/IPHC/6lowpan_iphc/test_6lowpan_iphc.h
index f4bf15cd9ac..f9b9c61ac53 100644
--- a/test/nanostack/unittest/IPHC/6lowpan_iphc/test_6lowpan_iphc.h
+++ b/test/nanostack/unittest/IPHC/6lowpan_iphc/test_6lowpan_iphc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/iphc_compress/iphc_compresstest.cpp b/test/nanostack/unittest/IPHC/iphc_compress/iphc_compresstest.cpp
index 83b1f7f60a5..9d21b11bf62 100644
--- a/test/nanostack/unittest/IPHC/iphc_compress/iphc_compresstest.cpp
+++ b/test/nanostack/unittest/IPHC/iphc_compress/iphc_compresstest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/iphc_compress/main.cpp b/test/nanostack/unittest/IPHC/iphc_compress/main.cpp
index 71a5fc05938..752b6020206 100644
--- a/test/nanostack/unittest/IPHC/iphc_compress/main.cpp
+++ b/test/nanostack/unittest/IPHC/iphc_compress/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/iphc_compress/test_iphc_compress.c b/test/nanostack/unittest/IPHC/iphc_compress/test_iphc_compress.c
index d2a8f76df17..ca90b74b792 100644
--- a/test/nanostack/unittest/IPHC/iphc_compress/test_iphc_compress.c
+++ b/test/nanostack/unittest/IPHC/iphc_compress/test_iphc_compress.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/iphc_compress/test_iphc_compress.h b/test/nanostack/unittest/IPHC/iphc_compress/test_iphc_compress.h
index 208da7fbcc0..66efa3fa667 100644
--- a/test/nanostack/unittest/IPHC/iphc_compress/test_iphc_compress.h
+++ b/test/nanostack/unittest/IPHC/iphc_compress/test_iphc_compress.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/iphc_decompress/iphc_decompresstest.cpp b/test/nanostack/unittest/IPHC/iphc_decompress/iphc_decompresstest.cpp
index c77b967ef74..ed647cd786a 100644
--- a/test/nanostack/unittest/IPHC/iphc_decompress/iphc_decompresstest.cpp
+++ b/test/nanostack/unittest/IPHC/iphc_decompress/iphc_decompresstest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/iphc_decompress/main.cpp b/test/nanostack/unittest/IPHC/iphc_decompress/main.cpp
index 1b1c5cfb8a6..524116febd5 100644
--- a/test/nanostack/unittest/IPHC/iphc_decompress/main.cpp
+++ b/test/nanostack/unittest/IPHC/iphc_decompress/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/iphc_decompress/test_iphc_decompress.c b/test/nanostack/unittest/IPHC/iphc_decompress/test_iphc_decompress.c
index e6c635a77fe..e06e922da53 100644
--- a/test/nanostack/unittest/IPHC/iphc_decompress/test_iphc_decompress.c
+++ b/test/nanostack/unittest/IPHC/iphc_decompress/test_iphc_decompress.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/iphc_decompress/test_iphc_decompress.h b/test/nanostack/unittest/IPHC/iphc_decompress/test_iphc_decompress.h
index 03ce4142b6d..93cc17ee942 100644
--- a/test/nanostack/unittest/IPHC/iphc_decompress/test_iphc_decompress.h
+++ b/test/nanostack/unittest/IPHC/iphc_decompress/test_iphc_decompress.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/lowpan_context/lowpan_contexttest.cpp b/test/nanostack/unittest/IPHC/lowpan_context/lowpan_contexttest.cpp
index a7c4dc3fc90..988b85d8393 100644
--- a/test/nanostack/unittest/IPHC/lowpan_context/lowpan_contexttest.cpp
+++ b/test/nanostack/unittest/IPHC/lowpan_context/lowpan_contexttest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/lowpan_context/main.cpp b/test/nanostack/unittest/IPHC/lowpan_context/main.cpp
index 98a14c7fa54..8d7a89e0c0f 100644
--- a/test/nanostack/unittest/IPHC/lowpan_context/main.cpp
+++ b/test/nanostack/unittest/IPHC/lowpan_context/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/lowpan_context/test_lowpan_context.c b/test/nanostack/unittest/IPHC/lowpan_context/test_lowpan_context.c
index 81b0efee677..e8b38a27340 100644
--- a/test/nanostack/unittest/IPHC/lowpan_context/test_lowpan_context.c
+++ b/test/nanostack/unittest/IPHC/lowpan_context/test_lowpan_context.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/IPHC/lowpan_context/test_lowpan_context.h b/test/nanostack/unittest/IPHC/lowpan_context/test_lowpan_context.h
index 465d201d731..c79749a33fa 100644
--- a/test/nanostack/unittest/IPHC/lowpan_context/test_lowpan_context.h
+++ b/test/nanostack/unittest/IPHC/lowpan_context/test_lowpan_context.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/ipv6_routing_tabletest.cpp b/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/ipv6_routing_tabletest.cpp
index 5336eabca80..ce83cc32d04 100644
--- a/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/ipv6_routing_tabletest.cpp
+++ b/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/ipv6_routing_tabletest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/main.cpp b/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/main.cpp
index db01d5aa759..834ec602906 100644
--- a/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/main.cpp
+++ b/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/test_ipv6_routing_table.c b/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/test_ipv6_routing_table.c
index 08789cfd27e..fac32b41e42 100644
--- a/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/test_ipv6_routing_table.c
+++ b/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/test_ipv6_routing_table.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/test_ipv6_routing_table.h b/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/test_ipv6_routing_table.h
index f3bef3600a2..60d776ce7be 100644
--- a/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/test_ipv6_routing_table.h
+++ b/test/nanostack/unittest/ipv6_stack/ipv6_routing_table/test_ipv6_routing_table.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/ipv6_stack/protocol_ipv6/main.cpp b/test/nanostack/unittest/ipv6_stack/protocol_ipv6/main.cpp
index f6133a82bb0..a144db7cc29 100644
--- a/test/nanostack/unittest/ipv6_stack/protocol_ipv6/main.cpp
+++ b/test/nanostack/unittest/ipv6_stack/protocol_ipv6/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/ipv6_stack/protocol_ipv6/protocol_ipv6test.cpp b/test/nanostack/unittest/ipv6_stack/protocol_ipv6/protocol_ipv6test.cpp
index 015654c7581..05ad551a7dc 100644
--- a/test/nanostack/unittest/ipv6_stack/protocol_ipv6/protocol_ipv6test.cpp
+++ b/test/nanostack/unittest/ipv6_stack/protocol_ipv6/protocol_ipv6test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/ipv6_stack/protocol_ipv6/test_protocol_ipv6.c b/test/nanostack/unittest/ipv6_stack/protocol_ipv6/test_protocol_ipv6.c
index ae0155ce848..28486a30208 100644
--- a/test/nanostack/unittest/ipv6_stack/protocol_ipv6/test_protocol_ipv6.c
+++ b/test/nanostack/unittest/ipv6_stack/protocol_ipv6/test_protocol_ipv6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/ipv6_stack/protocol_ipv6/test_protocol_ipv6.h b/test/nanostack/unittest/ipv6_stack/protocol_ipv6/test_protocol_ipv6.h
index b6830be7600..17231badc89 100644
--- a/test/nanostack/unittest/ipv6_stack/protocol_ipv6/test_protocol_ipv6.h
+++ b/test/nanostack/unittest/ipv6_stack/protocol_ipv6/test_protocol_ipv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libDHCPv6/dhcp_service_api/dhcp_service_apitest.cpp b/test/nanostack/unittest/libDHCPv6/dhcp_service_api/dhcp_service_apitest.cpp
index b434f6312b4..2a4dbc8aaa2 100644
--- a/test/nanostack/unittest/libDHCPv6/dhcp_service_api/dhcp_service_apitest.cpp
+++ b/test/nanostack/unittest/libDHCPv6/dhcp_service_api/dhcp_service_apitest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libDHCPv6/dhcp_service_api/main.cpp b/test/nanostack/unittest/libDHCPv6/dhcp_service_api/main.cpp
index f8f2dfc39bc..37a84b1cbcd 100644
--- a/test/nanostack/unittest/libDHCPv6/dhcp_service_api/main.cpp
+++ b/test/nanostack/unittest/libDHCPv6/dhcp_service_api/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libDHCPv6/dhcp_service_api/test_dhcp_service_api.c b/test/nanostack/unittest/libDHCPv6/dhcp_service_api/test_dhcp_service_api.c
index 610e88fdba3..a037c957015 100644
--- a/test/nanostack/unittest/libDHCPv6/dhcp_service_api/test_dhcp_service_api.c
+++ b/test/nanostack/unittest/libDHCPv6/dhcp_service_api/test_dhcp_service_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libDHCPv6/dhcp_service_api/test_dhcp_service_api.h b/test/nanostack/unittest/libDHCPv6/dhcp_service_api/test_dhcp_service_api.h
index 58a4ed8f646..347942be7dd 100644
--- a/test/nanostack/unittest/libDHCPv6/dhcp_service_api/test_dhcp_service_api.h
+++ b/test/nanostack/unittest/libDHCPv6/dhcp_service_api/test_dhcp_service_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libDHCPv6/libdhcpv6/libdhcpv6test.cpp b/test/nanostack/unittest/libDHCPv6/libdhcpv6/libdhcpv6test.cpp
index 3fbee2c44be..28492a2d1c2 100644
--- a/test/nanostack/unittest/libDHCPv6/libdhcpv6/libdhcpv6test.cpp
+++ b/test/nanostack/unittest/libDHCPv6/libdhcpv6/libdhcpv6test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libDHCPv6/libdhcpv6/main.cpp b/test/nanostack/unittest/libDHCPv6/libdhcpv6/main.cpp
index bae7f537684..f7502fc6c5a 100644
--- a/test/nanostack/unittest/libDHCPv6/libdhcpv6/main.cpp
+++ b/test/nanostack/unittest/libDHCPv6/libdhcpv6/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libDHCPv6/libdhcpv6/test_libdhcpv6.c b/test/nanostack/unittest/libDHCPv6/libdhcpv6/test_libdhcpv6.c
index 522883a745a..d8e1e5523be 100644
--- a/test/nanostack/unittest/libDHCPv6/libdhcpv6/test_libdhcpv6.c
+++ b/test/nanostack/unittest/libDHCPv6/libdhcpv6/test_libdhcpv6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libDHCPv6/libdhcpv6/test_libdhcpv6.h b/test/nanostack/unittest/libDHCPv6/libdhcpv6/test_libdhcpv6.h
index 87d26840f76..02c941743ed 100644
--- a/test/nanostack/unittest/libDHCPv6/libdhcpv6/test_libdhcpv6.h
+++ b/test/nanostack/unittest/libDHCPv6/libdhcpv6/test_libdhcpv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/libdhcpv6_servertest.cpp b/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/libdhcpv6_servertest.cpp
index 120474c159a..65037c1118f 100644
--- a/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/libdhcpv6_servertest.cpp
+++ b/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/libdhcpv6_servertest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/main.cpp b/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/main.cpp
index 11b1e5fa9c8..6dc60adef78 100644
--- a/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/main.cpp
+++ b/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/test_libdhcpv6_server.c b/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/test_libdhcpv6_server.c
index ffb7ac2d76e..a5e2e03ccb6 100644
--- a/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/test_libdhcpv6_server.c
+++ b/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/test_libdhcpv6_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/test_libdhcpv6_server.h b/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/test_libdhcpv6_server.h
index 623ec0ba272..90e83a3443c 100644
--- a/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/test_libdhcpv6_server.h
+++ b/test/nanostack/unittest/libDHCPv6/libdhcpv6_server/test_libdhcpv6_server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net/main.cpp b/test/nanostack/unittest/libNET/net/main.cpp
index 336d8584228..cb461a560ab 100644
--- a/test/nanostack/unittest/libNET/net/main.cpp
+++ b/test/nanostack/unittest/libNET/net/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net/nettest.cpp b/test/nanostack/unittest/libNET/net/nettest.cpp
index 76387603dca..7b18a1475a6 100644
--- a/test/nanostack/unittest/libNET/net/nettest.cpp
+++ b/test/nanostack/unittest/libNET/net/nettest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net/test_net.c b/test/nanostack/unittest/libNET/net/test_net.c
index ed24741f0ad..52cb4c7f02c 100644
--- a/test/nanostack/unittest/libNET/net/test_net.c
+++ b/test/nanostack/unittest/libNET/net/test_net.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net/test_net.h b/test/nanostack/unittest/libNET/net/test_net.h
index ac9e98443f4..2a5a98fb0d7 100644
--- a/test/nanostack/unittest/libNET/net/test_net.h
+++ b/test/nanostack/unittest/libNET/net/test_net.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/main.cpp b/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/main.cpp
index 28f1a9a79ff..a655ea9ef8b 100644
--- a/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/main.cpp
+++ b/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/net_6lowpan_parameter_apitest.cpp b/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/net_6lowpan_parameter_apitest.cpp
index 899c077fdf6..3ec863343d7 100644
--- a/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/net_6lowpan_parameter_apitest.cpp
+++ b/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/net_6lowpan_parameter_apitest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/test_net_6lowpan_parameter_api.c b/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/test_net_6lowpan_parameter_api.c
index d14882bf808..cd31394839e 100644
--- a/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/test_net_6lowpan_parameter_api.c
+++ b/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/test_net_6lowpan_parameter_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/test_net_6lowpan_parameter_api.h b/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/test_net_6lowpan_parameter_api.h
index 5cf2ffee638..cf297e0483a 100644
--- a/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/test_net_6lowpan_parameter_api.h
+++ b/test/nanostack/unittest/libNET/net_6lowpan_parameter_api/test_net_6lowpan_parameter_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_ipv6/main.cpp b/test/nanostack/unittest/libNET/net_ipv6/main.cpp
index 49ddd4c579e..21231a28057 100644
--- a/test/nanostack/unittest/libNET/net_ipv6/main.cpp
+++ b/test/nanostack/unittest/libNET/net_ipv6/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_ipv6/net_ipv6test.cpp b/test/nanostack/unittest/libNET/net_ipv6/net_ipv6test.cpp
index 128c68b2fd1..ccca943e4f4 100644
--- a/test/nanostack/unittest/libNET/net_ipv6/net_ipv6test.cpp
+++ b/test/nanostack/unittest/libNET/net_ipv6/net_ipv6test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_ipv6/test_net_ipv6.c b/test/nanostack/unittest/libNET/net_ipv6/test_net_ipv6.c
index 448efaf4168..7973ffede56 100644
--- a/test/nanostack/unittest/libNET/net_ipv6/test_net_ipv6.c
+++ b/test/nanostack/unittest/libNET/net_ipv6/test_net_ipv6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_ipv6/test_net_ipv6.h b/test/nanostack/unittest/libNET/net_ipv6/test_net_ipv6.h
index 4d64d7256c3..819db63243b 100644
--- a/test/nanostack/unittest/libNET/net_ipv6/test_net_ipv6.h
+++ b/test/nanostack/unittest/libNET/net_ipv6/test_net_ipv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_mle/main.cpp b/test/nanostack/unittest/libNET/net_mle/main.cpp
index 2692423638d..6bcfd337edc 100644
--- a/test/nanostack/unittest/libNET/net_mle/main.cpp
+++ b/test/nanostack/unittest/libNET/net_mle/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_mle/net_mletest.cpp b/test/nanostack/unittest/libNET/net_mle/net_mletest.cpp
index f90310c6f63..7f5108fd134 100644
--- a/test/nanostack/unittest/libNET/net_mle/net_mletest.cpp
+++ b/test/nanostack/unittest/libNET/net_mle/net_mletest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_mle/test_net_mle.c b/test/nanostack/unittest/libNET/net_mle/test_net_mle.c
index 0583da8eeb1..918941f0840 100644
--- a/test/nanostack/unittest/libNET/net_mle/test_net_mle.c
+++ b/test/nanostack/unittest/libNET/net_mle/test_net_mle.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_mle/test_net_mle.h b/test/nanostack/unittest/libNET/net_mle/test_net_mle.h
index 03512d2d1e7..6ebd6171a6b 100644
--- a/test/nanostack/unittest/libNET/net_mle/test_net_mle.h
+++ b/test/nanostack/unittest/libNET/net_mle/test_net_mle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_rpl/main.cpp b/test/nanostack/unittest/libNET/net_rpl/main.cpp
index c16783bdf36..b8c238e03e0 100644
--- a/test/nanostack/unittest/libNET/net_rpl/main.cpp
+++ b/test/nanostack/unittest/libNET/net_rpl/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_rpl/net_rpltest.cpp b/test/nanostack/unittest/libNET/net_rpl/net_rpltest.cpp
index 086840ff7fe..96f5271c37f 100644
--- a/test/nanostack/unittest/libNET/net_rpl/net_rpltest.cpp
+++ b/test/nanostack/unittest/libNET/net_rpl/net_rpltest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_rpl/test_net_rpl.c b/test/nanostack/unittest/libNET/net_rpl/test_net_rpl.c
index 95b40d4df9f..dfc5915f0de 100644
--- a/test/nanostack/unittest/libNET/net_rpl/test_net_rpl.c
+++ b/test/nanostack/unittest/libNET/net_rpl/test_net_rpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_rpl/test_net_rpl.h b/test/nanostack/unittest/libNET/net_rpl/test_net_rpl.h
index e96facb8a22..1ad7af2f908 100644
--- a/test/nanostack/unittest/libNET/net_rpl/test_net_rpl.h
+++ b/test/nanostack/unittest/libNET/net_rpl/test_net_rpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_short_address_extension/main.cpp b/test/nanostack/unittest/libNET/net_short_address_extension/main.cpp
index cefcb67b73b..af3ef35b9d0 100644
--- a/test/nanostack/unittest/libNET/net_short_address_extension/main.cpp
+++ b/test/nanostack/unittest/libNET/net_short_address_extension/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_short_address_extension/net_short_address_extensiontest.cpp b/test/nanostack/unittest/libNET/net_short_address_extension/net_short_address_extensiontest.cpp
index ac96aab6221..b82d2e8560c 100644
--- a/test/nanostack/unittest/libNET/net_short_address_extension/net_short_address_extensiontest.cpp
+++ b/test/nanostack/unittest/libNET/net_short_address_extension/net_short_address_extensiontest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_short_address_extension/test_net_short_address_extension.c b/test/nanostack/unittest/libNET/net_short_address_extension/test_net_short_address_extension.c
index df8a0cf5f4e..0bbf0e206ec 100644
--- a/test/nanostack/unittest/libNET/net_short_address_extension/test_net_short_address_extension.c
+++ b/test/nanostack/unittest/libNET/net_short_address_extension/test_net_short_address_extension.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/net_short_address_extension/test_net_short_address_extension.h b/test/nanostack/unittest/libNET/net_short_address_extension/test_net_short_address_extension.h
index 12d4297033e..d976ce3be45 100644
--- a/test/nanostack/unittest/libNET/net_short_address_extension/test_net_short_address_extension.h
+++ b/test/nanostack/unittest/libNET/net_short_address_extension/test_net_short_address_extension.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/socket_api/main.cpp b/test/nanostack/unittest/libNET/socket_api/main.cpp
index 2795ea11516..6c2f18e27f8 100644
--- a/test/nanostack/unittest/libNET/socket_api/main.cpp
+++ b/test/nanostack/unittest/libNET/socket_api/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/libNET/socket_api/socket_api_test.cpp b/test/nanostack/unittest/libNET/socket_api/socket_api_test.cpp
index 58f9126e760..634080ff7c6 100644
--- a/test/nanostack/unittest/libNET/socket_api/socket_api_test.cpp
+++ b/test/nanostack/unittest/libNET/socket_api/socket_api_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/ethernet_mac_api/ethernet_mac_apitest.cpp b/test/nanostack/unittest/mac/ethernet_mac_api/ethernet_mac_apitest.cpp
index b55fa99960a..eb4c458b707 100644
--- a/test/nanostack/unittest/mac/ethernet_mac_api/ethernet_mac_apitest.cpp
+++ b/test/nanostack/unittest/mac/ethernet_mac_api/ethernet_mac_apitest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/ethernet_mac_api/main.cpp b/test/nanostack/unittest/mac/ethernet_mac_api/main.cpp
index b0d032494ec..7d8677ab3e8 100644
--- a/test/nanostack/unittest/mac/ethernet_mac_api/main.cpp
+++ b/test/nanostack/unittest/mac/ethernet_mac_api/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/ethernet_mac_api/test_ethernet_mac_api.c b/test/nanostack/unittest/mac/ethernet_mac_api/test_ethernet_mac_api.c
index 8ea2fc712c2..8fdb0b07715 100644
--- a/test/nanostack/unittest/mac/ethernet_mac_api/test_ethernet_mac_api.c
+++ b/test/nanostack/unittest/mac/ethernet_mac_api/test_ethernet_mac_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/ethernet_mac_api/test_ethernet_mac_api.h b/test/nanostack/unittest/mac/ethernet_mac_api/test_ethernet_mac_api.h
index 111bdfa7bb9..3a79f5f082a 100644
--- a/test/nanostack/unittest/mac/ethernet_mac_api/test_ethernet_mac_api.h
+++ b/test/nanostack/unittest/mac/ethernet_mac_api/test_ethernet_mac_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/fhss_callbacks/fhss_callbackstest.cpp b/test/nanostack/unittest/mac/fhss_callbacks/fhss_callbackstest.cpp
index 2106ac91a84..2de4f0417cd 100644
--- a/test/nanostack/unittest/mac/fhss_callbacks/fhss_callbackstest.cpp
+++ b/test/nanostack/unittest/mac/fhss_callbacks/fhss_callbackstest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/fhss_callbacks/main.cpp b/test/nanostack/unittest/mac/fhss_callbacks/main.cpp
index 7dc4c832f83..b306aeb55fb 100644
--- a/test/nanostack/unittest/mac/fhss_callbacks/main.cpp
+++ b/test/nanostack/unittest/mac/fhss_callbacks/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/fhss_callbacks/test_fhss_callbacks.c b/test/nanostack/unittest/mac/fhss_callbacks/test_fhss_callbacks.c
index e0322040f51..f1666bb5113 100644
--- a/test/nanostack/unittest/mac/fhss_callbacks/test_fhss_callbacks.c
+++ b/test/nanostack/unittest/mac/fhss_callbacks/test_fhss_callbacks.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/fhss_callbacks/test_fhss_callbacks.h b/test/nanostack/unittest/mac/fhss_callbacks/test_fhss_callbacks.h
index bf4732aba90..827cc8a226f 100644
--- a/test/nanostack/unittest/mac/fhss_callbacks/test_fhss_callbacks.h
+++ b/test/nanostack/unittest/mac/fhss_callbacks/test_fhss_callbacks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_cca_threshold/mac_cca_threshold_test.cpp b/test/nanostack/unittest/mac/mac_cca_threshold/mac_cca_threshold_test.cpp
index 62a4ea4ff49..d5111a7b31c 100644
--- a/test/nanostack/unittest/mac/mac_cca_threshold/mac_cca_threshold_test.cpp
+++ b/test/nanostack/unittest/mac/mac_cca_threshold/mac_cca_threshold_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_cca_threshold/main.cpp b/test/nanostack/unittest/mac/mac_cca_threshold/main.cpp
index e362bd70095..6271750ecd1 100644
--- a/test/nanostack/unittest/mac/mac_cca_threshold/main.cpp
+++ b/test/nanostack/unittest/mac/mac_cca_threshold/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_cca_threshold/test_mac_cca_threshold.c b/test/nanostack/unittest/mac/mac_cca_threshold/test_mac_cca_threshold.c
index 5d7f9bffb14..0c296f8b42b 100644
--- a/test/nanostack/unittest/mac/mac_cca_threshold/test_mac_cca_threshold.c
+++ b/test/nanostack/unittest/mac/mac_cca_threshold/test_mac_cca_threshold.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_cca_threshold/test_mac_cca_threshold.h b/test/nanostack/unittest/mac/mac_cca_threshold/test_mac_cca_threshold.h
index 85ca78c5563..e6947783911 100644
--- a/test/nanostack/unittest/mac/mac_cca_threshold/test_mac_cca_threshold.h
+++ b/test/nanostack/unittest/mac/mac_cca_threshold/test_mac_cca_threshold.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_filter/mac_filtertest.cpp b/test/nanostack/unittest/mac/mac_filter/mac_filtertest.cpp
index 1638ab5e59c..41aea32064b 100644
--- a/test/nanostack/unittest/mac/mac_filter/mac_filtertest.cpp
+++ b/test/nanostack/unittest/mac/mac_filter/mac_filtertest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_filter/main.cpp b/test/nanostack/unittest/mac/mac_filter/main.cpp
index b32d62a1d02..6ba24cfdf7e 100644
--- a/test/nanostack/unittest/mac/mac_filter/main.cpp
+++ b/test/nanostack/unittest/mac/mac_filter/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_filter/test_mac_filter.c b/test/nanostack/unittest/mac/mac_filter/test_mac_filter.c
index 05538e45f92..28df9957afd 100644
--- a/test/nanostack/unittest/mac/mac_filter/test_mac_filter.c
+++ b/test/nanostack/unittest/mac/mac_filter/test_mac_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_filter/test_mac_filter.h b/test/nanostack/unittest/mac/mac_filter/test_mac_filter.h
index 209385c916e..95834d29658 100644
--- a/test/nanostack/unittest/mac/mac_filter/test_mac_filter.h
+++ b/test/nanostack/unittest/mac/mac_filter/test_mac_filter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_header_helper_functions/mac_header_helper_functionstest.cpp b/test/nanostack/unittest/mac/mac_header_helper_functions/mac_header_helper_functionstest.cpp
index 0cb15c6a84d..dc9cf589524 100644
--- a/test/nanostack/unittest/mac/mac_header_helper_functions/mac_header_helper_functionstest.cpp
+++ b/test/nanostack/unittest/mac/mac_header_helper_functions/mac_header_helper_functionstest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_header_helper_functions/main.cpp b/test/nanostack/unittest/mac/mac_header_helper_functions/main.cpp
index 283e308116f..8e4b1483798 100644
--- a/test/nanostack/unittest/mac/mac_header_helper_functions/main.cpp
+++ b/test/nanostack/unittest/mac/mac_header_helper_functions/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_header_helper_functions/test_mac_header_helper_functions.c b/test/nanostack/unittest/mac/mac_header_helper_functions/test_mac_header_helper_functions.c
index e7c141c87f8..76b6338e9ec 100644
--- a/test/nanostack/unittest/mac/mac_header_helper_functions/test_mac_header_helper_functions.c
+++ b/test/nanostack/unittest/mac/mac_header_helper_functions/test_mac_header_helper_functions.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_header_helper_functions/test_mac_header_helper_functions.h b/test/nanostack/unittest/mac/mac_header_helper_functions/test_mac_header_helper_functions.h
index 1fbfa59d301..abf555c7221 100644
--- a/test/nanostack/unittest/mac/mac_header_helper_functions/test_mac_header_helper_functions.h
+++ b/test/nanostack/unittest/mac/mac_header_helper_functions/test_mac_header_helper_functions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_indirect_data/mac_indirect_datatest.cpp b/test/nanostack/unittest/mac/mac_indirect_data/mac_indirect_datatest.cpp
index 8b743ddaffa..e1cd6190004 100644
--- a/test/nanostack/unittest/mac/mac_indirect_data/mac_indirect_datatest.cpp
+++ b/test/nanostack/unittest/mac/mac_indirect_data/mac_indirect_datatest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_indirect_data/main.cpp b/test/nanostack/unittest/mac/mac_indirect_data/main.cpp
index 62b2f5a1fce..f21046da7b3 100644
--- a/test/nanostack/unittest/mac/mac_indirect_data/main.cpp
+++ b/test/nanostack/unittest/mac/mac_indirect_data/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_indirect_data/test_mac_indirect_data.c b/test/nanostack/unittest/mac/mac_indirect_data/test_mac_indirect_data.c
index a3658bf443c..be5407c25a1 100644
--- a/test/nanostack/unittest/mac/mac_indirect_data/test_mac_indirect_data.c
+++ b/test/nanostack/unittest/mac/mac_indirect_data/test_mac_indirect_data.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_indirect_data/test_mac_indirect_data.h b/test/nanostack/unittest/mac/mac_indirect_data/test_mac_indirect_data.h
index 5fd5d33ca68..c2f091bd016 100644
--- a/test/nanostack/unittest/mac/mac_indirect_data/test_mac_indirect_data.h
+++ b/test/nanostack/unittest/mac/mac_indirect_data/test_mac_indirect_data.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_mcps_sap/mac_mcps_saptest.cpp b/test/nanostack/unittest/mac/mac_mcps_sap/mac_mcps_saptest.cpp
index 5fae8e03ffe..e6ac119c056 100644
--- a/test/nanostack/unittest/mac/mac_mcps_sap/mac_mcps_saptest.cpp
+++ b/test/nanostack/unittest/mac/mac_mcps_sap/mac_mcps_saptest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_mcps_sap/main.cpp b/test/nanostack/unittest/mac/mac_mcps_sap/main.cpp
index 401a0450a4d..654073449b0 100644
--- a/test/nanostack/unittest/mac/mac_mcps_sap/main.cpp
+++ b/test/nanostack/unittest/mac/mac_mcps_sap/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.c b/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.c
index d8a7a1324fa..8fb0d430d1f 100644
--- a/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.c
+++ b/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.h b/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.h
index 93f59c69af8..d5ef421648d 100644
--- a/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.h
+++ b/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_mlme/mac_mlmetest.cpp b/test/nanostack/unittest/mac/mac_mlme/mac_mlmetest.cpp
index fa445f511a7..9f1b553896c 100644
--- a/test/nanostack/unittest/mac/mac_mlme/mac_mlmetest.cpp
+++ b/test/nanostack/unittest/mac/mac_mlme/mac_mlmetest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_mlme/main.cpp b/test/nanostack/unittest/mac/mac_mlme/main.cpp
index f62114f7a0a..969cee1195d 100644
--- a/test/nanostack/unittest/mac/mac_mlme/main.cpp
+++ b/test/nanostack/unittest/mac/mac_mlme/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_mlme/test_mac_mlme.c b/test/nanostack/unittest/mac/mac_mlme/test_mac_mlme.c
index 857e449aba6..eb27622cf4f 100644
--- a/test/nanostack/unittest/mac/mac_mlme/test_mac_mlme.c
+++ b/test/nanostack/unittest/mac/mac_mlme/test_mac_mlme.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_mlme/test_mac_mlme.h b/test/nanostack/unittest/mac/mac_mlme/test_mac_mlme.h
index 093ec5eea4b..5e57a425720 100644
--- a/test/nanostack/unittest/mac/mac_mlme/test_mac_mlme.h
+++ b/test/nanostack/unittest/mac/mac_mlme/test_mac_mlme.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_pd_sap/mac_pd_saptest.cpp b/test/nanostack/unittest/mac/mac_pd_sap/mac_pd_saptest.cpp
index 426a3bce9a9..d964e7f636a 100644
--- a/test/nanostack/unittest/mac/mac_pd_sap/mac_pd_saptest.cpp
+++ b/test/nanostack/unittest/mac/mac_pd_sap/mac_pd_saptest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_pd_sap/main.cpp b/test/nanostack/unittest/mac/mac_pd_sap/main.cpp
index 136a9e7fb4d..317ce2be268 100644
--- a/test/nanostack/unittest/mac/mac_pd_sap/main.cpp
+++ b/test/nanostack/unittest/mac/mac_pd_sap/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_pd_sap/test_mac_pd_sap.c b/test/nanostack/unittest/mac/mac_pd_sap/test_mac_pd_sap.c
index da7a4024ce2..449d3d2b5db 100644
--- a/test/nanostack/unittest/mac/mac_pd_sap/test_mac_pd_sap.c
+++ b/test/nanostack/unittest/mac/mac_pd_sap/test_mac_pd_sap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_pd_sap/test_mac_pd_sap.h b/test/nanostack/unittest/mac/mac_pd_sap/test_mac_pd_sap.h
index a67d8e226ec..5f82a8aab29 100644
--- a/test/nanostack/unittest/mac/mac_pd_sap/test_mac_pd_sap.h
+++ b/test/nanostack/unittest/mac/mac_pd_sap/test_mac_pd_sap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_security_mib/mac_security_mibtest.cpp b/test/nanostack/unittest/mac/mac_security_mib/mac_security_mibtest.cpp
index f89f5b28540..0f7796f4423 100644
--- a/test/nanostack/unittest/mac/mac_security_mib/mac_security_mibtest.cpp
+++ b/test/nanostack/unittest/mac/mac_security_mib/mac_security_mibtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_security_mib/main.cpp b/test/nanostack/unittest/mac/mac_security_mib/main.cpp
index 40956582312..b95ce507b41 100644
--- a/test/nanostack/unittest/mac/mac_security_mib/main.cpp
+++ b/test/nanostack/unittest/mac/mac_security_mib/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_security_mib/test_mac_security_mib.c b/test/nanostack/unittest/mac/mac_security_mib/test_mac_security_mib.c
index ecfeeee5491..f4cc7b19cac 100644
--- a/test/nanostack/unittest/mac/mac_security_mib/test_mac_security_mib.c
+++ b/test/nanostack/unittest/mac/mac_security_mib/test_mac_security_mib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_security_mib/test_mac_security_mib.h b/test/nanostack/unittest/mac/mac_security_mib/test_mac_security_mib.h
index 3f80f66d8aa..5e0ae5dbb19 100644
--- a/test/nanostack/unittest/mac/mac_security_mib/test_mac_security_mib.h
+++ b/test/nanostack/unittest/mac/mac_security_mib/test_mac_security_mib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_timer/mac_timertest.cpp b/test/nanostack/unittest/mac/mac_timer/mac_timertest.cpp
index 0712dc4af00..bbcf77bc3c5 100644
--- a/test/nanostack/unittest/mac/mac_timer/mac_timertest.cpp
+++ b/test/nanostack/unittest/mac/mac_timer/mac_timertest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_timer/main.cpp b/test/nanostack/unittest/mac/mac_timer/main.cpp
index 7ce68d66f09..6e0b7df131f 100644
--- a/test/nanostack/unittest/mac/mac_timer/main.cpp
+++ b/test/nanostack/unittest/mac/mac_timer/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_timer/test_mac_timer.c b/test/nanostack/unittest/mac/mac_timer/test_mac_timer.c
index fb147b12b7e..08aef4e7f16 100644
--- a/test/nanostack/unittest/mac/mac_timer/test_mac_timer.c
+++ b/test/nanostack/unittest/mac/mac_timer/test_mac_timer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/mac_timer/test_mac_timer.h b/test/nanostack/unittest/mac/mac_timer/test_mac_timer.h
index b76ee7baef1..6a56ce9bf4a 100644
--- a/test/nanostack/unittest/mac/mac_timer/test_mac_timer.h
+++ b/test/nanostack/unittest/mac/mac_timer/test_mac_timer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/rf_driver_storage/main.cpp b/test/nanostack/unittest/mac/rf_driver_storage/main.cpp
index 3687d91f950..663d922a491 100644
--- a/test/nanostack/unittest/mac/rf_driver_storage/main.cpp
+++ b/test/nanostack/unittest/mac/rf_driver_storage/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/rf_driver_storage/rf_driver_storagetest.cpp b/test/nanostack/unittest/mac/rf_driver_storage/rf_driver_storagetest.cpp
index e6d76d8bc30..af8da9c530c 100644
--- a/test/nanostack/unittest/mac/rf_driver_storage/rf_driver_storagetest.cpp
+++ b/test/nanostack/unittest/mac/rf_driver_storage/rf_driver_storagetest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/rf_driver_storage/test_rf_driver_storage.c b/test/nanostack/unittest/mac/rf_driver_storage/test_rf_driver_storage.c
index a2c316ee1e4..b1fbf14fb8b 100644
--- a/test/nanostack/unittest/mac/rf_driver_storage/test_rf_driver_storage.c
+++ b/test/nanostack/unittest/mac/rf_driver_storage/test_rf_driver_storage.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/rf_driver_storage/test_rf_driver_storage.h b/test/nanostack/unittest/mac/rf_driver_storage/test_rf_driver_storage.h
index 4b990e7da52..d50bd2ab5b8 100644
--- a/test/nanostack/unittest/mac/rf_driver_storage/test_rf_driver_storage.h
+++ b/test/nanostack/unittest/mac/rf_driver_storage/test_rf_driver_storage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/serial_mac_api/main.cpp b/test/nanostack/unittest/mac/serial_mac_api/main.cpp
index 5423c745fe9..7b776c4ea84 100644
--- a/test/nanostack/unittest/mac/serial_mac_api/main.cpp
+++ b/test/nanostack/unittest/mac/serial_mac_api/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/serial_mac_api/serial_mac_apitest.cpp b/test/nanostack/unittest/mac/serial_mac_api/serial_mac_apitest.cpp
index 4907f85786d..31cb013aad2 100644
--- a/test/nanostack/unittest/mac/serial_mac_api/serial_mac_apitest.cpp
+++ b/test/nanostack/unittest/mac/serial_mac_api/serial_mac_apitest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/serial_mac_api/test_serial_mac_api.c b/test/nanostack/unittest/mac/serial_mac_api/test_serial_mac_api.c
index 51db20fb784..0adb395b79c 100644
--- a/test/nanostack/unittest/mac/serial_mac_api/test_serial_mac_api.c
+++ b/test/nanostack/unittest/mac/serial_mac_api/test_serial_mac_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/serial_mac_api/test_serial_mac_api.h b/test/nanostack/unittest/mac/serial_mac_api/test_serial_mac_api.h
index 33203eabd1e..7218f120c89 100644
--- a/test/nanostack/unittest/mac/serial_mac_api/test_serial_mac_api.h
+++ b/test/nanostack/unittest/mac/serial_mac_api/test_serial_mac_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/sw_mac/main.cpp b/test/nanostack/unittest/mac/sw_mac/main.cpp
index be3e6edb783..de42820482c 100644
--- a/test/nanostack/unittest/mac/sw_mac/main.cpp
+++ b/test/nanostack/unittest/mac/sw_mac/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/sw_mac/sw_mactest.cpp b/test/nanostack/unittest/mac/sw_mac/sw_mactest.cpp
index 80b535cf147..3e04e829af3 100644
--- a/test/nanostack/unittest/mac/sw_mac/sw_mactest.cpp
+++ b/test/nanostack/unittest/mac/sw_mac/sw_mactest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/sw_mac/test_sw_mac.c b/test/nanostack/unittest/mac/sw_mac/test_sw_mac.c
index a113797be28..2f542e65134 100644
--- a/test/nanostack/unittest/mac/sw_mac/test_sw_mac.c
+++ b/test/nanostack/unittest/mac/sw_mac/test_sw_mac.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/sw_mac/test_sw_mac.h b/test/nanostack/unittest/mac/sw_mac/test_sw_mac.h
index 6bef951595d..468f124de48 100644
--- a/test/nanostack/unittest/mac/sw_mac/test_sw_mac.h
+++ b/test/nanostack/unittest/mac/sw_mac/test_sw_mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/virtual_rf_client/main.cpp b/test/nanostack/unittest/mac/virtual_rf_client/main.cpp
index ec606ae64ad..4e6f3a3ea78 100644
--- a/test/nanostack/unittest/mac/virtual_rf_client/main.cpp
+++ b/test/nanostack/unittest/mac/virtual_rf_client/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/virtual_rf_client/test_virtual_rf_client.c b/test/nanostack/unittest/mac/virtual_rf_client/test_virtual_rf_client.c
index dd21e74988a..b3aa9a8b944 100644
--- a/test/nanostack/unittest/mac/virtual_rf_client/test_virtual_rf_client.c
+++ b/test/nanostack/unittest/mac/virtual_rf_client/test_virtual_rf_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/virtual_rf_client/test_virtual_rf_client.h b/test/nanostack/unittest/mac/virtual_rf_client/test_virtual_rf_client.h
index 5a92e559911..2342af8187a 100644
--- a/test/nanostack/unittest/mac/virtual_rf_client/test_virtual_rf_client.h
+++ b/test/nanostack/unittest/mac/virtual_rf_client/test_virtual_rf_client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/virtual_rf_client/virtual_rf_clienttest.cpp b/test/nanostack/unittest/mac/virtual_rf_client/virtual_rf_clienttest.cpp
index d41fbbb6057..708b199fc10 100644
--- a/test/nanostack/unittest/mac/virtual_rf_client/virtual_rf_clienttest.cpp
+++ b/test/nanostack/unittest/mac/virtual_rf_client/virtual_rf_clienttest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/virtual_rf_driver/main.cpp b/test/nanostack/unittest/mac/virtual_rf_driver/main.cpp
index edf79108267..bb1b8be9a3c 100644
--- a/test/nanostack/unittest/mac/virtual_rf_driver/main.cpp
+++ b/test/nanostack/unittest/mac/virtual_rf_driver/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/virtual_rf_driver/test_virtual_rf_driver.c b/test/nanostack/unittest/mac/virtual_rf_driver/test_virtual_rf_driver.c
index 97a1c9e44de..60f7a229041 100644
--- a/test/nanostack/unittest/mac/virtual_rf_driver/test_virtual_rf_driver.c
+++ b/test/nanostack/unittest/mac/virtual_rf_driver/test_virtual_rf_driver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/virtual_rf_driver/test_virtual_rf_driver.h b/test/nanostack/unittest/mac/virtual_rf_driver/test_virtual_rf_driver.h
index f65afa29d60..fc53e483333 100644
--- a/test/nanostack/unittest/mac/virtual_rf_driver/test_virtual_rf_driver.h
+++ b/test/nanostack/unittest/mac/virtual_rf_driver/test_virtual_rf_driver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mac/virtual_rf_driver/virtual_rf_drivertest.cpp b/test/nanostack/unittest/mac/virtual_rf_driver/virtual_rf_drivertest.cpp
index 3bf7a4718b9..aa9365f9ff0 100644
--- a/test/nanostack/unittest/mac/virtual_rf_driver/virtual_rf_drivertest.cpp
+++ b/test/nanostack/unittest/mac/virtual_rf_driver/virtual_rf_drivertest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mle/mle/main.cpp b/test/nanostack/unittest/mle/mle/main.cpp
index 4a435ccd128..fbb503ce4f2 100644
--- a/test/nanostack/unittest/mle/mle/main.cpp
+++ b/test/nanostack/unittest/mle/mle/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mle/mle/mle_test.cpp b/test/nanostack/unittest/mle/mle/mle_test.cpp
index 23afd2bca71..163b250245e 100644
--- a/test/nanostack/unittest/mle/mle/mle_test.cpp
+++ b/test/nanostack/unittest/mle/mle/mle_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mle/mle/test_mle.c b/test/nanostack/unittest/mle/mle/test_mle.c
index 3c64ce5e997..ccb3931886f 100644
--- a/test/nanostack/unittest/mle/mle/test_mle.c
+++ b/test/nanostack/unittest/mle/mle/test_mle.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mle/mle/test_mle.h b/test/nanostack/unittest/mle/mle/test_mle.h
index 777f6e47d5b..29db7618657 100644
--- a/test/nanostack/unittest/mle/mle/test_mle.h
+++ b/test/nanostack/unittest/mle/mle/test_mle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mle/mle_tlv/main.cpp b/test/nanostack/unittest/mle/mle_tlv/main.cpp
index d5a41d9bfa4..8334b443853 100644
--- a/test/nanostack/unittest/mle/mle_tlv/main.cpp
+++ b/test/nanostack/unittest/mle/mle_tlv/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mle/mle_tlv/mle_tlvtest.cpp b/test/nanostack/unittest/mle/mle_tlv/mle_tlvtest.cpp
index f132dd262fb..4ac9b382d7e 100644
--- a/test/nanostack/unittest/mle/mle_tlv/mle_tlvtest.cpp
+++ b/test/nanostack/unittest/mle/mle_tlv/mle_tlvtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mle/mle_tlv/test_mle_tlv.c b/test/nanostack/unittest/mle/mle_tlv/test_mle_tlv.c
index 7928b19f222..2b8df0f5e8e 100644
--- a/test/nanostack/unittest/mle/mle_tlv/test_mle_tlv.c
+++ b/test/nanostack/unittest/mle/mle_tlv/test_mle_tlv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/mle/mle_tlv/test_mle_tlv.h b/test/nanostack/unittest/mle/mle_tlv/test_mle_tlv.h
index ce273bff0de..d6ffe38ba24 100644
--- a/test/nanostack/unittest/mle/mle_tlv/test_mle_tlv.h
+++ b/test/nanostack/unittest/mle/mle_tlv/test_mle_tlv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_core/main.cpp b/test/nanostack/unittest/nwk_interface/protocol_core/main.cpp
index 0b5a4c70d06..4f6020a3931 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_core/main.cpp
+++ b/test/nanostack/unittest/nwk_interface/protocol_core/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_core/protocol_coretest.cpp b/test/nanostack/unittest/nwk_interface/protocol_core/protocol_coretest.cpp
index 37c850784a5..bd53564d7ce 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_core/protocol_coretest.cpp
+++ b/test/nanostack/unittest/nwk_interface/protocol_core/protocol_coretest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_core/test_protocol_core.c b/test/nanostack/unittest/nwk_interface/protocol_core/test_protocol_core.c
index ff4276ec664..0f904c1bef2 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_core/test_protocol_core.c
+++ b/test/nanostack/unittest/nwk_interface/protocol_core/test_protocol_core.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_core/test_protocol_core.h b/test/nanostack/unittest/nwk_interface/protocol_core/test_protocol_core.h
index 56ec17e4da2..aee3c88d7c8 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_core/test_protocol_core.h
+++ b/test/nanostack/unittest/nwk_interface/protocol_core/test_protocol_core.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_core_sleep/main.cpp b/test/nanostack/unittest/nwk_interface/protocol_core_sleep/main.cpp
index 14ef54b3976..a5e8d6811d7 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_core_sleep/main.cpp
+++ b/test/nanostack/unittest/nwk_interface/protocol_core_sleep/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_core_sleep/protocol_core_sleeptest.cpp b/test/nanostack/unittest/nwk_interface/protocol_core_sleep/protocol_core_sleeptest.cpp
index e54a51a4509..9434b3196ae 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_core_sleep/protocol_core_sleeptest.cpp
+++ b/test/nanostack/unittest/nwk_interface/protocol_core_sleep/protocol_core_sleeptest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_core_sleep/test_protocol_core_sleep.c b/test/nanostack/unittest/nwk_interface/protocol_core_sleep/test_protocol_core_sleep.c
index c0528904e34..c5defd58e3c 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_core_sleep/test_protocol_core_sleep.c
+++ b/test/nanostack/unittest/nwk_interface/protocol_core_sleep/test_protocol_core_sleep.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_core_sleep/test_protocol_core_sleep.h b/test/nanostack/unittest/nwk_interface/protocol_core_sleep/test_protocol_core_sleep.h
index 2faf12e9ec4..6fed6382575 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_core_sleep/test_protocol_core_sleep.h
+++ b/test/nanostack/unittest/nwk_interface/protocol_core_sleep/test_protocol_core_sleep.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_stats/main.cpp b/test/nanostack/unittest/nwk_interface/protocol_stats/main.cpp
index 1e450ad1371..55cef1b7841 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_stats/main.cpp
+++ b/test/nanostack/unittest/nwk_interface/protocol_stats/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_stats/protocol_statstest.cpp b/test/nanostack/unittest/nwk_interface/protocol_stats/protocol_statstest.cpp
index 8967069196a..07dafb29cac 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_stats/protocol_statstest.cpp
+++ b/test/nanostack/unittest/nwk_interface/protocol_stats/protocol_statstest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_stats/test_protocol_stats.c b/test/nanostack/unittest/nwk_interface/protocol_stats/test_protocol_stats.c
index 6b11cfdaad9..8704f86b0e2 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_stats/test_protocol_stats.c
+++ b/test/nanostack/unittest/nwk_interface/protocol_stats/test_protocol_stats.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_stats/test_protocol_stats.h b/test/nanostack/unittest/nwk_interface/protocol_stats/test_protocol_stats.h
index 423e478aef9..c3312645571 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_stats/test_protocol_stats.h
+++ b/test/nanostack/unittest/nwk_interface/protocol_stats/test_protocol_stats.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_timer/main.cpp b/test/nanostack/unittest/nwk_interface/protocol_timer/main.cpp
index 7186501ff13..cb28d520358 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_timer/main.cpp
+++ b/test/nanostack/unittest/nwk_interface/protocol_timer/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_timer/protocol_timertest.cpp b/test/nanostack/unittest/nwk_interface/protocol_timer/protocol_timertest.cpp
index 06697667472..5c0d9bdfb2e 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_timer/protocol_timertest.cpp
+++ b/test/nanostack/unittest/nwk_interface/protocol_timer/protocol_timertest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_timer/test_protocol_timer.c b/test/nanostack/unittest/nwk_interface/protocol_timer/test_protocol_timer.c
index 16aa36c9f84..afe9b790b5f 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_timer/test_protocol_timer.c
+++ b/test/nanostack/unittest/nwk_interface/protocol_timer/test_protocol_timer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/nwk_interface/protocol_timer/test_protocol_timer.h b/test/nanostack/unittest/nwk_interface/protocol_timer/test_protocol_timer.h
index 5e83deed2fc..cdedbb53ab0 100644
--- a/test/nanostack/unittest/nwk_interface/protocol_timer/test_protocol_timer.h
+++ b/test/nanostack/unittest/nwk_interface/protocol_timer/test_protocol_timer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_control/main.cpp b/test/nanostack/unittest/rpl/rpl_control/main.cpp
index 9c1e88e4760..a5e76411121 100644
--- a/test/nanostack/unittest/rpl/rpl_control/main.cpp
+++ b/test/nanostack/unittest/rpl/rpl_control/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_control/rpl_controltest.cpp b/test/nanostack/unittest/rpl/rpl_control/rpl_controltest.cpp
index 2d769385121..8859d195996 100644
--- a/test/nanostack/unittest/rpl/rpl_control/rpl_controltest.cpp
+++ b/test/nanostack/unittest/rpl/rpl_control/rpl_controltest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_control/test_rpl_control.c b/test/nanostack/unittest/rpl/rpl_control/test_rpl_control.c
index 53ca32c67b6..1d6cc34aa17 100644
--- a/test/nanostack/unittest/rpl/rpl_control/test_rpl_control.c
+++ b/test/nanostack/unittest/rpl/rpl_control/test_rpl_control.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_control/test_rpl_control.h b/test/nanostack/unittest/rpl/rpl_control/test_rpl_control.h
index e0577f4a26a..559e2419b3e 100644
--- a/test/nanostack/unittest/rpl/rpl_control/test_rpl_control.h
+++ b/test/nanostack/unittest/rpl/rpl_control/test_rpl_control.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_data/main.cpp b/test/nanostack/unittest/rpl/rpl_data/main.cpp
index d5d9d64f783..35f69b4bb1e 100644
--- a/test/nanostack/unittest/rpl/rpl_data/main.cpp
+++ b/test/nanostack/unittest/rpl/rpl_data/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_data/rpl_datatest.cpp b/test/nanostack/unittest/rpl/rpl_data/rpl_datatest.cpp
index dc582e6db4f..e59fd81de50 100644
--- a/test/nanostack/unittest/rpl/rpl_data/rpl_datatest.cpp
+++ b/test/nanostack/unittest/rpl/rpl_data/rpl_datatest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_data/test_rpl_data.c b/test/nanostack/unittest/rpl/rpl_data/test_rpl_data.c
index b467dec39bd..39aa88f2e1c 100644
--- a/test/nanostack/unittest/rpl/rpl_data/test_rpl_data.c
+++ b/test/nanostack/unittest/rpl/rpl_data/test_rpl_data.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_data/test_rpl_data.h b/test/nanostack/unittest/rpl/rpl_data/test_rpl_data.h
index cfd851b4244..eb46c4dac40 100644
--- a/test/nanostack/unittest/rpl/rpl_data/test_rpl_data.h
+++ b/test/nanostack/unittest/rpl/rpl_data/test_rpl_data.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_downward/main.cpp b/test/nanostack/unittest/rpl/rpl_downward/main.cpp
index 959f1125205..e27c6ee22ff 100644
--- a/test/nanostack/unittest/rpl/rpl_downward/main.cpp
+++ b/test/nanostack/unittest/rpl/rpl_downward/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_downward/rpl_downwardtest.cpp b/test/nanostack/unittest/rpl/rpl_downward/rpl_downwardtest.cpp
index 26c3b990c61..064f41d60ac 100644
--- a/test/nanostack/unittest/rpl/rpl_downward/rpl_downwardtest.cpp
+++ b/test/nanostack/unittest/rpl/rpl_downward/rpl_downwardtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_downward/test_rpl_downward.c b/test/nanostack/unittest/rpl/rpl_downward/test_rpl_downward.c
index cd5889d7633..2f8c67e6011 100644
--- a/test/nanostack/unittest/rpl/rpl_downward/test_rpl_downward.c
+++ b/test/nanostack/unittest/rpl/rpl_downward/test_rpl_downward.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_downward/test_rpl_downward.h b/test/nanostack/unittest/rpl/rpl_downward/test_rpl_downward.h
index 3010bde4c19..115456abe40 100644
--- a/test/nanostack/unittest/rpl/rpl_downward/test_rpl_downward.h
+++ b/test/nanostack/unittest/rpl/rpl_downward/test_rpl_downward.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_mrhof/main.cpp b/test/nanostack/unittest/rpl/rpl_mrhof/main.cpp
index fae4b6c7463..5036c3ff27d 100644
--- a/test/nanostack/unittest/rpl/rpl_mrhof/main.cpp
+++ b/test/nanostack/unittest/rpl/rpl_mrhof/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_mrhof/rpl_mrhoftest.cpp b/test/nanostack/unittest/rpl/rpl_mrhof/rpl_mrhoftest.cpp
index 222474da45d..1303da79bcc 100644
--- a/test/nanostack/unittest/rpl/rpl_mrhof/rpl_mrhoftest.cpp
+++ b/test/nanostack/unittest/rpl/rpl_mrhof/rpl_mrhoftest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_mrhof/test_rpl_mrhof.c b/test/nanostack/unittest/rpl/rpl_mrhof/test_rpl_mrhof.c
index be328a2d5a2..ecd3d1fdfbe 100644
--- a/test/nanostack/unittest/rpl/rpl_mrhof/test_rpl_mrhof.c
+++ b/test/nanostack/unittest/rpl/rpl_mrhof/test_rpl_mrhof.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_mrhof/test_rpl_mrhof.h b/test/nanostack/unittest/rpl/rpl_mrhof/test_rpl_mrhof.h
index 0af9227a915..745914c19fe 100644
--- a/test/nanostack/unittest/rpl/rpl_mrhof/test_rpl_mrhof.h
+++ b/test/nanostack/unittest/rpl/rpl_mrhof/test_rpl_mrhof.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_objective/main.cpp b/test/nanostack/unittest/rpl/rpl_objective/main.cpp
index b48e3505117..aebc911a3ae 100644
--- a/test/nanostack/unittest/rpl/rpl_objective/main.cpp
+++ b/test/nanostack/unittest/rpl/rpl_objective/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_objective/rpl_objectivetest.cpp b/test/nanostack/unittest/rpl/rpl_objective/rpl_objectivetest.cpp
index 4c8b7e7ae02..59016940ef9 100644
--- a/test/nanostack/unittest/rpl/rpl_objective/rpl_objectivetest.cpp
+++ b/test/nanostack/unittest/rpl/rpl_objective/rpl_objectivetest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_objective/test_rpl_objective.c b/test/nanostack/unittest/rpl/rpl_objective/test_rpl_objective.c
index 630efc206e4..ba5f5e1185d 100644
--- a/test/nanostack/unittest/rpl/rpl_objective/test_rpl_objective.c
+++ b/test/nanostack/unittest/rpl/rpl_objective/test_rpl_objective.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_objective/test_rpl_objective.h b/test/nanostack/unittest/rpl/rpl_objective/test_rpl_objective.h
index b0519c316e8..14d3a034b0d 100644
--- a/test/nanostack/unittest/rpl/rpl_objective/test_rpl_objective.h
+++ b/test/nanostack/unittest/rpl/rpl_objective/test_rpl_objective.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_of0/main.cpp b/test/nanostack/unittest/rpl/rpl_of0/main.cpp
index 434e9b533f7..e2324bd931e 100644
--- a/test/nanostack/unittest/rpl/rpl_of0/main.cpp
+++ b/test/nanostack/unittest/rpl/rpl_of0/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_of0/rpl_of0test.cpp b/test/nanostack/unittest/rpl/rpl_of0/rpl_of0test.cpp
index 5d4001ce14e..fb1fefa10cf 100644
--- a/test/nanostack/unittest/rpl/rpl_of0/rpl_of0test.cpp
+++ b/test/nanostack/unittest/rpl/rpl_of0/rpl_of0test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_of0/test_rpl_of0.c b/test/nanostack/unittest/rpl/rpl_of0/test_rpl_of0.c
index 4685ceeb2ce..dd947a2445f 100644
--- a/test/nanostack/unittest/rpl/rpl_of0/test_rpl_of0.c
+++ b/test/nanostack/unittest/rpl/rpl_of0/test_rpl_of0.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_of0/test_rpl_of0.h b/test/nanostack/unittest/rpl/rpl_of0/test_rpl_of0.h
index 38b08188070..9bcd81e2521 100644
--- a/test/nanostack/unittest/rpl/rpl_of0/test_rpl_of0.h
+++ b/test/nanostack/unittest/rpl/rpl_of0/test_rpl_of0.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_policy/main.cpp b/test/nanostack/unittest/rpl/rpl_policy/main.cpp
index 864e1a5c2c3..c8cc52b0145 100644
--- a/test/nanostack/unittest/rpl/rpl_policy/main.cpp
+++ b/test/nanostack/unittest/rpl/rpl_policy/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_policy/rpl_policytest.cpp b/test/nanostack/unittest/rpl/rpl_policy/rpl_policytest.cpp
index 23d3d5797d3..76dce2a177c 100644
--- a/test/nanostack/unittest/rpl/rpl_policy/rpl_policytest.cpp
+++ b/test/nanostack/unittest/rpl/rpl_policy/rpl_policytest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_policy/test_rpl_policy.c b/test/nanostack/unittest/rpl/rpl_policy/test_rpl_policy.c
index b3f15714c4e..f54a39d935f 100644
--- a/test/nanostack/unittest/rpl/rpl_policy/test_rpl_policy.c
+++ b/test/nanostack/unittest/rpl/rpl_policy/test_rpl_policy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_policy/test_rpl_policy.h b/test/nanostack/unittest/rpl/rpl_policy/test_rpl_policy.h
index 0400edf3a73..05ada3ccc92 100644
--- a/test/nanostack/unittest/rpl/rpl_policy/test_rpl_policy.h
+++ b/test/nanostack/unittest/rpl/rpl_policy/test_rpl_policy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_upward/main.cpp b/test/nanostack/unittest/rpl/rpl_upward/main.cpp
index ac21ebf6d78..98f61c5994e 100644
--- a/test/nanostack/unittest/rpl/rpl_upward/main.cpp
+++ b/test/nanostack/unittest/rpl/rpl_upward/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_upward/rpl_upwardtest.cpp b/test/nanostack/unittest/rpl/rpl_upward/rpl_upwardtest.cpp
index cefbecd5e90..278c147b437 100644
--- a/test/nanostack/unittest/rpl/rpl_upward/rpl_upwardtest.cpp
+++ b/test/nanostack/unittest/rpl/rpl_upward/rpl_upwardtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_upward/test_rpl_upward.c b/test/nanostack/unittest/rpl/rpl_upward/test_rpl_upward.c
index 70d209c34c9..6d3eb5aa2ac 100644
--- a/test/nanostack/unittest/rpl/rpl_upward/test_rpl_upward.c
+++ b/test/nanostack/unittest/rpl/rpl_upward/test_rpl_upward.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/rpl/rpl_upward/test_rpl_upward.h b/test/nanostack/unittest/rpl/rpl_upward/test_rpl_upward.h
index adaad9cbd96..48ebb9da567 100644
--- a/test/nanostack/unittest/rpl/rpl_upward/test_rpl_upward.h
+++ b/test/nanostack/unittest/rpl/rpl_upward/test_rpl_upward.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/kde_helper/kde_helpertest.cpp b/test/nanostack/unittest/security/kde_helper/kde_helpertest.cpp
index 6b1a9633f47..e957968a4ea 100644
--- a/test/nanostack/unittest/security/kde_helper/kde_helpertest.cpp
+++ b/test/nanostack/unittest/security/kde_helper/kde_helpertest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/kde_helper/main.cpp b/test/nanostack/unittest/security/kde_helper/main.cpp
index 59b515bb337..20d4c896d05 100644
--- a/test/nanostack/unittest/security/kde_helper/main.cpp
+++ b/test/nanostack/unittest/security/kde_helper/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/kde_helper/test_kde_helper.c b/test/nanostack/unittest/security/kde_helper/test_kde_helper.c
index 63a564b567d..65977dc7690 100644
--- a/test/nanostack/unittest/security/kde_helper/test_kde_helper.c
+++ b/test/nanostack/unittest/security/kde_helper/test_kde_helper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/kde_helper/test_kde_helper.h b/test/nanostack/unittest/security/kde_helper/test_kde_helper.h
index 526270d322d..cfb1fc4f460 100644
--- a/test/nanostack/unittest/security/kde_helper/test_kde_helper.h
+++ b/test/nanostack/unittest/security/kde_helper/test_kde_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/pana/main.cpp b/test/nanostack/unittest/security/pana/main.cpp
index 2688d065e07..888450fe5c6 100644
--- a/test/nanostack/unittest/security/pana/main.cpp
+++ b/test/nanostack/unittest/security/pana/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/pana/panatest.cpp b/test/nanostack/unittest/security/pana/panatest.cpp
index 5b16fac1424..69b1ce97ce2 100644
--- a/test/nanostack/unittest/security/pana/panatest.cpp
+++ b/test/nanostack/unittest/security/pana/panatest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/pana/test_pana.c b/test/nanostack/unittest/security/pana/test_pana.c
index 7d603739186..6941e3670d1 100644
--- a/test/nanostack/unittest/security/pana/test_pana.c
+++ b/test/nanostack/unittest/security/pana/test_pana.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/pana/test_pana.h b/test/nanostack/unittest/security/pana/test_pana.h
index 985515a7692..d65495c8da6 100644
--- a/test/nanostack/unittest/security/pana/test_pana.h
+++ b/test/nanostack/unittest/security/pana/test_pana.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/pana_relay_table/main.cpp b/test/nanostack/unittest/security/pana_relay_table/main.cpp
index 25d56d61c56..272e3a62f8b 100644
--- a/test/nanostack/unittest/security/pana_relay_table/main.cpp
+++ b/test/nanostack/unittest/security/pana_relay_table/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/pana_relay_table/pana_relay_tabletest.cpp b/test/nanostack/unittest/security/pana_relay_table/pana_relay_tabletest.cpp
index 83c9342875c..5d010243f8f 100644
--- a/test/nanostack/unittest/security/pana_relay_table/pana_relay_tabletest.cpp
+++ b/test/nanostack/unittest/security/pana_relay_table/pana_relay_tabletest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/pana_relay_table/test_pana_relay_table.c b/test/nanostack/unittest/security/pana_relay_table/test_pana_relay_table.c
index 53c2bf3aacd..6f48fb78fa2 100644
--- a/test/nanostack/unittest/security/pana_relay_table/test_pana_relay_table.c
+++ b/test/nanostack/unittest/security/pana_relay_table/test_pana_relay_table.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/pana_relay_table/test_pana_relay_table.h b/test/nanostack/unittest/security/pana_relay_table/test_pana_relay_table.h
index 00422d815ed..0311deeabef 100644
--- a/test/nanostack/unittest/security/pana_relay_table/test_pana_relay_table.h
+++ b/test/nanostack/unittest/security/pana_relay_table/test_pana_relay_table.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/security_lib/main.cpp b/test/nanostack/unittest/security/security_lib/main.cpp
index fdc261ba67f..0f13f51e975 100644
--- a/test/nanostack/unittest/security/security_lib/main.cpp
+++ b/test/nanostack/unittest/security/security_lib/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/security_lib/security_libtest.cpp b/test/nanostack/unittest/security/security_lib/security_libtest.cpp
index 8d01ee2e199..005c73b31d1 100644
--- a/test/nanostack/unittest/security/security_lib/security_libtest.cpp
+++ b/test/nanostack/unittest/security/security_lib/security_libtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/security_lib/test_security_lib.c b/test/nanostack/unittest/security/security_lib/test_security_lib.c
index 1fa94f5f385..ed0b03a7f5c 100644
--- a/test/nanostack/unittest/security/security_lib/test_security_lib.c
+++ b/test/nanostack/unittest/security/security_lib/test_security_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/security_lib/test_security_lib.h b/test/nanostack/unittest/security/security_lib/test_security_lib.h
index 29b0aa81e26..56b46c3bbd9 100644
--- a/test/nanostack/unittest/security/security_lib/test_security_lib.h
+++ b/test/nanostack/unittest/security/security_lib/test_security_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/tls_lib/main.cpp b/test/nanostack/unittest/security/tls_lib/main.cpp
index f520d406fd8..189666990ab 100644
--- a/test/nanostack/unittest/security/tls_lib/main.cpp
+++ b/test/nanostack/unittest/security/tls_lib/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/tls_lib/test_tls_lib.c b/test/nanostack/unittest/security/tls_lib/test_tls_lib.c
index e626a80b653..c7e3cd1e438 100644
--- a/test/nanostack/unittest/security/tls_lib/test_tls_lib.c
+++ b/test/nanostack/unittest/security/tls_lib/test_tls_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/tls_lib/test_tls_lib.h b/test/nanostack/unittest/security/tls_lib/test_tls_lib.h
index b44318273c1..78895597ff6 100644
--- a/test/nanostack/unittest/security/tls_lib/test_tls_lib.h
+++ b/test/nanostack/unittest/security/tls_lib/test_tls_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/security/tls_lib/tls_libtest.cpp b/test/nanostack/unittest/security/tls_lib/tls_libtest.cpp
index b9128b4660f..696b2641dde 100644
--- a/test/nanostack/unittest/security/tls_lib/tls_libtest.cpp
+++ b/test/nanostack/unittest/security/tls_lib/tls_libtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/SHA256_Lib/main.cpp b/test/nanostack/unittest/service_libs/SHA256_Lib/main.cpp
index 93a4f3415ad..f127f2afcf8 100644
--- a/test/nanostack/unittest/service_libs/SHA256_Lib/main.cpp
+++ b/test/nanostack/unittest/service_libs/SHA256_Lib/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/SHA256_Lib/shalibtest.cpp b/test/nanostack/unittest/service_libs/SHA256_Lib/shalibtest.cpp
index 70423cf6247..94496f86c6e 100644
--- a/test/nanostack/unittest/service_libs/SHA256_Lib/shalibtest.cpp
+++ b/test/nanostack/unittest/service_libs/SHA256_Lib/shalibtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/SHA256_Lib/test_shalib.c b/test/nanostack/unittest/service_libs/SHA256_Lib/test_shalib.c
index 25ea28c15bb..d02b5d5cf4a 100644
--- a/test/nanostack/unittest/service_libs/SHA256_Lib/test_shalib.c
+++ b/test/nanostack/unittest/service_libs/SHA256_Lib/test_shalib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/SHA256_Lib/test_shalib.h b/test/nanostack/unittest/service_libs/SHA256_Lib/test_shalib.h
index 4683c70715b..9dd58bb7fac 100644
--- a/test/nanostack/unittest/service_libs/SHA256_Lib/test_shalib.h
+++ b/test/nanostack/unittest/service_libs/SHA256_Lib/test_shalib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/blacklist/blacklisttest.cpp b/test/nanostack/unittest/service_libs/blacklist/blacklisttest.cpp
index 06be0ea7ccd..6696229d8c7 100644
--- a/test/nanostack/unittest/service_libs/blacklist/blacklisttest.cpp
+++ b/test/nanostack/unittest/service_libs/blacklist/blacklisttest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/blacklist/main.cpp b/test/nanostack/unittest/service_libs/blacklist/main.cpp
index 1c90a7854e7..a9d0e05d124 100644
--- a/test/nanostack/unittest/service_libs/blacklist/main.cpp
+++ b/test/nanostack/unittest/service_libs/blacklist/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/blacklist/test_blacklist.c b/test/nanostack/unittest/service_libs/blacklist/test_blacklist.c
index 8226a25b9b7..eadd818d7b2 100644
--- a/test/nanostack/unittest/service_libs/blacklist/test_blacklist.c
+++ b/test/nanostack/unittest/service_libs/blacklist/test_blacklist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/blacklist/test_blacklist.h b/test/nanostack/unittest/service_libs/blacklist/test_blacklist.h
index b60abc027f5..ff607cb6f72 100644
--- a/test/nanostack/unittest/service_libs/blacklist/test_blacklist.h
+++ b/test/nanostack/unittest/service_libs/blacklist/test_blacklist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/channel_functions/channelfunctest.cpp b/test/nanostack/unittest/service_libs/channel_functions/channelfunctest.cpp
index d9174a7658c..40d9d4f4c76 100644
--- a/test/nanostack/unittest/service_libs/channel_functions/channelfunctest.cpp
+++ b/test/nanostack/unittest/service_libs/channel_functions/channelfunctest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2016, 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/channel_functions/main.cpp b/test/nanostack/unittest/service_libs/channel_functions/main.cpp
index b24ab1b7ee5..baa6f3fdb43 100644
--- a/test/nanostack/unittest/service_libs/channel_functions/main.cpp
+++ b/test/nanostack/unittest/service_libs/channel_functions/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2016, 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/channel_functions/test_channel_functions.c b/test/nanostack/unittest/service_libs/channel_functions/test_channel_functions.c
index 8d55d893b48..215e08840da 100644
--- a/test/nanostack/unittest/service_libs/channel_functions/test_channel_functions.c
+++ b/test/nanostack/unittest/service_libs/channel_functions/test_channel_functions.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/channel_functions/test_channel_functions.h b/test/nanostack/unittest/service_libs/channel_functions/test_channel_functions.h
index 222f37270d9..b638dd393f0 100644
--- a/test/nanostack/unittest/service_libs/channel_functions/test_channel_functions.h
+++ b/test/nanostack/unittest/service_libs/channel_functions/test_channel_functions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2016, 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/channel_list/channeltest.cpp b/test/nanostack/unittest/service_libs/channel_list/channeltest.cpp
index a3bb0aa7a41..31e14e6bf5a 100644
--- a/test/nanostack/unittest/service_libs/channel_list/channeltest.cpp
+++ b/test/nanostack/unittest/service_libs/channel_list/channeltest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/channel_list/main.cpp b/test/nanostack/unittest/service_libs/channel_list/main.cpp
index 456c764f270..bc6a5119e4d 100644
--- a/test/nanostack/unittest/service_libs/channel_list/main.cpp
+++ b/test/nanostack/unittest/service_libs/channel_list/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/channel_list/test_channel_list.c b/test/nanostack/unittest/service_libs/channel_list/test_channel_list.c
index dae9b31aace..c9782c84fab 100644
--- a/test/nanostack/unittest/service_libs/channel_list/test_channel_list.c
+++ b/test/nanostack/unittest/service_libs/channel_list/test_channel_list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/channel_list/test_channel_list.h b/test/nanostack/unittest/service_libs/channel_list/test_channel_list.h
index 01881f05011..9f1800fb181 100644
--- a/test/nanostack/unittest/service_libs/channel_list/test_channel_list.h
+++ b/test/nanostack/unittest/service_libs/channel_list/test_channel_list.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/etx/etxtest.cpp b/test/nanostack/unittest/service_libs/etx/etxtest.cpp
index 7546cc31630..260fdd06206 100644
--- a/test/nanostack/unittest/service_libs/etx/etxtest.cpp
+++ b/test/nanostack/unittest/service_libs/etx/etxtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/etx/main.cpp b/test/nanostack/unittest/service_libs/etx/main.cpp
index e0fbe9e9987..d57b195e0a2 100644
--- a/test/nanostack/unittest/service_libs/etx/main.cpp
+++ b/test/nanostack/unittest/service_libs/etx/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/etx/test_etx.c b/test/nanostack/unittest/service_libs/etx/test_etx.c
index ae863eb94f3..6588dc952f6 100644
--- a/test/nanostack/unittest/service_libs/etx/test_etx.c
+++ b/test/nanostack/unittest/service_libs/etx/test_etx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/etx/test_etx.h b/test/nanostack/unittest/service_libs/etx/test_etx.h
index 252d673fd6a..f5cb693bdbb 100644
--- a/test/nanostack/unittest/service_libs/etx/test_etx.h
+++ b/test/nanostack/unittest/service_libs/etx/test_etx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss/fhsstest.cpp b/test/nanostack/unittest/service_libs/fhss/fhsstest.cpp
index bff01a5f575..b0ff9e2ccd0 100644
--- a/test/nanostack/unittest/service_libs/fhss/fhsstest.cpp
+++ b/test/nanostack/unittest/service_libs/fhss/fhsstest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss/main.cpp b/test/nanostack/unittest/service_libs/fhss/main.cpp
index 8cb93514230..0435505847b 100644
--- a/test/nanostack/unittest/service_libs/fhss/main.cpp
+++ b/test/nanostack/unittest/service_libs/fhss/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss/test_fhss.c b/test/nanostack/unittest/service_libs/fhss/test_fhss.c
index 532501dbef0..4d4dd3b56b8 100644
--- a/test/nanostack/unittest/service_libs/fhss/test_fhss.c
+++ b/test/nanostack/unittest/service_libs/fhss/test_fhss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss/test_fhss.h b/test/nanostack/unittest/service_libs/fhss/test_fhss.h
index 0e759cb7aa3..571a5be87b6 100644
--- a/test/nanostack/unittest/service_libs/fhss/test_fhss.h
+++ b/test/nanostack/unittest/service_libs/fhss/test_fhss.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_channel/fhsschanneltest.cpp b/test/nanostack/unittest/service_libs/fhss_channel/fhsschanneltest.cpp
index 05c956d2866..2e49cfece10 100644
--- a/test/nanostack/unittest/service_libs/fhss_channel/fhsschanneltest.cpp
+++ b/test/nanostack/unittest/service_libs/fhss_channel/fhsschanneltest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_channel/main.cpp b/test/nanostack/unittest/service_libs/fhss_channel/main.cpp
index c8122b5abd7..8bc6732a708 100644
--- a/test/nanostack/unittest/service_libs/fhss_channel/main.cpp
+++ b/test/nanostack/unittest/service_libs/fhss_channel/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_channel/test_fhss_channel.c b/test/nanostack/unittest/service_libs/fhss_channel/test_fhss_channel.c
index 9a0ad97afd8..cdec66bfee5 100644
--- a/test/nanostack/unittest/service_libs/fhss_channel/test_fhss_channel.c
+++ b/test/nanostack/unittest/service_libs/fhss_channel/test_fhss_channel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_channel/test_fhss_channel.h b/test/nanostack/unittest/service_libs/fhss_channel/test_fhss_channel.h
index 2a0ed857015..46368c56243 100644
--- a/test/nanostack/unittest/service_libs/fhss_channel/test_fhss_channel.h
+++ b/test/nanostack/unittest/service_libs/fhss_channel/test_fhss_channel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_common/fhsscommontest.cpp b/test/nanostack/unittest/service_libs/fhss_common/fhsscommontest.cpp
index 8cf00491117..d778f3750cf 100644
--- a/test/nanostack/unittest/service_libs/fhss_common/fhsscommontest.cpp
+++ b/test/nanostack/unittest/service_libs/fhss_common/fhsscommontest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_common/main.cpp b/test/nanostack/unittest/service_libs/fhss_common/main.cpp
index 81dcd64c5e8..4b688b612ee 100644
--- a/test/nanostack/unittest/service_libs/fhss_common/main.cpp
+++ b/test/nanostack/unittest/service_libs/fhss_common/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_common/test_fhss_common.c b/test/nanostack/unittest/service_libs/fhss_common/test_fhss_common.c
index 94e307594ff..4b545a3d548 100644
--- a/test/nanostack/unittest/service_libs/fhss_common/test_fhss_common.c
+++ b/test/nanostack/unittest/service_libs/fhss_common/test_fhss_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_common/test_fhss_common.h b/test/nanostack/unittest/service_libs/fhss_common/test_fhss_common.h
index 11b935d077a..06e951fafd1 100644
--- a/test/nanostack/unittest/service_libs/fhss_common/test_fhss_common.h
+++ b/test/nanostack/unittest/service_libs/fhss_common/test_fhss_common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_config/fhssconfigtest.cpp b/test/nanostack/unittest/service_libs/fhss_config/fhssconfigtest.cpp
index 2dde9eee28e..9942d1bc2ea 100644
--- a/test/nanostack/unittest/service_libs/fhss_config/fhssconfigtest.cpp
+++ b/test/nanostack/unittest/service_libs/fhss_config/fhssconfigtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_config/main.cpp b/test/nanostack/unittest/service_libs/fhss_config/main.cpp
index 5081b03eb6a..c42722bbcd4 100644
--- a/test/nanostack/unittest/service_libs/fhss_config/main.cpp
+++ b/test/nanostack/unittest/service_libs/fhss_config/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_config/test_fhss_config.c b/test/nanostack/unittest/service_libs/fhss_config/test_fhss_config.c
index 2ba1aea8415..13be6b87a44 100644
--- a/test/nanostack/unittest/service_libs/fhss_config/test_fhss_config.c
+++ b/test/nanostack/unittest/service_libs/fhss_config/test_fhss_config.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_config/test_fhss_config.h b/test/nanostack/unittest/service_libs/fhss_config/test_fhss_config.h
index c1b4ac35355..1a250b0099e 100644
--- a/test/nanostack/unittest/service_libs/fhss_config/test_fhss_config.h
+++ b/test/nanostack/unittest/service_libs/fhss_config/test_fhss_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_statistics/fhssstatisticstest.cpp b/test/nanostack/unittest/service_libs/fhss_statistics/fhssstatisticstest.cpp
index cdec6dc1ef5..f6599614332 100644
--- a/test/nanostack/unittest/service_libs/fhss_statistics/fhssstatisticstest.cpp
+++ b/test/nanostack/unittest/service_libs/fhss_statistics/fhssstatisticstest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_statistics/main.cpp b/test/nanostack/unittest/service_libs/fhss_statistics/main.cpp
index c8aa20cdfb3..c81cc462852 100644
--- a/test/nanostack/unittest/service_libs/fhss_statistics/main.cpp
+++ b/test/nanostack/unittest/service_libs/fhss_statistics/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_statistics/test_fhss_statistics.c b/test/nanostack/unittest/service_libs/fhss_statistics/test_fhss_statistics.c
index ced200d244f..b6254fbe4c7 100644
--- a/test/nanostack/unittest/service_libs/fhss_statistics/test_fhss_statistics.c
+++ b/test/nanostack/unittest/service_libs/fhss_statistics/test_fhss_statistics.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_statistics/test_fhss_statistics.h b/test/nanostack/unittest/service_libs/fhss_statistics/test_fhss_statistics.h
index a603b58c9ac..a9c54245faf 100644
--- a/test/nanostack/unittest/service_libs/fhss_statistics/test_fhss_statistics.h
+++ b/test/nanostack/unittest/service_libs/fhss_statistics/test_fhss_statistics.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_ws/fhsswstest.cpp b/test/nanostack/unittest/service_libs/fhss_ws/fhsswstest.cpp
index 4fce73c8121..3eb840ab1c1 100644
--- a/test/nanostack/unittest/service_libs/fhss_ws/fhsswstest.cpp
+++ b/test/nanostack/unittest/service_libs/fhss_ws/fhsswstest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_ws/main.cpp b/test/nanostack/unittest/service_libs/fhss_ws/main.cpp
index ae910bbc097..b3d5ee0b803 100644
--- a/test/nanostack/unittest/service_libs/fhss_ws/main.cpp
+++ b/test/nanostack/unittest/service_libs/fhss_ws/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.c b/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.c
index 582d18846af..37660c0516d 100644
--- a/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.c
+++ b/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.h b/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.h
index 283f10d011b..d6c4eb91fdb 100644
--- a/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.h
+++ b/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/hmac/hmactest.cpp b/test/nanostack/unittest/service_libs/hmac/hmactest.cpp
index 493fe28902e..2ef238ca69a 100644
--- a/test/nanostack/unittest/service_libs/hmac/hmactest.cpp
+++ b/test/nanostack/unittest/service_libs/hmac/hmactest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/hmac/main.cpp b/test/nanostack/unittest/service_libs/hmac/main.cpp
index c3da098cd75..1cd4140ea5c 100644
--- a/test/nanostack/unittest/service_libs/hmac/main.cpp
+++ b/test/nanostack/unittest/service_libs/hmac/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/hmac/test_hmac.c b/test/nanostack/unittest/service_libs/hmac/test_hmac.c
index 962feea87d0..55f06333974 100644
--- a/test/nanostack/unittest/service_libs/hmac/test_hmac.c
+++ b/test/nanostack/unittest/service_libs/hmac/test_hmac.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/hmac/test_hmac.h b/test/nanostack/unittest/service_libs/hmac/test_hmac.h
index f7194dd43c8..96db6c0a9f5 100644
--- a/test/nanostack/unittest/service_libs/hmac/test_hmac.h
+++ b/test/nanostack/unittest/service_libs/hmac/test_hmac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/ieee_802_11/ieee80211test.cpp b/test/nanostack/unittest/service_libs/ieee_802_11/ieee80211test.cpp
index 19db8049e15..87683afaa98 100644
--- a/test/nanostack/unittest/service_libs/ieee_802_11/ieee80211test.cpp
+++ b/test/nanostack/unittest/service_libs/ieee_802_11/ieee80211test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/ieee_802_11/main.cpp b/test/nanostack/unittest/service_libs/ieee_802_11/main.cpp
index b6eca8763ab..d1dbb316f63 100644
--- a/test/nanostack/unittest/service_libs/ieee_802_11/main.cpp
+++ b/test/nanostack/unittest/service_libs/ieee_802_11/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/ieee_802_11/test_ieee_802_11.c b/test/nanostack/unittest/service_libs/ieee_802_11/test_ieee_802_11.c
index 66ddff0b373..52cd4a6e800 100644
--- a/test/nanostack/unittest/service_libs/ieee_802_11/test_ieee_802_11.c
+++ b/test/nanostack/unittest/service_libs/ieee_802_11/test_ieee_802_11.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/ieee_802_11/test_ieee_802_11.h b/test/nanostack/unittest/service_libs/ieee_802_11/test_ieee_802_11.h
index 2f82a09efb7..cefb69a156c 100644
--- a/test/nanostack/unittest/service_libs/ieee_802_11/test_ieee_802_11.h
+++ b/test/nanostack/unittest/service_libs/ieee_802_11/test_ieee_802_11.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/load_balance/loadbalance_test.cpp b/test/nanostack/unittest/service_libs/load_balance/loadbalance_test.cpp
index 9c56a1369fa..17e8b1357c1 100644
--- a/test/nanostack/unittest/service_libs/load_balance/loadbalance_test.cpp
+++ b/test/nanostack/unittest/service_libs/load_balance/loadbalance_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/load_balance/main.cpp b/test/nanostack/unittest/service_libs/load_balance/main.cpp
index ed99191de31..7888e377331 100644
--- a/test/nanostack/unittest/service_libs/load_balance/main.cpp
+++ b/test/nanostack/unittest/service_libs/load_balance/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/mac_neighbor_table/mac_neighbor_table_test.cpp b/test/nanostack/unittest/service_libs/mac_neighbor_table/mac_neighbor_table_test.cpp
index e7bef4ab60f..cd5f730b703 100644
--- a/test/nanostack/unittest/service_libs/mac_neighbor_table/mac_neighbor_table_test.cpp
+++ b/test/nanostack/unittest/service_libs/mac_neighbor_table/mac_neighbor_table_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/mac_neighbor_table/main.cpp b/test/nanostack/unittest/service_libs/mac_neighbor_table/main.cpp
index c183b9e81e7..3563e41fbc2 100644
--- a/test/nanostack/unittest/service_libs/mac_neighbor_table/main.cpp
+++ b/test/nanostack/unittest/service_libs/mac_neighbor_table/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/mac_neighbor_table/test_mac_neighbor_table.c b/test/nanostack/unittest/service_libs/mac_neighbor_table/test_mac_neighbor_table.c
index 5182c414c31..c79576c2a22 100644
--- a/test/nanostack/unittest/service_libs/mac_neighbor_table/test_mac_neighbor_table.c
+++ b/test/nanostack/unittest/service_libs/mac_neighbor_table/test_mac_neighbor_table.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/mac_neighbor_table/test_mac_neighbor_table.h b/test/nanostack/unittest/service_libs/mac_neighbor_table/test_mac_neighbor_table.h
index 53087d7a724..b172ee03b14 100644
--- a/test/nanostack/unittest/service_libs/mac_neighbor_table/test_mac_neighbor_table.h
+++ b/test/nanostack/unittest/service_libs/mac_neighbor_table/test_mac_neighbor_table.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/mdns/main.cpp b/test/nanostack/unittest/service_libs/mdns/main.cpp
index 1d8c56d9c02..eba7eecb9ce 100644
--- a/test/nanostack/unittest/service_libs/mdns/main.cpp
+++ b/test/nanostack/unittest/service_libs/mdns/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/mdns/mdns_tests.cpp b/test/nanostack/unittest/service_libs/mdns/mdns_tests.cpp
index ce1d0fe7cd3..42340ad4520 100644
--- a/test/nanostack/unittest/service_libs/mdns/mdns_tests.cpp
+++ b/test/nanostack/unittest/service_libs/mdns/mdns_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/mdns/test_ns_mdns_api.c b/test/nanostack/unittest/service_libs/mdns/test_ns_mdns_api.c
index 57161d87739..3fb3a445478 100644
--- a/test/nanostack/unittest/service_libs/mdns/test_ns_mdns_api.c
+++ b/test/nanostack/unittest/service_libs/mdns/test_ns_mdns_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/mdns/test_ns_mdns_api.h b/test/nanostack/unittest/service_libs/mdns/test_ns_mdns_api.h
index e42c8545acd..860964854c4 100644
--- a/test/nanostack/unittest/service_libs/mdns/test_ns_mdns_api.h
+++ b/test/nanostack/unittest/service_libs/mdns/test_ns_mdns_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/nist_aes_kw/main.cpp b/test/nanostack/unittest/service_libs/nist_aes_kw/main.cpp
index a82aef5a93e..03422e1e015 100644
--- a/test/nanostack/unittest/service_libs/nist_aes_kw/main.cpp
+++ b/test/nanostack/unittest/service_libs/nist_aes_kw/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/nist_aes_kw/nistaeskwtest.cpp b/test/nanostack/unittest/service_libs/nist_aes_kw/nistaeskwtest.cpp
index 86b6758f02d..44945f10ea1 100644
--- a/test/nanostack/unittest/service_libs/nist_aes_kw/nistaeskwtest.cpp
+++ b/test/nanostack/unittest/service_libs/nist_aes_kw/nistaeskwtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/nist_aes_kw/test_nist_aes_kw.c b/test/nanostack/unittest/service_libs/nist_aes_kw/test_nist_aes_kw.c
index e7fd3a29ca8..34b74aaa2f5 100644
--- a/test/nanostack/unittest/service_libs/nist_aes_kw/test_nist_aes_kw.c
+++ b/test/nanostack/unittest/service_libs/nist_aes_kw/test_nist_aes_kw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/nist_aes_kw/test_nist_aes_kw.h b/test/nanostack/unittest/service_libs/nist_aes_kw/test_nist_aes_kw.h
index bd10e2470db..bbfdcdb5c52 100644
--- a/test/nanostack/unittest/service_libs/nist_aes_kw/test_nist_aes_kw.h
+++ b/test/nanostack/unittest/service_libs/nist_aes_kw/test_nist_aes_kw.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/random_early_detetction/main.cpp b/test/nanostack/unittest/service_libs/random_early_detetction/main.cpp
index 30d971fb0ac..845155fd27d 100644
--- a/test/nanostack/unittest/service_libs/random_early_detetction/main.cpp
+++ b/test/nanostack/unittest/service_libs/random_early_detetction/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/service_libs/random_early_detetction/randomEarlyDetection_test.cpp b/test/nanostack/unittest/service_libs/random_early_detetction/randomEarlyDetection_test.cpp
index 629ad2540e6..b37f5295a17 100644
--- a/test/nanostack/unittest/service_libs/random_early_detetction/randomEarlyDetection_test.cpp
+++ b/test/nanostack/unittest/service_libs/random_early_detetction/randomEarlyDetection_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/6lowpan_iphc_stub.c b/test/nanostack/unittest/stub/6lowpan_iphc_stub.c
index c86e60845f0..b4dc841c183 100644
--- a/test/nanostack/unittest/stub/6lowpan_iphc_stub.c
+++ b/test/nanostack/unittest/stub/6lowpan_iphc_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/6lowpan_mesh_stub.c b/test/nanostack/unittest/stub/6lowpan_mesh_stub.c
index ee36e018365..a017b5ee031 100644
--- a/test/nanostack/unittest/stub/6lowpan_mesh_stub.c
+++ b/test/nanostack/unittest/stub/6lowpan_mesh_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/adaptation_interface_stub.c b/test/nanostack/unittest/stub/adaptation_interface_stub.c
index 44279ff1778..e8f03e3111d 100644
--- a/test/nanostack/unittest/stub/adaptation_interface_stub.c
+++ b/test/nanostack/unittest/stub/adaptation_interface_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/adaptation_interface_stub.h b/test/nanostack/unittest/stub/adaptation_interface_stub.h
index b95d493c1f4..b5e16453980 100644
--- a/test/nanostack/unittest/stub/adaptation_interface_stub.h
+++ b/test/nanostack/unittest/stub/adaptation_interface_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/address_stub.c b/test/nanostack/unittest/stub/address_stub.c
index 0a2a9232098..379d98c4859 100644
--- a/test/nanostack/unittest/stub/address_stub.c
+++ b/test/nanostack/unittest/stub/address_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010-2018, Arm Limited and affiliates.
+ * Copyright (c) 2008, 2010-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/address_stub.h b/test/nanostack/unittest/stub/address_stub.h
index bee8f4f90f0..97e18f75ac4 100644
--- a/test/nanostack/unittest/stub/address_stub.h
+++ b/test/nanostack/unittest/stub/address_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/beacon_handler_stub.c b/test/nanostack/unittest/stub/beacon_handler_stub.c
index 67e1f75301d..c2a6533256e 100644
--- a/test/nanostack/unittest/stub/beacon_handler_stub.c
+++ b/test/nanostack/unittest/stub/beacon_handler_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/blacklist_stub.c b/test/nanostack/unittest/stub/blacklist_stub.c
index 858582b2d3d..3606cfbf289 100644
--- a/test/nanostack/unittest/stub/blacklist_stub.c
+++ b/test/nanostack/unittest/stub/blacklist_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/border_router_stub.c b/test/nanostack/unittest/stub/border_router_stub.c
index e03a16af71c..851d11346b3 100644
--- a/test/nanostack/unittest/stub/border_router_stub.c
+++ b/test/nanostack/unittest/stub/border_router_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017, Arm Limited and affiliates.
+ * Copyright (c) 2012-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/buffer_dyn_stub.c b/test/nanostack/unittest/stub/buffer_dyn_stub.c
index 500d31e87eb..82097ba30af 100644
--- a/test/nanostack/unittest/stub/buffer_dyn_stub.c
+++ b/test/nanostack/unittest/stub/buffer_dyn_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2011-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/buffer_dyn_stub.h b/test/nanostack/unittest/stub/buffer_dyn_stub.h
index a2ecad0e314..72ef94d1766 100644
--- a/test/nanostack/unittest/stub/buffer_dyn_stub.h
+++ b/test/nanostack/unittest/stub/buffer_dyn_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ccm_security_stub.c b/test/nanostack/unittest/stub/ccm_security_stub.c
index 7660f04b103..cb8942f6712 100644
--- a/test/nanostack/unittest/stub/ccm_security_stub.c
+++ b/test/nanostack/unittest/stub/ccm_security_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ccm_security_stub.h b/test/nanostack/unittest/stub/ccm_security_stub.h
index 4d53d01d837..7a27a51afe5 100644
--- a/test/nanostack/unittest/stub/ccm_security_stub.h
+++ b/test/nanostack/unittest/stub/ccm_security_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/channel_functions_stub.c b/test/nanostack/unittest/stub/channel_functions_stub.c
index e10d3a23112..d97c95ab785 100644
--- a/test/nanostack/unittest/stub/channel_functions_stub.c
+++ b/test/nanostack/unittest/stub/channel_functions_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/channel_functions_stub.h b/test/nanostack/unittest/stub/channel_functions_stub.h
index 1f3c7f6a4a7..098d79a96bb 100644
--- a/test/nanostack/unittest/stub/channel_functions_stub.h
+++ b/test/nanostack/unittest/stub/channel_functions_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Arm Limited and affiliates.
+ * Copyright (c) 2016, 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/channel_list_stub.c b/test/nanostack/unittest/stub/channel_list_stub.c
index 73f0decebc6..628139070cb 100644
--- a/test/nanostack/unittest/stub/channel_list_stub.c
+++ b/test/nanostack/unittest/stub/channel_list_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/channel_list_stub.h b/test/nanostack/unittest/stub/channel_list_stub.h
index e767ab0e4aa..c1c558902ee 100644
--- a/test/nanostack/unittest/stub/channel_list_stub.h
+++ b/test/nanostack/unittest/stub/channel_list_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/cipv6_fragmenter_stub.c b/test/nanostack/unittest/stub/cipv6_fragmenter_stub.c
index be9472001b6..3580fce7de4 100644
--- a/test/nanostack/unittest/stub/cipv6_fragmenter_stub.c
+++ b/test/nanostack/unittest/stub/cipv6_fragmenter_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/cipv6_fragmenter_stub.h b/test/nanostack/unittest/stub/cipv6_fragmenter_stub.h
index 5f630746317..4cfa6cca4f3 100644
--- a/test/nanostack/unittest/stub/cipv6_fragmenter_stub.h
+++ b/test/nanostack/unittest/stub/cipv6_fragmenter_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/coap_connection_handler_stub.c b/test/nanostack/unittest/stub/coap_connection_handler_stub.c
index 6ed51bda65a..f45dd76349c 100644
--- a/test/nanostack/unittest/stub/coap_connection_handler_stub.c
+++ b/test/nanostack/unittest/stub/coap_connection_handler_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/coap_connection_handler_stub.h b/test/nanostack/unittest/stub/coap_connection_handler_stub.h
index b61e5197f2b..ba35dfd036b 100644
--- a/test/nanostack/unittest/stub/coap_connection_handler_stub.h
+++ b/test/nanostack/unittest/stub/coap_connection_handler_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/coap_security_handler_stub.c b/test/nanostack/unittest/stub/coap_security_handler_stub.c
index fe31e5ceb04..0c68fa52f59 100644
--- a/test/nanostack/unittest/stub/coap_security_handler_stub.c
+++ b/test/nanostack/unittest/stub/coap_security_handler_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/coap_security_handler_stub.h b/test/nanostack/unittest/stub/coap_security_handler_stub.h
index 3057e0662bc..890496f71fd 100644
--- a/test/nanostack/unittest/stub/coap_security_handler_stub.h
+++ b/test/nanostack/unittest/stub/coap_security_handler_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/coap_service_api_stub.c b/test/nanostack/unittest/stub/coap_service_api_stub.c
index 47aefc7481e..123748c158c 100644
--- a/test/nanostack/unittest/stub/coap_service_api_stub.c
+++ b/test/nanostack/unittest/stub/coap_service_api_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/coap_service_api_stub.h b/test/nanostack/unittest/stub/coap_service_api_stub.h
index 1a4f4af03a3..3b5ff1745ee 100644
--- a/test/nanostack/unittest/stub/coap_service_api_stub.h
+++ b/test/nanostack/unittest/stub/coap_service_api_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/common_functions_stub.c b/test/nanostack/unittest/stub/common_functions_stub.c
index 16f80287f44..107382186e5 100644
--- a/test/nanostack/unittest/stub/common_functions_stub.c
+++ b/test/nanostack/unittest/stub/common_functions_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/common_functions_stub.h b/test/nanostack/unittest/stub/common_functions_stub.h
index ede49158ddb..a1e1764e75e 100644
--- a/test/nanostack/unittest/stub/common_functions_stub.h
+++ b/test/nanostack/unittest/stub/common_functions_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/crc_stub.c b/test/nanostack/unittest/stub/crc_stub.c
index e16ff4e8b17..ed992405605 100644
--- a/test/nanostack/unittest/stub/crc_stub.c
+++ b/test/nanostack/unittest/stub/crc_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/cudp_stub.c b/test/nanostack/unittest/stub/cudp_stub.c
index 6aad0eda9eb..0144a3e89fc 100644
--- a/test/nanostack/unittest/stub/cudp_stub.c
+++ b/test/nanostack/unittest/stub/cudp_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/dhcp_service_api_stub.c b/test/nanostack/unittest/stub/dhcp_service_api_stub.c
index bb43a188991..d6d818ce258 100644
--- a/test/nanostack/unittest/stub/dhcp_service_api_stub.c
+++ b/test/nanostack/unittest/stub/dhcp_service_api_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/dhcpv6_client_stub.c b/test/nanostack/unittest/stub/dhcpv6_client_stub.c
index 8b6411ef527..8ab205f555e 100644
--- a/test/nanostack/unittest/stub/dhcpv6_client_stub.c
+++ b/test/nanostack/unittest/stub/dhcpv6_client_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018, Arm Limited and affiliates.
+ * Copyright (c) 2013-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/dhcpv6_server_service_stub.c b/test/nanostack/unittest/stub/dhcpv6_server_service_stub.c
index fed8d876398..8c225af77ab 100644
--- a/test/nanostack/unittest/stub/dhcpv6_server_service_stub.c
+++ b/test/nanostack/unittest/stub/dhcpv6_server_service_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/eap_protocol_stub.c b/test/nanostack/unittest/stub/eap_protocol_stub.c
index 9d59ff5a335..8073cbfb56f 100644
--- a/test/nanostack/unittest/stub/eap_protocol_stub.c
+++ b/test/nanostack/unittest/stub/eap_protocol_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/eapol_helper_stub.c b/test/nanostack/unittest/stub/eapol_helper_stub.c
index 98adca1a11a..e9cc851ea9e 100644
--- a/test/nanostack/unittest/stub/eapol_helper_stub.c
+++ b/test/nanostack/unittest/stub/eapol_helper_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ecc_stub.c b/test/nanostack/unittest/stub/ecc_stub.c
index c936c059061..fa82af93114 100644
--- a/test/nanostack/unittest/stub/ecc_stub.c
+++ b/test/nanostack/unittest/stub/ecc_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ecdsa_stub.c b/test/nanostack/unittest/stub/ecdsa_stub.c
index 5b196bf151f..e3823aad56e 100644
--- a/test/nanostack/unittest/stub/ecdsa_stub.c
+++ b/test/nanostack/unittest/stub/ecdsa_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/etx_stub.c b/test/nanostack/unittest/stub/etx_stub.c
index 279b6c843d3..75d10c80c64 100644
--- a/test/nanostack/unittest/stub/etx_stub.c
+++ b/test/nanostack/unittest/stub/etx_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/event_stub.c b/test/nanostack/unittest/stub/event_stub.c
index a5c3a40e900..52c55a0bc84 100644
--- a/test/nanostack/unittest/stub/event_stub.c
+++ b/test/nanostack/unittest/stub/event_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/event_stub.h b/test/nanostack/unittest/stub/event_stub.h
index 3339cd1a6c8..276f71e35d7 100644
--- a/test/nanostack/unittest/stub/event_stub.h
+++ b/test/nanostack/unittest/stub/event_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_callbacks_stub.c b/test/nanostack/unittest/stub/fhss_callbacks_stub.c
index 0cff31f9c52..e2a9222c72c 100644
--- a/test/nanostack/unittest/stub/fhss_callbacks_stub.c
+++ b/test/nanostack/unittest/stub/fhss_callbacks_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_callbacks_stub.h b/test/nanostack/unittest/stub/fhss_callbacks_stub.h
index 5b59fec73e7..758f61bb9df 100644
--- a/test/nanostack/unittest/stub/fhss_callbacks_stub.h
+++ b/test/nanostack/unittest/stub/fhss_callbacks_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_channel_stub.c b/test/nanostack/unittest/stub/fhss_channel_stub.c
index 83374fe4b21..15e3f433f5b 100644
--- a/test/nanostack/unittest/stub/fhss_channel_stub.c
+++ b/test/nanostack/unittest/stub/fhss_channel_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_channel_stub.h b/test/nanostack/unittest/stub/fhss_channel_stub.h
index 09e1564b01d..c266cff100b 100644
--- a/test/nanostack/unittest/stub/fhss_channel_stub.h
+++ b/test/nanostack/unittest/stub/fhss_channel_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_common_stub.c b/test/nanostack/unittest/stub/fhss_common_stub.c
index b5b7bad32a5..8a84f3c232d 100644
--- a/test/nanostack/unittest/stub/fhss_common_stub.c
+++ b/test/nanostack/unittest/stub/fhss_common_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_common_stub.h b/test/nanostack/unittest/stub/fhss_common_stub.h
index 797c9265ca0..a61d2aeaa5e 100644
--- a/test/nanostack/unittest/stub/fhss_common_stub.h
+++ b/test/nanostack/unittest/stub/fhss_common_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_config_stub.c b/test/nanostack/unittest/stub/fhss_config_stub.c
index 765635a82a8..3458d0cad12 100644
--- a/test/nanostack/unittest/stub/fhss_config_stub.c
+++ b/test/nanostack/unittest/stub/fhss_config_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_config_stub.h b/test/nanostack/unittest/stub/fhss_config_stub.h
index 50e29701e0a..3a15bdc7d36 100644
--- a/test/nanostack/unittest/stub/fhss_config_stub.h
+++ b/test/nanostack/unittest/stub/fhss_config_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_platform_stub.c b/test/nanostack/unittest/stub/fhss_platform_stub.c
index a30b3a10fd0..9823c126598 100644
--- a/test/nanostack/unittest/stub/fhss_platform_stub.c
+++ b/test/nanostack/unittest/stub/fhss_platform_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_platform_stub.h b/test/nanostack/unittest/stub/fhss_platform_stub.h
index 817ccad7efb..8d15fcc3069 100644
--- a/test/nanostack/unittest/stub/fhss_platform_stub.h
+++ b/test/nanostack/unittest/stub/fhss_platform_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_statistics_stub.c b/test/nanostack/unittest/stub/fhss_statistics_stub.c
index 709227b29c7..337d849e3b2 100644
--- a/test/nanostack/unittest/stub/fhss_statistics_stub.c
+++ b/test/nanostack/unittest/stub/fhss_statistics_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_stub.c b/test/nanostack/unittest/stub/fhss_stub.c
index 86c8cd6c1e8..4cd964d5ddb 100644
--- a/test/nanostack/unittest/stub/fhss_stub.c
+++ b/test/nanostack/unittest/stub/fhss_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_stub.h b/test/nanostack/unittest/stub/fhss_stub.h
index 13f1cb2a196..a643b703ccd 100644
--- a/test/nanostack/unittest/stub/fhss_stub.h
+++ b/test/nanostack/unittest/stub/fhss_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_ws_stub.c b/test/nanostack/unittest/stub/fhss_ws_stub.c
index 8433e9ffd7a..996fe10d9a4 100644
--- a/test/nanostack/unittest/stub/fhss_ws_stub.c
+++ b/test/nanostack/unittest/stub/fhss_ws_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fhss_ws_stub.h b/test/nanostack/unittest/stub/fhss_ws_stub.h
index 4fb5d8c19a5..5c09cdd1a0b 100644
--- a/test/nanostack/unittest/stub/fhss_ws_stub.h
+++ b/test/nanostack/unittest/stub/fhss_ws_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fnet_mdns_stub.c b/test/nanostack/unittest/stub/fnet_mdns_stub.c
index 366ea479bc7..76531a8e479 100644
--- a/test/nanostack/unittest/stub/fnet_mdns_stub.c
+++ b/test/nanostack/unittest/stub/fnet_mdns_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fnet_mdns_stub.h b/test/nanostack/unittest/stub/fnet_mdns_stub.h
index 5b1f92d4db0..97e29175996 100644
--- a/test/nanostack/unittest/stub/fnet_mdns_stub.h
+++ b/test/nanostack/unittest/stub/fnet_mdns_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fnet_poll_stub.c b/test/nanostack/unittest/stub/fnet_poll_stub.c
index ef6f60f8ca9..2d34d96e207 100644
--- a/test/nanostack/unittest/stub/fnet_poll_stub.c
+++ b/test/nanostack/unittest/stub/fnet_poll_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/fnv_hash_stub.c b/test/nanostack/unittest/stub/fnv_hash_stub.c
index d2c37f47ead..b79ac9ad9e6 100644
--- a/test/nanostack/unittest/stub/fnv_hash_stub.c
+++ b/test/nanostack/unittest/stub/fnv_hash_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/hmac_stub.c b/test/nanostack/unittest/stub/hmac_stub.c
index ecb69de0aaa..a01cc1a5c11 100644
--- a/test/nanostack/unittest/stub/hmac_stub.c
+++ b/test/nanostack/unittest/stub/hmac_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/hmac_stub.h b/test/nanostack/unittest/stub/hmac_stub.h
index 58a63830018..8acb902ef4a 100644
--- a/test/nanostack/unittest/stub/hmac_stub.h
+++ b/test/nanostack/unittest/stub/hmac_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/icmpv6_prefix_stub.c b/test/nanostack/unittest/stub/icmpv6_prefix_stub.c
index 07e11efd72c..0e75117a018 100644
--- a/test/nanostack/unittest/stub/icmpv6_prefix_stub.c
+++ b/test/nanostack/unittest/stub/icmpv6_prefix_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/icmpv6_radv_stub.c b/test/nanostack/unittest/stub/icmpv6_radv_stub.c
index 2c0e35c4b4a..e995be48a63 100644
--- a/test/nanostack/unittest/stub/icmpv6_radv_stub.c
+++ b/test/nanostack/unittest/stub/icmpv6_radv_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/icmpv6_stub.c b/test/nanostack/unittest/stub/icmpv6_stub.c
index 89d5613d9e7..3b9da3f6ee0 100644
--- a/test/nanostack/unittest/stub/icmpv6_stub.c
+++ b/test/nanostack/unittest/stub/icmpv6_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ip6tos_stub.c b/test/nanostack/unittest/stub/ip6tos_stub.c
index 526e9946178..9f0f77457ec 100644
--- a/test/nanostack/unittest/stub/ip6tos_stub.c
+++ b/test/nanostack/unittest/stub/ip6tos_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ip_fsc_stub.c b/test/nanostack/unittest/stub/ip_fsc_stub.c
index 8baf1867cb4..43a5c176fad 100644
--- a/test/nanostack/unittest/stub/ip_fsc_stub.c
+++ b/test/nanostack/unittest/stub/ip_fsc_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/iphc_compress_stub.c b/test/nanostack/unittest/stub/iphc_compress_stub.c
index 1cf4f51b0e2..9c9be527186 100644
--- a/test/nanostack/unittest/stub/iphc_compress_stub.c
+++ b/test/nanostack/unittest/stub/iphc_compress_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/iphc_decompress_stub.c b/test/nanostack/unittest/stub/iphc_decompress_stub.c
index 446716f6052..706a45ffc0c 100644
--- a/test/nanostack/unittest/stub/iphc_decompress_stub.c
+++ b/test/nanostack/unittest/stub/iphc_decompress_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ipv6_flow_stub.c b/test/nanostack/unittest/stub/ipv6_flow_stub.c
index db549f66d8e..91780a55c89 100644
--- a/test/nanostack/unittest/stub/ipv6_flow_stub.c
+++ b/test/nanostack/unittest/stub/ipv6_flow_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ipv6_fragmentation_stub.c b/test/nanostack/unittest/stub/ipv6_fragmentation_stub.c
index 73ddf98eda4..cfe81565048 100644
--- a/test/nanostack/unittest/stub/ipv6_fragmentation_stub.c
+++ b/test/nanostack/unittest/stub/ipv6_fragmentation_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ipv6_resolution_stub.c b/test/nanostack/unittest/stub/ipv6_resolution_stub.c
index 3a9a7df0ff9..6b6909f09d4 100644
--- a/test/nanostack/unittest/stub/ipv6_resolution_stub.c
+++ b/test/nanostack/unittest/stub/ipv6_resolution_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ipv6_resolution_stub.h b/test/nanostack/unittest/stub/ipv6_resolution_stub.h
index 11b4670f1fa..b8a84d2c443 100644
--- a/test/nanostack/unittest/stub/ipv6_resolution_stub.h
+++ b/test/nanostack/unittest/stub/ipv6_resolution_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ipv6_routing_table_stub.c b/test/nanostack/unittest/stub/ipv6_routing_table_stub.c
index 60522070af4..1aa08d1894a 100644
--- a/test/nanostack/unittest/stub/ipv6_routing_table_stub.c
+++ b/test/nanostack/unittest/stub/ipv6_routing_table_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2012-2017, 2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ipv6_routing_table_stub.h b/test/nanostack/unittest/stub/ipv6_routing_table_stub.h
index 5a8801d6759..9d1407b48bb 100644
--- a/test/nanostack/unittest/stub/ipv6_routing_table_stub.h
+++ b/test/nanostack/unittest/stub/ipv6_routing_table_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ipv6_stub.c b/test/nanostack/unittest/stub/ipv6_stub.c
index bfe3f346431..7b854640b77 100644
--- a/test/nanostack/unittest/stub/ipv6_stub.c
+++ b/test/nanostack/unittest/stub/ipv6_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/isqrt_stub.c b/test/nanostack/unittest/stub/isqrt_stub.c
index 1c9a56370c4..69f5ecb720f 100644
--- a/test/nanostack/unittest/stub/isqrt_stub.c
+++ b/test/nanostack/unittest/stub/isqrt_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/libDHCPv6_server_stub.c b/test/nanostack/unittest/stub/libDHCPv6_server_stub.c
index 63f485055e8..47e97e5073f 100644
--- a/test/nanostack/unittest/stub/libDHCPv6_server_stub.c
+++ b/test/nanostack/unittest/stub/libDHCPv6_server_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/libDHCPv6_stub.c b/test/nanostack/unittest/stub/libDHCPv6_stub.c
index a3143d1c13c..12a377849b7 100644
--- a/test/nanostack/unittest/stub/libDHCPv6_stub.c
+++ b/test/nanostack/unittest/stub/libDHCPv6_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/load_balance_stub.c b/test/nanostack/unittest/stub/load_balance_stub.c
index b637add36fd..a1f9448807e 100644
--- a/test/nanostack/unittest/stub/load_balance_stub.c
+++ b/test/nanostack/unittest/stub/load_balance_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/lowpan_context_stub.c b/test/nanostack/unittest/stub/lowpan_context_stub.c
index 6b527460173..e3e5992d021 100644
--- a/test/nanostack/unittest/stub/lowpan_context_stub.c
+++ b/test/nanostack/unittest/stub/lowpan_context_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_cca_threshold_stub.c b/test/nanostack/unittest/stub/mac_cca_threshold_stub.c
index e71c16680a6..a1e346972a0 100644
--- a/test/nanostack/unittest/stub/mac_cca_threshold_stub.c
+++ b/test/nanostack/unittest/stub/mac_cca_threshold_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_data_poll_stub.c b/test/nanostack/unittest/stub/mac_data_poll_stub.c
index 9e50c8d7e45..cd9a149f855 100644
--- a/test/nanostack/unittest/stub/mac_data_poll_stub.c
+++ b/test/nanostack/unittest/stub/mac_data_poll_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_filter_stub.c b/test/nanostack/unittest/stub/mac_filter_stub.c
index 7bba4423be4..3377d5eeff0 100644
--- a/test/nanostack/unittest/stub/mac_filter_stub.c
+++ b/test/nanostack/unittest/stub/mac_filter_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_filter_stub.h b/test/nanostack/unittest/stub/mac_filter_stub.h
index 7e19e2d047c..ce98e48b678 100644
--- a/test/nanostack/unittest/stub/mac_filter_stub.h
+++ b/test/nanostack/unittest/stub/mac_filter_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_header_helper_functions_stub.c b/test/nanostack/unittest/stub/mac_header_helper_functions_stub.c
index 5efa3a29cdd..8c67a513b10 100644
--- a/test/nanostack/unittest/stub/mac_header_helper_functions_stub.c
+++ b/test/nanostack/unittest/stub/mac_header_helper_functions_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_header_helper_functions_stub.h b/test/nanostack/unittest/stub/mac_header_helper_functions_stub.h
index 252b259ee00..1b460ce7cea 100644
--- a/test/nanostack/unittest/stub/mac_header_helper_functions_stub.h
+++ b/test/nanostack/unittest/stub/mac_header_helper_functions_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_helper_stub.c b/test/nanostack/unittest/stub/mac_helper_stub.c
index 9643e9126d7..544b2a9511e 100644
--- a/test/nanostack/unittest/stub/mac_helper_stub.c
+++ b/test/nanostack/unittest/stub/mac_helper_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_helper_stub.h b/test/nanostack/unittest/stub/mac_helper_stub.h
index 3fe99d47f7d..a7a16ca1d62 100644
--- a/test/nanostack/unittest/stub/mac_helper_stub.h
+++ b/test/nanostack/unittest/stub/mac_helper_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_ie_lib_stub.c b/test/nanostack/unittest/stub/mac_ie_lib_stub.c
index f94c9358655..852564fd81a 100644
--- a/test/nanostack/unittest/stub/mac_ie_lib_stub.c
+++ b/test/nanostack/unittest/stub/mac_ie_lib_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_ie_lib_stub.h b/test/nanostack/unittest/stub/mac_ie_lib_stub.h
index 2a8653556e8..d152b87a258 100644
--- a/test/nanostack/unittest/stub/mac_ie_lib_stub.h
+++ b/test/nanostack/unittest/stub/mac_ie_lib_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_indirect_data_stub.c b/test/nanostack/unittest/stub/mac_indirect_data_stub.c
index 7c58dff68de..fe92288614e 100644
--- a/test/nanostack/unittest/stub/mac_indirect_data_stub.c
+++ b/test/nanostack/unittest/stub/mac_indirect_data_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_indirect_data_stub.h b/test/nanostack/unittest/stub/mac_indirect_data_stub.h
index d230ffaeb40..11ab48f6ea2 100644
--- a/test/nanostack/unittest/stub/mac_indirect_data_stub.h
+++ b/test/nanostack/unittest/stub/mac_indirect_data_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_mcps_sap_stub.c b/test/nanostack/unittest/stub/mac_mcps_sap_stub.c
index 0e150302222..fb24232a845 100644
--- a/test/nanostack/unittest/stub/mac_mcps_sap_stub.c
+++ b/test/nanostack/unittest/stub/mac_mcps_sap_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_mcps_sap_stub.h b/test/nanostack/unittest/stub/mac_mcps_sap_stub.h
index 36340e8e465..947192feefb 100644
--- a/test/nanostack/unittest/stub/mac_mcps_sap_stub.h
+++ b/test/nanostack/unittest/stub/mac_mcps_sap_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_mlme_stub.c b/test/nanostack/unittest/stub/mac_mlme_stub.c
index 62b8f42b3c3..e33359a2e09 100644
--- a/test/nanostack/unittest/stub/mac_mlme_stub.c
+++ b/test/nanostack/unittest/stub/mac_mlme_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_mlme_stub.h b/test/nanostack/unittest/stub/mac_mlme_stub.h
index b72ab588a85..9838fe3dd94 100644
--- a/test/nanostack/unittest/stub/mac_mlme_stub.h
+++ b/test/nanostack/unittest/stub/mac_mlme_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_neighbor_table_stub.c b/test/nanostack/unittest/stub/mac_neighbor_table_stub.c
index ee933ad398e..cc37d3c144e 100644
--- a/test/nanostack/unittest/stub/mac_neighbor_table_stub.c
+++ b/test/nanostack/unittest/stub/mac_neighbor_table_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_neighbor_table_stub.h b/test/nanostack/unittest/stub/mac_neighbor_table_stub.h
index 53af8d70fe2..b6ab610ab0e 100644
--- a/test/nanostack/unittest/stub/mac_neighbor_table_stub.h
+++ b/test/nanostack/unittest/stub/mac_neighbor_table_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_pairwise_key_stub.c b/test/nanostack/unittest/stub/mac_pairwise_key_stub.c
index ea42aee450a..82bdedef8e1 100644
--- a/test/nanostack/unittest/stub/mac_pairwise_key_stub.c
+++ b/test/nanostack/unittest/stub/mac_pairwise_key_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_pd_sap_stub.c b/test/nanostack/unittest/stub/mac_pd_sap_stub.c
index 234aa57bc6e..70d8a4ca0c3 100644
--- a/test/nanostack/unittest/stub/mac_pd_sap_stub.c
+++ b/test/nanostack/unittest/stub/mac_pd_sap_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_response_handler_stub.c b/test/nanostack/unittest/stub/mac_response_handler_stub.c
index a6cb9ed2a7f..a71e794d318 100644
--- a/test/nanostack/unittest/stub/mac_response_handler_stub.c
+++ b/test/nanostack/unittest/stub/mac_response_handler_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_security_interface_stub.c b/test/nanostack/unittest/stub/mac_security_interface_stub.c
index 2c7a451fad6..be5adb49212 100644
--- a/test/nanostack/unittest/stub/mac_security_interface_stub.c
+++ b/test/nanostack/unittest/stub/mac_security_interface_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_security_mib_stub.c b/test/nanostack/unittest/stub/mac_security_mib_stub.c
index aef3c40d91e..49df3240225 100644
--- a/test/nanostack/unittest/stub/mac_security_mib_stub.c
+++ b/test/nanostack/unittest/stub/mac_security_mib_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_security_mib_stub.h b/test/nanostack/unittest/stub/mac_security_mib_stub.h
index 0ca2f3e7036..804f7946b50 100644
--- a/test/nanostack/unittest/stub/mac_security_mib_stub.h
+++ b/test/nanostack/unittest/stub/mac_security_mib_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mac_timer_stub.c b/test/nanostack/unittest/stub/mac_timer_stub.c
index bc88bc46bcc..91df2633de1 100644
--- a/test/nanostack/unittest/stub/mac_timer_stub.c
+++ b/test/nanostack/unittest/stub/mac_timer_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mbed_trace_stub.c b/test/nanostack/unittest/stub/mbed_trace_stub.c
index f4b26cb4807..ccd1678b80c 100644
--- a/test/nanostack/unittest/stub/mbed_trace_stub.c
+++ b/test/nanostack/unittest/stub/mbed_trace_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mbedtls_stub.c b/test/nanostack/unittest/stub/mbedtls_stub.c
index dd955a3ef67..5fd0a6f6872 100644
--- a/test/nanostack/unittest/stub/mbedtls_stub.c
+++ b/test/nanostack/unittest/stub/mbedtls_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mbedtls_stub.h b/test/nanostack/unittest/stub/mbedtls_stub.h
index 4bba9f03807..09984eb25e0 100644
--- a/test/nanostack/unittest/stub/mbedtls_stub.h
+++ b/test/nanostack/unittest/stub/mbedtls_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mesh_stub.c b/test/nanostack/unittest/stub/mesh_stub.c
index 3de4b9b7b74..8d715948ca1 100644
--- a/test/nanostack/unittest/stub/mesh_stub.c
+++ b/test/nanostack/unittest/stub/mesh_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mesh_stub.h b/test/nanostack/unittest/stub/mesh_stub.h
index 670facb1ffd..fbb6fd06b96 100644
--- a/test/nanostack/unittest/stub/mesh_stub.h
+++ b/test/nanostack/unittest/stub/mesh_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mld_stub.c b/test/nanostack/unittest/stub/mld_stub.c
index 6230a71f504..6af42b69934 100644
--- a/test/nanostack/unittest/stub/mld_stub.c
+++ b/test/nanostack/unittest/stub/mld_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mle_service_buffer_stub.c b/test/nanostack/unittest/stub/mle_service_buffer_stub.c
index fe60904176a..331f64234ff 100644
--- a/test/nanostack/unittest/stub/mle_service_buffer_stub.c
+++ b/test/nanostack/unittest/stub/mle_service_buffer_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mle_service_frame_counter_table_stub.c b/test/nanostack/unittest/stub/mle_service_frame_counter_table_stub.c
index 6e7afdc2e8f..d8c728dec09 100644
--- a/test/nanostack/unittest/stub/mle_service_frame_counter_table_stub.c
+++ b/test/nanostack/unittest/stub/mle_service_frame_counter_table_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mle_service_frame_counter_table_stub.h b/test/nanostack/unittest/stub/mle_service_frame_counter_table_stub.h
index b9667c1584e..f37f89544bf 100644
--- a/test/nanostack/unittest/stub/mle_service_frame_counter_table_stub.h
+++ b/test/nanostack/unittest/stub/mle_service_frame_counter_table_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mle_service_stub.c b/test/nanostack/unittest/stub/mle_service_stub.c
index ef6ee7d8168..948e50785b3 100644
--- a/test/nanostack/unittest/stub/mle_service_stub.c
+++ b/test/nanostack/unittest/stub/mle_service_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mle_service_stub.h b/test/nanostack/unittest/stub/mle_service_stub.h
index 44ccfc3d73f..28e2812580e 100644
--- a/test/nanostack/unittest/stub/mle_service_stub.h
+++ b/test/nanostack/unittest/stub/mle_service_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mle_stub.c b/test/nanostack/unittest/stub/mle_stub.c
index 5ea33f84599..13d2e62e192 100644
--- a/test/nanostack/unittest/stub/mle_stub.c
+++ b/test/nanostack/unittest/stub/mle_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mle_stub.h b/test/nanostack/unittest/stub/mle_stub.h
index 6aceac2ae3d..12f8b8d7291 100644
--- a/test/nanostack/unittest/stub/mle_stub.h
+++ b/test/nanostack/unittest/stub/mle_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mle_tlv_stub.c b/test/nanostack/unittest/stub/mle_tlv_stub.c
index 27915b70caa..302a2a7de0b 100644
--- a/test/nanostack/unittest/stub/mle_tlv_stub.c
+++ b/test/nanostack/unittest/stub/mle_tlv_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mle_tlv_stub.h b/test/nanostack/unittest/stub/mle_tlv_stub.h
index 206a9c700de..1a59c9c63da 100644
--- a/test/nanostack/unittest/stub/mle_tlv_stub.h
+++ b/test/nanostack/unittest/stub/mle_tlv_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mpl_stub.c b/test/nanostack/unittest/stub/mpl_stub.c
index 33168d35b69..1e00c1cd39f 100644
--- a/test/nanostack/unittest/stub/mpl_stub.c
+++ b/test/nanostack/unittest/stub/mpl_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mpl_stub.h b/test/nanostack/unittest/stub/mpl_stub.h
index 8fe0f872864..0b7562b007a 100644
--- a/test/nanostack/unittest/stub/mpl_stub.h
+++ b/test/nanostack/unittest/stub/mpl_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/multicast_api_stub.c b/test/nanostack/unittest/stub/multicast_api_stub.c
index 2df531a09dc..3cc96a6cfde 100644
--- a/test/nanostack/unittest/stub/multicast_api_stub.c
+++ b/test/nanostack/unittest/stub/multicast_api_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/nd_proxy.c b/test/nanostack/unittest/stub/nd_proxy.c
index 909e4a1adbe..cc760dd47b2 100644
--- a/test/nanostack/unittest/stub/nd_proxy.c
+++ b/test/nanostack/unittest/stub/nd_proxy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/nd_proxy_stub.c b/test/nanostack/unittest/stub/nd_proxy_stub.c
index 22fb07a31cc..8f074a5f770 100644
--- a/test/nanostack/unittest/stub/nd_proxy_stub.c
+++ b/test/nanostack/unittest/stub/nd_proxy_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/nd_router_object_stub.c b/test/nanostack/unittest/stub/nd_router_object_stub.c
index 35b9400f8e3..5f5189cd737 100644
--- a/test/nanostack/unittest/stub/nd_router_object_stub.c
+++ b/test/nanostack/unittest/stub/nd_router_object_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/neighbor_cache_stub.c b/test/nanostack/unittest/stub/neighbor_cache_stub.c
index 2fdde0a81dc..3e6ad16df9f 100644
--- a/test/nanostack/unittest/stub/neighbor_cache_stub.c
+++ b/test/nanostack/unittest/stub/neighbor_cache_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/net_dns_stub.c b/test/nanostack/unittest/stub/net_dns_stub.c
index 15e508ea5fc..7f7c9173e29 100644
--- a/test/nanostack/unittest/stub/net_dns_stub.c
+++ b/test/nanostack/unittest/stub/net_dns_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/net_load_balance_stub.c b/test/nanostack/unittest/stub/net_load_balance_stub.c
index ca67fb8fff8..08cf51a9297 100644
--- a/test/nanostack/unittest/stub/net_load_balance_stub.c
+++ b/test/nanostack/unittest/stub/net_load_balance_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/net_mle_stub.c b/test/nanostack/unittest/stub/net_mle_stub.c
index ebe0fa68da0..3e9ef0d7c92 100644
--- a/test/nanostack/unittest/stub/net_mle_stub.c
+++ b/test/nanostack/unittest/stub/net_mle_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/net_rpl_stub.c b/test/nanostack/unittest/stub/net_rpl_stub.c
index aa7fbcd0c19..533b8e3ef3f 100644
--- a/test/nanostack/unittest/stub/net_rpl_stub.c
+++ b/test/nanostack/unittest/stub/net_rpl_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/net_stub.c b/test/nanostack/unittest/stub/net_stub.c
index aba5f3f4392..6bab148cf18 100644
--- a/test/nanostack/unittest/stub/net_stub.c
+++ b/test/nanostack/unittest/stub/net_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/network_lib_stub.c b/test/nanostack/unittest/stub/network_lib_stub.c
index 64902aa04ec..2a4d4ba34b5 100644
--- a/test/nanostack/unittest/stub/network_lib_stub.c
+++ b/test/nanostack/unittest/stub/network_lib_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ns_file_system_stub.c b/test/nanostack/unittest/stub/ns_file_system_stub.c
index 86f69e54b0e..ef44643eae7 100644
--- a/test/nanostack/unittest/stub/ns_file_system_stub.c
+++ b/test/nanostack/unittest/stub/ns_file_system_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ns_list_stub.c b/test/nanostack/unittest/stub/ns_list_stub.c
index 7c3f6da4066..0914c947a73 100644
--- a/test/nanostack/unittest/stub/ns_list_stub.c
+++ b/test/nanostack/unittest/stub/ns_list_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ns_monitor_stub.c b/test/nanostack/unittest/stub/ns_monitor_stub.c
index 6b9b06ad9a2..4d5c267a7da 100644
--- a/test/nanostack/unittest/stub/ns_monitor_stub.c
+++ b/test/nanostack/unittest/stub/ns_monitor_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ns_monitor_stub.h b/test/nanostack/unittest/stub/ns_monitor_stub.h
index f3fdc22c59f..3c4d21b48a1 100644
--- a/test/nanostack/unittest/stub/ns_monitor_stub.h
+++ b/test/nanostack/unittest/stub/ns_monitor_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ns_sha256_stub.c b/test/nanostack/unittest/stub/ns_sha256_stub.c
index d9c42241575..6cafbc26068 100644
--- a/test/nanostack/unittest/stub/ns_sha256_stub.c
+++ b/test/nanostack/unittest/stub/ns_sha256_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ns_timer_stub.c b/test/nanostack/unittest/stub/ns_timer_stub.c
index ec4467966a5..e7e04daa2a5 100644
--- a/test/nanostack/unittest/stub/ns_timer_stub.c
+++ b/test/nanostack/unittest/stub/ns_timer_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ns_timer_stub.h b/test/nanostack/unittest/stub/ns_timer_stub.h
index 8dd75c177ec..fdbbba43e89 100644
--- a/test/nanostack/unittest/stub/ns_timer_stub.h
+++ b/test/nanostack/unittest/stub/ns_timer_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/nsdynmemLIB_stub.c b/test/nanostack/unittest/stub/nsdynmemLIB_stub.c
index c78e4e14f68..26586853d47 100644
--- a/test/nanostack/unittest/stub/nsdynmemLIB_stub.c
+++ b/test/nanostack/unittest/stub/nsdynmemLIB_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/nsdynmemLIB_stub.h b/test/nanostack/unittest/stub/nsdynmemLIB_stub.h
index e0b848755b0..5d4b460d290 100644
--- a/test/nanostack/unittest/stub/nsdynmemLIB_stub.h
+++ b/test/nanostack/unittest/stub/nsdynmemLIB_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/nwk_nvm_stub.c b/test/nanostack/unittest/stub/nwk_nvm_stub.c
index 2bb524bcac7..244c0808fa1 100644
--- a/test/nanostack/unittest/stub/nwk_nvm_stub.c
+++ b/test/nanostack/unittest/stub/nwk_nvm_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/pan_blacklist_stub.c b/test/nanostack/unittest/stub/pan_blacklist_stub.c
index 4aa82d5388c..0c0bbc055e8 100644
--- a/test/nanostack/unittest/stub/pan_blacklist_stub.c
+++ b/test/nanostack/unittest/stub/pan_blacklist_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/pana_avp_stub.c b/test/nanostack/unittest/stub/pana_avp_stub.c
index 086d6f2a527..ffe0b037f45 100644
--- a/test/nanostack/unittest/stub/pana_avp_stub.c
+++ b/test/nanostack/unittest/stub/pana_avp_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/pana_client_stub.c b/test/nanostack/unittest/stub/pana_client_stub.c
index 5904c435134..d1a4b881027 100644
--- a/test/nanostack/unittest/stub/pana_client_stub.c
+++ b/test/nanostack/unittest/stub/pana_client_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/pana_eap_stub.c b/test/nanostack/unittest/stub/pana_eap_stub.c
index cc1e1abc998..33e59b6367d 100644
--- a/test/nanostack/unittest/stub/pana_eap_stub.c
+++ b/test/nanostack/unittest/stub/pana_eap_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/pana_header_stub.c b/test/nanostack/unittest/stub/pana_header_stub.c
index 81a9bf1f0bc..912bdce9c7b 100644
--- a/test/nanostack/unittest/stub/pana_header_stub.c
+++ b/test/nanostack/unittest/stub/pana_header_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/pana_relay_table_stub.c b/test/nanostack/unittest/stub/pana_relay_table_stub.c
index 8478c6c3a09..d0f96d042f9 100644
--- a/test/nanostack/unittest/stub/pana_relay_table_stub.c
+++ b/test/nanostack/unittest/stub/pana_relay_table_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/pana_server_stub.c b/test/nanostack/unittest/stub/pana_server_stub.c
index 518d35fc6e8..db6abd6637e 100644
--- a/test/nanostack/unittest/stub/pana_server_stub.c
+++ b/test/nanostack/unittest/stub/pana_server_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/pana_stub.c b/test/nanostack/unittest/stub/pana_stub.c
index b8347aaa000..f61cd6ef41e 100644
--- a/test/nanostack/unittest/stub/pana_stub.c
+++ b/test/nanostack/unittest/stub/pana_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/platform_nvm_stub.c b/test/nanostack/unittest/stub/platform_nvm_stub.c
index 7919fdccd02..ef1fa9020b3 100644
--- a/test/nanostack/unittest/stub/platform_nvm_stub.c
+++ b/test/nanostack/unittest/stub/platform_nvm_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/platform_stub.c b/test/nanostack/unittest/stub/platform_stub.c
index fd3539391ef..1910c470101 100644
--- a/test/nanostack/unittest/stub/platform_stub.c
+++ b/test/nanostack/unittest/stub/platform_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/protocol_6lowpan_bootstrap_stub.c b/test/nanostack/unittest/stub/protocol_6lowpan_bootstrap_stub.c
index 78b7b927878..5703af52734 100644
--- a/test/nanostack/unittest/stub/protocol_6lowpan_bootstrap_stub.c
+++ b/test/nanostack/unittest/stub/protocol_6lowpan_bootstrap_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/protocol_6lowpan_bootstrap_stub.h b/test/nanostack/unittest/stub/protocol_6lowpan_bootstrap_stub.h
index f88836907b3..a16bb4d1d50 100644
--- a/test/nanostack/unittest/stub/protocol_6lowpan_bootstrap_stub.h
+++ b/test/nanostack/unittest/stub/protocol_6lowpan_bootstrap_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/protocol_6lowpan_interface_stub.c b/test/nanostack/unittest/stub/protocol_6lowpan_interface_stub.c
index 2ba3dd2208d..2ab3daa0dd5 100644
--- a/test/nanostack/unittest/stub/protocol_6lowpan_interface_stub.c
+++ b/test/nanostack/unittest/stub/protocol_6lowpan_interface_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/protocol_6lowpan_stub.c b/test/nanostack/unittest/stub/protocol_6lowpan_stub.c
index 15fd7ce8961..91c1f5d9841 100644
--- a/test/nanostack/unittest/stub/protocol_6lowpan_stub.c
+++ b/test/nanostack/unittest/stub/protocol_6lowpan_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/protocol_6lowpan_stub.h b/test/nanostack/unittest/stub/protocol_6lowpan_stub.h
index db8f05f578f..698c0093709 100644
--- a/test/nanostack/unittest/stub/protocol_6lowpan_stub.h
+++ b/test/nanostack/unittest/stub/protocol_6lowpan_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/protocol_core_stub.c b/test/nanostack/unittest/stub/protocol_core_stub.c
index e5162ec6bb2..8058a312a7d 100644
--- a/test/nanostack/unittest/stub/protocol_core_stub.c
+++ b/test/nanostack/unittest/stub/protocol_core_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/protocol_core_stub.h b/test/nanostack/unittest/stub/protocol_core_stub.h
index 4c8928e4cbe..bc00e3d8726 100644
--- a/test/nanostack/unittest/stub/protocol_core_stub.h
+++ b/test/nanostack/unittest/stub/protocol_core_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/protocol_ipv6_stub.c b/test/nanostack/unittest/stub/protocol_ipv6_stub.c
index 25c359f8082..c64359a3bde 100644
--- a/test/nanostack/unittest/stub/protocol_ipv6_stub.c
+++ b/test/nanostack/unittest/stub/protocol_ipv6_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2019, Arm Limited and affiliates.
+ * Copyright (c) 2012-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/protocol_stats_stub.c b/test/nanostack/unittest/stub/protocol_stats_stub.c
index ba658919425..12e71ddac14 100644
--- a/test/nanostack/unittest/stub/protocol_stats_stub.c
+++ b/test/nanostack/unittest/stub/protocol_stats_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/protocol_timer_stub.c b/test/nanostack/unittest/stub/protocol_timer_stub.c
index 4b8c65ff87a..3addacb46b4 100644
--- a/test/nanostack/unittest/stub/protocol_timer_stub.c
+++ b/test/nanostack/unittest/stub/protocol_timer_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/protocol_tun_driver_stub.c b/test/nanostack/unittest/stub/protocol_tun_driver_stub.c
index 4b58c9c770f..911b937fefc 100644
--- a/test/nanostack/unittest/stub/protocol_tun_driver_stub.c
+++ b/test/nanostack/unittest/stub/protocol_tun_driver_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014, 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/protocol_tun_driver_stub.h b/test/nanostack/unittest/stub/protocol_tun_driver_stub.h
index cfcf7499a78..05c6edc55ee 100644
--- a/test/nanostack/unittest/stub/protocol_tun_driver_stub.h
+++ b/test/nanostack/unittest/stub/protocol_tun_driver_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/randLIB_stub.c b/test/nanostack/unittest/stub/randLIB_stub.c
index fc52c0ad31f..7e811afa1ba 100644
--- a/test/nanostack/unittest/stub/randLIB_stub.c
+++ b/test/nanostack/unittest/stub/randLIB_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/rand_lib2_stub.c b/test/nanostack/unittest/stub/rand_lib2_stub.c
index 3cb34a2b107..e6e57014493 100644
--- a/test/nanostack/unittest/stub/rand_lib2_stub.c
+++ b/test/nanostack/unittest/stub/rand_lib2_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/rand_lib_stub.h b/test/nanostack/unittest/stub/rand_lib_stub.h
index 386e980ef0b..e935ba8c70e 100644
--- a/test/nanostack/unittest/stub/rand_lib_stub.h
+++ b/test/nanostack/unittest/stub/rand_lib_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/random_early_detection_stub.c b/test/nanostack/unittest/stub/random_early_detection_stub.c
index 648ede3533e..2a03134d740 100644
--- a/test/nanostack/unittest/stub/random_early_detection_stub.c
+++ b/test/nanostack/unittest/stub/random_early_detection_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/random_early_detection_stub.h b/test/nanostack/unittest/stub/random_early_detection_stub.h
index 8caeab8fdde..748a02bc2c3 100644
--- a/test/nanostack/unittest/stub/random_early_detection_stub.h
+++ b/test/nanostack/unittest/stub/random_early_detection_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/rf_driver_storage_stub.c b/test/nanostack/unittest/stub/rf_driver_storage_stub.c
index 302bc1e6824..5d6e5d77c9b 100644
--- a/test/nanostack/unittest/stub/rf_driver_storage_stub.c
+++ b/test/nanostack/unittest/stub/rf_driver_storage_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/rf_driver_storage_stub.h b/test/nanostack/unittest/stub/rf_driver_storage_stub.h
index 3567ae36588..9b859597b38 100644
--- a/test/nanostack/unittest/stub/rf_driver_storage_stub.h
+++ b/test/nanostack/unittest/stub/rf_driver_storage_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/routing_table_stub.c b/test/nanostack/unittest/stub/routing_table_stub.c
index f5730983a47..66bcbf70bf2 100644
--- a/test/nanostack/unittest/stub/routing_table_stub.c
+++ b/test/nanostack/unittest/stub/routing_table_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2011-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/rpl_control_stub.c b/test/nanostack/unittest/stub/rpl_control_stub.c
index c894fe3cc6c..9a48dc2cf69 100644
--- a/test/nanostack/unittest/stub/rpl_control_stub.c
+++ b/test/nanostack/unittest/stub/rpl_control_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/rpl_data_stub.c b/test/nanostack/unittest/stub/rpl_data_stub.c
index c4eb9387f9d..c14d5262ae4 100644
--- a/test/nanostack/unittest/stub/rpl_data_stub.c
+++ b/test/nanostack/unittest/stub/rpl_data_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/rpl_data_stub.h b/test/nanostack/unittest/stub/rpl_data_stub.h
index ac0617bf2ae..66bcf25193f 100644
--- a/test/nanostack/unittest/stub/rpl_data_stub.h
+++ b/test/nanostack/unittest/stub/rpl_data_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/rpl_downward_stub.c b/test/nanostack/unittest/stub/rpl_downward_stub.c
index 7774dc55d42..fc6e31153b4 100644
--- a/test/nanostack/unittest/stub/rpl_downward_stub.c
+++ b/test/nanostack/unittest/stub/rpl_downward_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/rpl_mrhof_stub.c b/test/nanostack/unittest/stub/rpl_mrhof_stub.c
index 14dd223fcdb..42ac4f5d51d 100644
--- a/test/nanostack/unittest/stub/rpl_mrhof_stub.c
+++ b/test/nanostack/unittest/stub/rpl_mrhof_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/rpl_objective_stub.c b/test/nanostack/unittest/stub/rpl_objective_stub.c
index 5c2951d7018..ab39b5372c4 100644
--- a/test/nanostack/unittest/stub/rpl_objective_stub.c
+++ b/test/nanostack/unittest/stub/rpl_objective_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/rpl_of0_stub.c b/test/nanostack/unittest/stub/rpl_of0_stub.c
index 971dcb25014..b755e509821 100644
--- a/test/nanostack/unittest/stub/rpl_of0_stub.c
+++ b/test/nanostack/unittest/stub/rpl_of0_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/rpl_policy_stub.c b/test/nanostack/unittest/stub/rpl_policy_stub.c
index 8779842f368..a195882e4c4 100644
--- a/test/nanostack/unittest/stub/rpl_policy_stub.c
+++ b/test/nanostack/unittest/stub/rpl_policy_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/rpl_upward_stub.c b/test/nanostack/unittest/stub/rpl_upward_stub.c
index 7e35088aad7..33fc7730399 100644
--- a/test/nanostack/unittest/stub/rpl_upward_stub.c
+++ b/test/nanostack/unittest/stub/rpl_upward_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/security_lib_stub.c b/test/nanostack/unittest/stub/security_lib_stub.c
index e164eb315aa..e297c6cf680 100644
--- a/test/nanostack/unittest/stub/security_lib_stub.c
+++ b/test/nanostack/unittest/stub/security_lib_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/shalib_stub.c b/test/nanostack/unittest/stub/shalib_stub.c
index 4cc7b30f43b..4c4e054e68a 100644
--- a/test/nanostack/unittest/stub/shalib_stub.c
+++ b/test/nanostack/unittest/stub/shalib_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/sn_coap_builder_stub.c b/test/nanostack/unittest/stub/sn_coap_builder_stub.c
index 76de3bbf75b..0b6914f88c4 100644
--- a/test/nanostack/unittest/stub/sn_coap_builder_stub.c
+++ b/test/nanostack/unittest/stub/sn_coap_builder_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2011-2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/sn_coap_builder_stub.h b/test/nanostack/unittest/stub/sn_coap_builder_stub.h
index b7ad0d8bf92..ccdfa10e406 100644
--- a/test/nanostack/unittest/stub/sn_coap_builder_stub.h
+++ b/test/nanostack/unittest/stub/sn_coap_builder_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/sn_coap_parser_stub.h b/test/nanostack/unittest/stub/sn_coap_parser_stub.h
index 0a7dca7146d..01140ba9bf9 100644
--- a/test/nanostack/unittest/stub/sn_coap_parser_stub.h
+++ b/test/nanostack/unittest/stub/sn_coap_parser_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/sn_coap_protocol_stub.h b/test/nanostack/unittest/stub/sn_coap_protocol_stub.h
index 8215be16e38..cafafec55fa 100644
--- a/test/nanostack/unittest/stub/sn_coap_protocol_stub.h
+++ b/test/nanostack/unittest/stub/sn_coap_protocol_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/sockbuf_stub.c b/test/nanostack/unittest/stub/sockbuf_stub.c
index 519b0ded649..9ccb9e702d0 100644
--- a/test/nanostack/unittest/stub/sockbuf_stub.c
+++ b/test/nanostack/unittest/stub/sockbuf_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/socket_api_stub.c b/test/nanostack/unittest/stub/socket_api_stub.c
index 0179df70fcc..ee0288db6eb 100644
--- a/test/nanostack/unittest/stub/socket_api_stub.c
+++ b/test/nanostack/unittest/stub/socket_api_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/socket_api_stub.h b/test/nanostack/unittest/stub/socket_api_stub.h
index 270c7937eef..513d2d87d67 100644
--- a/test/nanostack/unittest/stub/socket_api_stub.h
+++ b/test/nanostack/unittest/stub/socket_api_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/socket_stub.c b/test/nanostack/unittest/stub/socket_stub.c
index edc4683c29c..d114514d040 100644
--- a/test/nanostack/unittest/stub/socket_stub.c
+++ b/test/nanostack/unittest/stub/socket_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/socket_stub.h b/test/nanostack/unittest/stub/socket_stub.h
index fa704f6bf1e..3fd5b75152a 100644
--- a/test/nanostack/unittest/stub/socket_stub.h
+++ b/test/nanostack/unittest/stub/socket_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/sw_mac_stub.c b/test/nanostack/unittest/stub/sw_mac_stub.c
index cc7e79ac95c..2fdf8e9c5a4 100644
--- a/test/nanostack/unittest/stub/sw_mac_stub.c
+++ b/test/nanostack/unittest/stub/sw_mac_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/sw_mac_stub.h b/test/nanostack/unittest/stub/sw_mac_stub.h
index ba9bc0dc83d..4dd0e066a7c 100644
--- a/test/nanostack/unittest/stub/sw_mac_stub.h
+++ b/test/nanostack/unittest/stub/sw_mac_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/system_timer_stub.c b/test/nanostack/unittest/stub/system_timer_stub.c
index 17a05e9e4b9..7c034fe1ac0 100644
--- a/test/nanostack/unittest/stub/system_timer_stub.c
+++ b/test/nanostack/unittest/stub/system_timer_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/system_timer_stub.h b/test/nanostack/unittest/stub/system_timer_stub.h
index 052daf237a2..b0071964ddf 100644
--- a/test/nanostack/unittest/stub/system_timer_stub.h
+++ b/test/nanostack/unittest/stub/system_timer_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/tcp_stub.c b/test/nanostack/unittest/stub/tcp_stub.c
index d30225501ea..e2f4f4a7f0e 100644
--- a/test/nanostack/unittest/stub/tcp_stub.c
+++ b/test/nanostack/unittest/stub/tcp_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/tcp_stub.h b/test/nanostack/unittest/stub/tcp_stub.h
index f54e97a7c90..379643b5ee0 100644
--- a/test/nanostack/unittest/stub/tcp_stub.h
+++ b/test/nanostack/unittest/stub/tcp_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_address_registration_client_stub.c b/test/nanostack/unittest/stub/thread_address_registration_client_stub.c
index eb75f44735b..8aecf6080cf 100644
--- a/test/nanostack/unittest/stub/thread_address_registration_client_stub.c
+++ b/test/nanostack/unittest/stub/thread_address_registration_client_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_bbr_api_stub.c b/test/nanostack/unittest/stub/thread_bbr_api_stub.c
index 494e9dba3a2..d4c3f391ed9 100644
--- a/test/nanostack/unittest/stub/thread_bbr_api_stub.c
+++ b/test/nanostack/unittest/stub/thread_bbr_api_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_bbr_commercial_stub.c b/test/nanostack/unittest/stub/thread_bbr_commercial_stub.c
index a8e4ac7415a..83925c9ce00 100644
--- a/test/nanostack/unittest/stub/thread_bbr_commercial_stub.c
+++ b/test/nanostack/unittest/stub/thread_bbr_commercial_stub.c
@@ -1,30 +1,18 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
- * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2019, Pelion and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the
- *    names of its contributors may be used to endorse or promote products
- *    derived from this software without specific prior written permission.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 
diff --git a/test/nanostack/unittest/stub/thread_beacon_stub.c b/test/nanostack/unittest/stub/thread_beacon_stub.c
index 2721abc9ed3..fa002a10437 100644
--- a/test/nanostack/unittest/stub/thread_beacon_stub.c
+++ b/test/nanostack/unittest/stub/thread_beacon_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_bootstrap_stub.c b/test/nanostack/unittest/stub/thread_bootstrap_stub.c
index 587369bdae1..202b8e20ce8 100644
--- a/test/nanostack/unittest/stub/thread_bootstrap_stub.c
+++ b/test/nanostack/unittest/stub/thread_bootstrap_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_border_router_api_internal_stub.c b/test/nanostack/unittest/stub/thread_border_router_api_internal_stub.c
index c9849f673b5..02a70ee433f 100644
--- a/test/nanostack/unittest/stub/thread_border_router_api_internal_stub.c
+++ b/test/nanostack/unittest/stub/thread_border_router_api_internal_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_border_router_api_stub.c b/test/nanostack/unittest/stub/thread_border_router_api_stub.c
index abc84e5af85..d8042f0f408 100644
--- a/test/nanostack/unittest/stub/thread_border_router_api_stub.c
+++ b/test/nanostack/unittest/stub/thread_border_router_api_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_ccm_stub.c b/test/nanostack/unittest/stub/thread_ccm_stub.c
index 47700a97d83..94361df1f47 100644
--- a/test/nanostack/unittest/stub/thread_ccm_stub.c
+++ b/test/nanostack/unittest/stub/thread_ccm_stub.c
@@ -1,30 +1,18 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
- * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2019, Pelion and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the
- *    names of its contributors may be used to endorse or promote products
- *    derived from this software without specific prior written permission.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**
diff --git a/test/nanostack/unittest/stub/thread_commissioning_if_stub.c b/test/nanostack/unittest/stub/thread_commissioning_if_stub.c
index 7049b463fd6..e40f78e9276 100644
--- a/test/nanostack/unittest/stub/thread_commissioning_if_stub.c
+++ b/test/nanostack/unittest/stub/thread_commissioning_if_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_common_stub.c b/test/nanostack/unittest/stub/thread_common_stub.c
index 886837b0ecf..3392296e861 100644
--- a/test/nanostack/unittest/stub/thread_common_stub.c
+++ b/test/nanostack/unittest/stub/thread_common_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_common_stub.h b/test/nanostack/unittest/stub/thread_common_stub.h
index 76a8d59123b..db3fc486cbe 100644
--- a/test/nanostack/unittest/stub/thread_common_stub.h
+++ b/test/nanostack/unittest/stub/thread_common_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_diagnostic_stub.c b/test/nanostack/unittest/stub/thread_diagnostic_stub.c
index 4d9b8c332d6..4de51d57073 100644
--- a/test/nanostack/unittest/stub/thread_diagnostic_stub.c
+++ b/test/nanostack/unittest/stub/thread_diagnostic_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_discovery_stub.c b/test/nanostack/unittest/stub/thread_discovery_stub.c
index 99cde9df800..f99c9243e0b 100644
--- a/test/nanostack/unittest/stub/thread_discovery_stub.c
+++ b/test/nanostack/unittest/stub/thread_discovery_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_host_bootstrap_stub.c b/test/nanostack/unittest/stub/thread_host_bootstrap_stub.c
index 0c452fe0daa..09cef72ec45 100644
--- a/test/nanostack/unittest/stub/thread_host_bootstrap_stub.c
+++ b/test/nanostack/unittest/stub/thread_host_bootstrap_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_joiner_application_stub.c b/test/nanostack/unittest/stub/thread_joiner_application_stub.c
index 3423a9d5469..e1a7a0a59cc 100644
--- a/test/nanostack/unittest/stub/thread_joiner_application_stub.c
+++ b/test/nanostack/unittest/stub/thread_joiner_application_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_leader_service_stub.c b/test/nanostack/unittest/stub/thread_leader_service_stub.c
index 76ff04d1355..2c555bbfa51 100644
--- a/test/nanostack/unittest/stub/thread_leader_service_stub.c
+++ b/test/nanostack/unittest/stub/thread_leader_service_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_lowpower_api_stub.c b/test/nanostack/unittest/stub/thread_lowpower_api_stub.c
index 3c89b0d556a..a90dca1fab9 100644
--- a/test/nanostack/unittest/stub/thread_lowpower_api_stub.c
+++ b/test/nanostack/unittest/stub/thread_lowpower_api_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_management_api_stub.c b/test/nanostack/unittest/stub/thread_management_api_stub.c
index 8df052f8e62..0fd8cf4ad5a 100644
--- a/test/nanostack/unittest/stub/thread_management_api_stub.c
+++ b/test/nanostack/unittest/stub/thread_management_api_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_management_client_stub.c b/test/nanostack/unittest/stub/thread_management_client_stub.c
index 0937890d318..8d442081f5a 100644
--- a/test/nanostack/unittest/stub/thread_management_client_stub.c
+++ b/test/nanostack/unittest/stub/thread_management_client_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_management_if_stub.c b/test/nanostack/unittest/stub/thread_management_if_stub.c
index 3fc8e956b35..886ecc6b391 100644
--- a/test/nanostack/unittest/stub/thread_management_if_stub.c
+++ b/test/nanostack/unittest/stub/thread_management_if_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_management_server_stub.c b/test/nanostack/unittest/stub/thread_management_server_stub.c
index 6bc0546f783..290c4526cd3 100644
--- a/test/nanostack/unittest/stub/thread_management_server_stub.c
+++ b/test/nanostack/unittest/stub/thread_management_server_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_meshcop_lib_stub.c b/test/nanostack/unittest/stub/thread_meshcop_lib_stub.c
index de66f91e9ec..6979f63902d 100644
--- a/test/nanostack/unittest/stub/thread_meshcop_lib_stub.c
+++ b/test/nanostack/unittest/stub/thread_meshcop_lib_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_meshcop_lib_stub.h b/test/nanostack/unittest/stub/thread_meshcop_lib_stub.h
index 9b8f8d56b3f..cb6bbebd962 100644
--- a/test/nanostack/unittest/stub/thread_meshcop_lib_stub.h
+++ b/test/nanostack/unittest/stub/thread_meshcop_lib_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_mle_message_handler_stub.c b/test/nanostack/unittest/stub/thread_mle_message_handler_stub.c
index a7250238e07..2ea945d4081 100644
--- a/test/nanostack/unittest/stub/thread_mle_message_handler_stub.c
+++ b/test/nanostack/unittest/stub/thread_mle_message_handler_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_nd_stub.c b/test/nanostack/unittest/stub/thread_nd_stub.c
index 77b73ce51cd..1971d679911 100644
--- a/test/nanostack/unittest/stub/thread_nd_stub.c
+++ b/test/nanostack/unittest/stub/thread_nd_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_neighbor_class_stub.c b/test/nanostack/unittest/stub/thread_neighbor_class_stub.c
index 6d562610794..f695fec0d29 100644
--- a/test/nanostack/unittest/stub/thread_neighbor_class_stub.c
+++ b/test/nanostack/unittest/stub/thread_neighbor_class_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_neighbor_class_stub.h b/test/nanostack/unittest/stub/thread_neighbor_class_stub.h
index c26117f0362..6fcc0cfed56 100644
--- a/test/nanostack/unittest/stub/thread_neighbor_class_stub.h
+++ b/test/nanostack/unittest/stub/thread_neighbor_class_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_network_data_lib_stub.c b/test/nanostack/unittest/stub/thread_network_data_lib_stub.c
index c2eb5b84202..e509165b1cc 100644
--- a/test/nanostack/unittest/stub/thread_network_data_lib_stub.c
+++ b/test/nanostack/unittest/stub/thread_network_data_lib_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_network_data_storage_stub.c b/test/nanostack/unittest/stub/thread_network_data_storage_stub.c
index b104f9466b2..2cfd03b3dfc 100644
--- a/test/nanostack/unittest/stub/thread_network_data_storage_stub.c
+++ b/test/nanostack/unittest/stub/thread_network_data_storage_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_network_synch_stub.c b/test/nanostack/unittest/stub/thread_network_synch_stub.c
index 36dd54cd7aa..a629c9a0db9 100644
--- a/test/nanostack/unittest/stub/thread_network_synch_stub.c
+++ b/test/nanostack/unittest/stub/thread_network_synch_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_nvm_store_stub.c b/test/nanostack/unittest/stub/thread_nvm_store_stub.c
index d13e8b08e53..a42080166dd 100644
--- a/test/nanostack/unittest/stub/thread_nvm_store_stub.c
+++ b/test/nanostack/unittest/stub/thread_nvm_store_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_resolution_client_stub.c b/test/nanostack/unittest/stub/thread_resolution_client_stub.c
index e7797a6da44..95211757dab 100644
--- a/test/nanostack/unittest/stub/thread_resolution_client_stub.c
+++ b/test/nanostack/unittest/stub/thread_resolution_client_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_router_bootstrap_stub.c b/test/nanostack/unittest/stub/thread_router_bootstrap_stub.c
index e3436c54039..4433fe7ff62 100644
--- a/test/nanostack/unittest/stub/thread_router_bootstrap_stub.c
+++ b/test/nanostack/unittest/stub/thread_router_bootstrap_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_routing_stub.c b/test/nanostack/unittest/stub/thread_routing_stub.c
index 71dfc757de8..b535b343f50 100644
--- a/test/nanostack/unittest/stub/thread_routing_stub.c
+++ b/test/nanostack/unittest/stub/thread_routing_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/thread_test_api_stub.c b/test/nanostack/unittest/stub/thread_test_api_stub.c
index ddc90822d0a..ddebebbe03a 100644
--- a/test/nanostack/unittest/stub/thread_test_api_stub.c
+++ b/test/nanostack/unittest/stub/thread_test_api_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/timeout_stub.c b/test/nanostack/unittest/stub/timeout_stub.c
index 0a9c8d893fb..9b80c26d299 100644
--- a/test/nanostack/unittest/stub/timeout_stub.c
+++ b/test/nanostack/unittest/stub/timeout_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/tls_ccm_crypt_stub.c b/test/nanostack/unittest/stub/tls_ccm_crypt_stub.c
index 63f78772c7e..4f1bf824b3e 100644
--- a/test/nanostack/unittest/stub/tls_ccm_crypt_stub.c
+++ b/test/nanostack/unittest/stub/tls_ccm_crypt_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/tls_lib_stub.c b/test/nanostack/unittest/stub/tls_lib_stub.c
index 045c22c73b6..1783b0bd462 100644
--- a/test/nanostack/unittest/stub/tls_lib_stub.c
+++ b/test/nanostack/unittest/stub/tls_lib_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/trickle_stub.c b/test/nanostack/unittest/stub/trickle_stub.c
index b186d62da6b..51050dde43d 100644
--- a/test/nanostack/unittest/stub/trickle_stub.c
+++ b/test/nanostack/unittest/stub/trickle_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/udp_stub.c b/test/nanostack/unittest/stub/udp_stub.c
index 124a1354a17..46f1593f557 100644
--- a/test/nanostack/unittest/stub/udp_stub.c
+++ b/test/nanostack/unittest/stub/udp_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, 2019, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/whiteboard_stub.c b/test/nanostack/unittest/stub/whiteboard_stub.c
index c9edcf940a9..0f47c184aa0 100644
--- a/test/nanostack/unittest/stub/whiteboard_stub.c
+++ b/test/nanostack/unittest/stub/whiteboard_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Arm Limited and affiliates.
+ * Copyright (c) 2013-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_bbr_api_stub.c b/test/nanostack/unittest/stub/ws_bbr_api_stub.c
index ba47499ad0c..4d77ffaf4a0 100644
--- a/test/nanostack/unittest/stub/ws_bbr_api_stub.c
+++ b/test/nanostack/unittest/stub/ws_bbr_api_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_bbr_api_stub.h b/test/nanostack/unittest/stub/ws_bbr_api_stub.h
index 1758c9885e6..2dda4c67921 100644
--- a/test/nanostack/unittest/stub/ws_bbr_api_stub.h
+++ b/test/nanostack/unittest/stub/ws_bbr_api_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_bootstrap_stub.c b/test/nanostack/unittest/stub/ws_bootstrap_stub.c
index a7f07aaade2..2d1e3bffc34 100644
--- a/test/nanostack/unittest/stub/ws_bootstrap_stub.c
+++ b/test/nanostack/unittest/stub/ws_bootstrap_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_cfg_settings_stub.c b/test/nanostack/unittest/stub/ws_cfg_settings_stub.c
index 6ed78f944e5..528e3da8d19 100644
--- a/test/nanostack/unittest/stub/ws_cfg_settings_stub.c
+++ b/test/nanostack/unittest/stub/ws_cfg_settings_stub.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2020, Arm Limited and affiliates.
+ * Copyright (c) 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
diff --git a/test/nanostack/unittest/stub/ws_cfg_settings_stub.h b/test/nanostack/unittest/stub/ws_cfg_settings_stub.h
index 40962a47557..5125cbcdd5d 100644
--- a/test/nanostack/unittest/stub/ws_cfg_settings_stub.h
+++ b/test/nanostack/unittest/stub/ws_cfg_settings_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_common_stub.c b/test/nanostack/unittest/stub/ws_common_stub.c
index 3e5c295d423..d83cd037299 100644
--- a/test/nanostack/unittest/stub/ws_common_stub.c
+++ b/test/nanostack/unittest/stub/ws_common_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_common_stub.h b/test/nanostack/unittest/stub/ws_common_stub.h
index af647ce4cc1..51e2291ebc2 100644
--- a/test/nanostack/unittest/stub/ws_common_stub.h
+++ b/test/nanostack/unittest/stub/ws_common_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_ie_lib_stub.c b/test/nanostack/unittest/stub/ws_ie_lib_stub.c
index 20f6a4d9c62..40eddf6861d 100644
--- a/test/nanostack/unittest/stub/ws_ie_lib_stub.c
+++ b/test/nanostack/unittest/stub/ws_ie_lib_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_ie_lib_stub.h b/test/nanostack/unittest/stub/ws_ie_lib_stub.h
index 081a3aa8b99..7faedb65cd1 100644
--- a/test/nanostack/unittest/stub/ws_ie_lib_stub.h
+++ b/test/nanostack/unittest/stub/ws_ie_lib_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_mpx_header_stub.c b/test/nanostack/unittest/stub/ws_mpx_header_stub.c
index a86001fce18..dd7d9c67bbf 100644
--- a/test/nanostack/unittest/stub/ws_mpx_header_stub.c
+++ b/test/nanostack/unittest/stub/ws_mpx_header_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_mpx_header_stub.h b/test/nanostack/unittest/stub/ws_mpx_header_stub.h
index 2a589d1a8ca..e6ca205ed58 100644
--- a/test/nanostack/unittest/stub/ws_mpx_header_stub.h
+++ b/test/nanostack/unittest/stub/ws_mpx_header_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_neighbour_class_stub.c b/test/nanostack/unittest/stub/ws_neighbour_class_stub.c
index af771b8b9f8..b4f156f5b2b 100644
--- a/test/nanostack/unittest/stub/ws_neighbour_class_stub.c
+++ b/test/nanostack/unittest/stub/ws_neighbour_class_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_neighbour_class_stub.h b/test/nanostack/unittest/stub/ws_neighbour_class_stub.h
index 6940bda8489..a3251f8ee4b 100644
--- a/test/nanostack/unittest/stub/ws_neighbour_class_stub.h
+++ b/test/nanostack/unittest/stub/ws_neighbour_class_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_pae_controller_stub.c b/test/nanostack/unittest/stub/ws_pae_controller_stub.c
index 975251dc7d8..74719ddf381 100644
--- a/test/nanostack/unittest/stub/ws_pae_controller_stub.c
+++ b/test/nanostack/unittest/stub/ws_pae_controller_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_pae_controller_stub.h b/test/nanostack/unittest/stub/ws_pae_controller_stub.h
index ed9dd450308..1cf76ccd5c3 100644
--- a/test/nanostack/unittest/stub/ws_pae_controller_stub.h
+++ b/test/nanostack/unittest/stub/ws_pae_controller_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/x509_stub.c b/test/nanostack/unittest/stub/x509_stub.c
index 9389b561501..5624fa84d28 100644
--- a/test/nanostack/unittest/stub/x509_stub.c
+++ b/test/nanostack/unittest/stub/x509_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, Arm Limited and affiliates.
+ * Copyright (c) 2016-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/nvm/main.cpp b/test/nanostack/unittest/thread/nvm/main.cpp
index e1b4cfb9d1e..fdc67d3af9e 100644
--- a/test/nanostack/unittest/thread/nvm/main.cpp
+++ b/test/nanostack/unittest/thread/nvm/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/nvm/test_thread_nvm_store.c b/test/nanostack/unittest/thread/nvm/test_thread_nvm_store.c
index d4fb9e4dc1b..019475d06af 100644
--- a/test/nanostack/unittest/thread/nvm/test_thread_nvm_store.c
+++ b/test/nanostack/unittest/thread/nvm/test_thread_nvm_store.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/nvm/test_thread_nvm_store.h b/test/nanostack/unittest/thread/nvm/test_thread_nvm_store.h
index 97d300e52fd..a37facf0059 100644
--- a/test/nanostack/unittest/thread/nvm/test_thread_nvm_store.h
+++ b/test/nanostack/unittest/thread/nvm/test_thread_nvm_store.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/nvm/thread_nvm_storetest.cpp b/test/nanostack/unittest/thread/nvm/thread_nvm_storetest.cpp
index ea3ed59da28..b3f1e023a04 100644
--- a/test/nanostack/unittest/thread/nvm/thread_nvm_storetest.cpp
+++ b/test/nanostack/unittest/thread/nvm/thread_nvm_storetest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread/main.cpp b/test/nanostack/unittest/thread/thread/main.cpp
index 7e53b9d23b1..2853654da88 100644
--- a/test/nanostack/unittest/thread/thread/main.cpp
+++ b/test/nanostack/unittest/thread/thread/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread/test_thread.c b/test/nanostack/unittest/thread/thread/test_thread.c
index 8a1d5624eec..df2a8a4f00f 100644
--- a/test/nanostack/unittest/thread/thread/test_thread.c
+++ b/test/nanostack/unittest/thread/thread/test_thread.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread/test_thread.h b/test/nanostack/unittest/thread/thread/test_thread.h
index 05ee5684a80..e28b57cacb6 100644
--- a/test/nanostack/unittest/thread/thread/test_thread.h
+++ b/test/nanostack/unittest/thread/thread/test_thread.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread/threadtest.cpp b/test/nanostack/unittest/thread/thread/threadtest.cpp
index d6cbc484a13..65f087f3f2a 100644
--- a/test/nanostack/unittest/thread/thread/threadtest.cpp
+++ b/test/nanostack/unittest/thread/thread/threadtest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_bootstrap/main.cpp b/test/nanostack/unittest/thread/thread_bootstrap/main.cpp
index 8b2209874b4..cee4a6fede8 100644
--- a/test/nanostack/unittest/thread/thread_bootstrap/main.cpp
+++ b/test/nanostack/unittest/thread/thread_bootstrap/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_bootstrap/test_thread_bootstrap.c b/test/nanostack/unittest/thread/thread_bootstrap/test_thread_bootstrap.c
index ff93db3ca05..800dec1ee90 100644
--- a/test/nanostack/unittest/thread/thread_bootstrap/test_thread_bootstrap.c
+++ b/test/nanostack/unittest/thread/thread_bootstrap/test_thread_bootstrap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_bootstrap/test_thread_bootstrap.h b/test/nanostack/unittest/thread/thread_bootstrap/test_thread_bootstrap.h
index 4333aa0463d..eefaa8c31b7 100644
--- a/test/nanostack/unittest/thread/thread_bootstrap/test_thread_bootstrap.h
+++ b/test/nanostack/unittest/thread/thread_bootstrap/test_thread_bootstrap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_bootstrap/thread_bootstraptest.cpp b/test/nanostack/unittest/thread/thread_bootstrap/thread_bootstraptest.cpp
index 8cd85d8f7c5..fa283924bce 100644
--- a/test/nanostack/unittest/thread/thread_bootstrap/thread_bootstraptest.cpp
+++ b/test/nanostack/unittest/thread/thread_bootstrap/thread_bootstraptest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_commissioning_api/main.cpp b/test/nanostack/unittest/thread/thread_commissioning_api/main.cpp
index 31af8826671..4f053c6db20 100644
--- a/test/nanostack/unittest/thread/thread_commissioning_api/main.cpp
+++ b/test/nanostack/unittest/thread/thread_commissioning_api/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_commissioning_api/test_thread_commissioning_api.c b/test/nanostack/unittest/thread/thread_commissioning_api/test_thread_commissioning_api.c
index a3fedfb7d28..0b6edd29b52 100644
--- a/test/nanostack/unittest/thread/thread_commissioning_api/test_thread_commissioning_api.c
+++ b/test/nanostack/unittest/thread/thread_commissioning_api/test_thread_commissioning_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_commissioning_api/test_thread_commissioning_api.h b/test/nanostack/unittest/thread/thread_commissioning_api/test_thread_commissioning_api.h
index 6eb1b16f39f..f6aa6027eac 100644
--- a/test/nanostack/unittest/thread/thread_commissioning_api/test_thread_commissioning_api.h
+++ b/test/nanostack/unittest/thread/thread_commissioning_api/test_thread_commissioning_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_commissioning_api/thread_commissioning_apitest.cpp b/test/nanostack/unittest/thread/thread_commissioning_api/thread_commissioning_apitest.cpp
index 1d57218d838..161431b5bb3 100644
--- a/test/nanostack/unittest/thread/thread_commissioning_api/thread_commissioning_apitest.cpp
+++ b/test/nanostack/unittest/thread/thread_commissioning_api/thread_commissioning_apitest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_commissioning_if/main.cpp b/test/nanostack/unittest/thread/thread_commissioning_if/main.cpp
index 6657eef506f..949457a799e 100644
--- a/test/nanostack/unittest/thread/thread_commissioning_if/main.cpp
+++ b/test/nanostack/unittest/thread/thread_commissioning_if/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_commissioning_if/test_thread_commissioning_if.c b/test/nanostack/unittest/thread/thread_commissioning_if/test_thread_commissioning_if.c
index c26ab974ee5..f13e3bcbed1 100644
--- a/test/nanostack/unittest/thread/thread_commissioning_if/test_thread_commissioning_if.c
+++ b/test/nanostack/unittest/thread/thread_commissioning_if/test_thread_commissioning_if.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_commissioning_if/test_thread_commissioning_if.h b/test/nanostack/unittest/thread/thread_commissioning_if/test_thread_commissioning_if.h
index ef69cf48490..aca43e802dc 100644
--- a/test/nanostack/unittest/thread/thread_commissioning_if/test_thread_commissioning_if.h
+++ b/test/nanostack/unittest/thread/thread_commissioning_if/test_thread_commissioning_if.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_commissioning_if/thread_commissioning_iftest.cpp b/test/nanostack/unittest/thread/thread_commissioning_if/thread_commissioning_iftest.cpp
index d7bdabeeee0..540429fdb8e 100644
--- a/test/nanostack/unittest/thread/thread_commissioning_if/thread_commissioning_iftest.cpp
+++ b/test/nanostack/unittest/thread/thread_commissioning_if/thread_commissioning_iftest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_lowpower_api/main.cpp b/test/nanostack/unittest/thread/thread_lowpower_api/main.cpp
index 099abc9c4f0..02680c7a889 100644
--- a/test/nanostack/unittest/thread/thread_lowpower_api/main.cpp
+++ b/test/nanostack/unittest/thread/thread_lowpower_api/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_lowpower_api/test_thread_lowpower_api.c b/test/nanostack/unittest/thread/thread_lowpower_api/test_thread_lowpower_api.c
index e23d05fb712..1aa3ea5097a 100644
--- a/test/nanostack/unittest/thread/thread_lowpower_api/test_thread_lowpower_api.c
+++ b/test/nanostack/unittest/thread/thread_lowpower_api/test_thread_lowpower_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_lowpower_api/test_thread_lowpower_api.h b/test/nanostack/unittest/thread/thread_lowpower_api/test_thread_lowpower_api.h
index 892c574fab0..262c458c8ea 100644
--- a/test/nanostack/unittest/thread/thread_lowpower_api/test_thread_lowpower_api.h
+++ b/test/nanostack/unittest/thread/thread_lowpower_api/test_thread_lowpower_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_lowpower_api/thread_lowpower_apitest.cpp b/test/nanostack/unittest/thread/thread_lowpower_api/thread_lowpower_apitest.cpp
index 771e1065fec..74d1d3da2ac 100644
--- a/test/nanostack/unittest/thread/thread_lowpower_api/thread_lowpower_apitest.cpp
+++ b/test/nanostack/unittest/thread/thread_lowpower_api/thread_lowpower_apitest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_management_client/main.cpp b/test/nanostack/unittest/thread/thread_management_client/main.cpp
index 1cd41c8f5d2..1479213fb06 100644
--- a/test/nanostack/unittest/thread/thread_management_client/main.cpp
+++ b/test/nanostack/unittest/thread/thread_management_client/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_management_client/test_thread_management_client.c b/test/nanostack/unittest/thread/thread_management_client/test_thread_management_client.c
index 1cf21f0aa0d..5a0c3018a9f 100644
--- a/test/nanostack/unittest/thread/thread_management_client/test_thread_management_client.c
+++ b/test/nanostack/unittest/thread/thread_management_client/test_thread_management_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_management_client/test_thread_management_client.h b/test/nanostack/unittest/thread/thread_management_client/test_thread_management_client.h
index e59564d7387..12b1d5c6de7 100644
--- a/test/nanostack/unittest/thread/thread_management_client/test_thread_management_client.h
+++ b/test/nanostack/unittest/thread/thread_management_client/test_thread_management_client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_management_client/thread_management_clienttest.cpp b/test/nanostack/unittest/thread/thread_management_client/thread_management_clienttest.cpp
index a157b9421c6..b399eb07ffa 100644
--- a/test/nanostack/unittest/thread/thread_management_client/thread_management_clienttest.cpp
+++ b/test/nanostack/unittest/thread/thread_management_client/thread_management_clienttest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_management_server/main.cpp b/test/nanostack/unittest/thread/thread_management_server/main.cpp
index c9004feb13b..fc5b5e186b4 100644
--- a/test/nanostack/unittest/thread/thread_management_server/main.cpp
+++ b/test/nanostack/unittest/thread/thread_management_server/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_management_server/test_thread_management_server.cpp b/test/nanostack/unittest/thread/thread_management_server/test_thread_management_server.cpp
index 7ecd5aad7e0..589df6af2ed 100644
--- a/test/nanostack/unittest/thread/thread_management_server/test_thread_management_server.cpp
+++ b/test/nanostack/unittest/thread/thread_management_server/test_thread_management_server.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_management_server/test_thread_management_server.h b/test/nanostack/unittest/thread/thread_management_server/test_thread_management_server.h
index 974993e9c0e..7d0168b850d 100644
--- a/test/nanostack/unittest/thread/thread_management_server/test_thread_management_server.h
+++ b/test/nanostack/unittest/thread/thread_management_server/test_thread_management_server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/thread/thread_management_server/thread_management_server_test.cpp b/test/nanostack/unittest/thread/thread_management_server/thread_management_server_test.cpp
index 4a1cf74f149..bf6cf9dd67f 100644
--- a/test/nanostack/unittest/thread/thread_management_server/thread_management_server_test.cpp
+++ b/test/nanostack/unittest/thread/thread_management_server/thread_management_server_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/unittest/simulations/sim_address.c b/unittest/simulations/sim_address.c
index ea832288acc..2ea68ba7010 100644
--- a/unittest/simulations/sim_address.c
+++ b/unittest/simulations/sim_address.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/unittest/simulations/sim_address.h b/unittest/simulations/sim_address.h
index 52174ba21d8..d33061a1663 100644
--- a/unittest/simulations/sim_address.h
+++ b/unittest/simulations/sim_address.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/unittest/simulations/sim_nanostack.c b/unittest/simulations/sim_nanostack.c
index b6b0663530d..eb3e65688b2 100644
--- a/unittest/simulations/sim_nanostack.c
+++ b/unittest/simulations/sim_nanostack.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/unittest/simulations/sim_socket_api.c b/unittest/simulations/sim_socket_api.c
index 4feb07311a1..00d3f7665f6 100644
--- a/unittest/simulations/sim_socket_api.c
+++ b/unittest/simulations/sim_socket_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/unittest/simulations/sim_socket_api.h b/unittest/simulations/sim_socket_api.h
index 84304752c2c..fbc70fdc9d2 100644
--- a/unittest/simulations/sim_socket_api.h
+++ b/unittest/simulations/sim_socket_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/unittest/thread_dhcp/Test.c b/unittest/thread_dhcp/Test.c
index c32a3b08d45..74faf2a7632 100644
--- a/unittest/thread_dhcp/Test.c
+++ b/unittest/thread_dhcp/Test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2019, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/unittest/thread_dhcp_servers/Test.c b/unittest/thread_dhcp_servers/Test.c
index 6fbd47e4745..89844e3003b 100644
--- a/unittest/thread_dhcp_servers/Test.c
+++ b/unittest/thread_dhcp_servers/Test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, Arm Limited and affiliates.
+ * Copyright (c) 2014-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/unittest/unity_improvement/unity_improved.c b/unittest/unity_improvement/unity_improved.c
index 8c9f9095522..e0210a68972 100644
--- a/unittest/unity_improvement/unity_improved.c
+++ b/unittest/unity_improvement/unity_improved.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/unittest/unity_improvement/unity_improved.h b/unittest/unity_improvement/unity_improved.h
index 471113f4754..e7a04f822a1 100644
--- a/unittest/unity_improvement/unity_improved.h
+++ b/unittest/unity_improvement/unity_improved.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Arm Limited and affiliates.
+ * Copyright (c) 2015, 2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

From acf580fbd0b173732112eac0ab3862b8eaae3449 Mon Sep 17 00:00:00 2001
From: Arto Kinnunen <arto.kinnunen@arm.com>
Date: Fri, 14 May 2021 13:27:58 +0300
Subject: [PATCH 19/43] Update copyright in changed MDNS files

Change company name from ARM Limited to Pelion.
---
 .../mdns/fnet/fnet_stack/fnet_config.h        |   2 +-
 .../fnet/fnet_stack/port/compiler/fnet_comp.h |   2 +-
 .../port/compiler/fnet_comp_config.h          |   2 +-
 .../fnet/fnet_stack/services/fnet_services.h  |   2 +-
 .../services/fnet_services_config.h           |   2 +-
 .../fnet/fnet_stack/services/mdns/fnet_mdns.c | 184 +++++++++---------
 .../fnet/fnet_stack/services/mdns/fnet_mdns.h |  10 +-
 .../fnet/fnet_stack/services/poll/fnet_poll.c |   2 +-
 .../fnet_stack/services/serial/fnet_serial.h  |   2 +-
 .../mdns/fnet/fnet_stack/stack/fnet_debug.h   |   2 +-
 .../mdns/fnet/fnet_stack/stack/fnet_stdlib.c  |   2 +-
 source/Service_Libs/mdns/fnet_user_config.h   |   2 +-
 source/Service_Libs/mdns/ns_fnet_events.c     |   2 +-
 source/Service_Libs/mdns/ns_fnet_events.h     |   2 +-
 source/Service_Libs/mdns/ns_fnet_port.c       |   2 +-
 source/Service_Libs/mdns/ns_fnet_types.h      |   2 +-
 source/Service_Libs/mdns/ns_mdns_api.c        |   2 +-
 17 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/fnet_config.h b/source/Service_Libs/mdns/fnet/fnet_stack/fnet_config.h
index 54bb282c4e7..85d494dc866 100644
--- a/source/Service_Libs/mdns/fnet/fnet_stack/fnet_config.h
+++ b/source/Service_Libs/mdns/fnet/fnet_stack/fnet_config.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2017, Arm Limited and affiliates.
+* Copyright (c) 2017, Pelion and affiliates.
 * SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h b/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h
index d3109581b5f..2fb633df5a2 100644
--- a/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h
+++ b/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019 Arm Limited and affiliates.
+* Copyright (c) 2019, Pelion and affiliates.
 * SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h b/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h
index ab376cec256..d3fbb98bc60 100644
--- a/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h
+++ b/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019 Arm Limited and affiliates.
+* Copyright (c) 2019, Pelion and affiliates.
 * SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services.h b/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services.h
index 255b8ea950b..847dcbade83 100644
--- a/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services.h
+++ b/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2017, Arm Limited and affiliates.
+* Copyright (c) 2017, Pelion and affiliates.
 * SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services_config.h b/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services_config.h
index c93f83a0ca7..5300fcfe6de 100644
--- a/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services_config.h
+++ b/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services_config.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2017, Arm Limited and affiliates.
+* Copyright (c) 2017, Pelion and affiliates.
 * SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.c b/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.c
index 94561a3a5b9..a222aba949b 100644
--- a/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.c
+++ b/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2017, 2019 Arm Limited and affiliates.
+* Copyright (c) 2017, 2019, Pelion and affiliates.
 * SPDX-License-Identifier: Apache-2.0
 * Copyright 2016 by Andrey Butok. FNET Community.
 *
@@ -50,12 +50,12 @@
 #define FNET_MDNS_DOMAIN_NAME              "local"                 /* mDNS top level domain (TLD) name: local */
 #define FNET_MDNS_PORT                     FNET_CFG_MDNS_PORT      /* mDNS port */
 
-#define FNET_MDNS_WAIT                     250                     /* Wait 250ms to check domain name. */  
-#define FNET_MDNS_PROBE_WAIT               (5*1000)                /* Wait 5 seconds before trying again. */  
-#define FNET_MDNS_PROBE_DEFER_WAIT         (1*1000)                /* Defers to the winning host by waiting one second. */  
-#define FNET_MDNS_SHARED_RESPONSE_DELAY    (200)                   /* Delay for shared response. Random amount of time selected with uniform random distribution in the range 20-120 ms. */  
+#define FNET_MDNS_WAIT                     250                     /* Wait 250ms to check domain name. */
+#define FNET_MDNS_PROBE_WAIT               (5*1000)                /* Wait 5 seconds before trying again. */
+#define FNET_MDNS_PROBE_DEFER_WAIT         (1*1000)                /* Defers to the winning host by waiting one second. */
+#define FNET_MDNS_SHARED_RESPONSE_DELAY    (200)                   /* Delay for shared response. Random amount of time selected with uniform random distribution in the range 20-120 ms. */
 
-#define FNET_MDNS_ANNOUNCE_COUNT           (2)                     /* The Multicast DNS responder MUST send at least two unsolicited responses. */  
+#define FNET_MDNS_ANNOUNCE_COUNT           (2)                     /* The Multicast DNS responder MUST send at least two unsolicited responses. */
 #define FNET_MDNS_ANNOUNCE_INTERVAL        (1000)                  /* one second apart. */
 
 #define FNET_MDNS_HEADER_CLASS_IN          0x01                    /* Internet */
@@ -141,11 +141,11 @@ typedef struct fnet_mdns_service_if_s
 {
     const char                  *service_type;                      /* Service Type. Null-terminated string. Example _http._tcp*/
     fnet_uint16_t               service_port;                       /* Service Port number (in network byte order). */
-    const fnet_uint8_t          *(*service_get_txt)(void);          /* Call-back function, which returns pointer to the service TXT record (null-terminated). 
+    const fnet_uint8_t          *(*service_get_txt)(void);          /* Call-back function, which returns pointer to the service TXT record (null-terminated).
                                                                     * If the service does not provide any TXT record, this parameter must be set to NULL. */
     fnet_uint16_t               offset_service_name;                /* Pointer to service name. Offset from the start of the DNS message. Used for Domain Name Compression. */
     fnet_uint16_t               offset_service_type;                /* Pointer to service type. Offset from the start of the DNS message. Used for Domain Name Compression. */
-    fnet_mdns_query_type_t      response_type;                      /* Response type used in mDNS response.*/ 
+    fnet_mdns_query_type_t      response_type;                      /* Response type used in mDNS response.*/
 } fnet_mdns_service_if_t;
 
 /* MDNS interface structure */
@@ -158,9 +158,9 @@ typedef struct fnet_mdns_if
     fnet_uint32_t               rr_ttl_ip;                                      /* Resource record TTL for IP header, hop-count limit for a packet */
     fnet_address_family_t       addr_family;                                    /* Address family (IPv6 or IPv4 or both) the server will listen and send */
     fnet_size_t                 name_length;                                    /* Length of the service name without index postfix */
-    char                        host_name[FNET_MDNS_HOST_NAME_LEN_MAX+1];       /* Parsed "name" containing only legal symbols, optionally appended with host_name_count */  
+    char                        host_name[FNET_MDNS_HOST_NAME_LEN_MAX+1];       /* Parsed "name" containing only legal symbols, optionally appended with host_name_count */
     fnet_uint32_t               host_name_count;                                /* Count of try device name */
-    char                        service_name[FNET_MDNS_HOST_NAME_LEN_MAX+1];    /* Service name, optionally appended with host_name_count */  
+    char                        service_name[FNET_MDNS_HOST_NAME_LEN_MAX+1];    /* Service name, optionally appended with host_name_count */
     fnet_uint32_t               probe_count;                                    /* Number of sent probe queries without name conflict.*/
     fnet_uint32_t               announce_count;                                 /* Count of sent annoncemnts */
     fnet_socket_t               socket_listen;                                  /* Listening socket.*/
@@ -172,15 +172,15 @@ typedef struct fnet_mdns_if
     fnet_bool_t                 is_truncated;                                   /* RFC6762:In query messages, if the TC bit is set, it means that additional Known-Answer records may be following shortly.  A responder SHOULD
                                                                                 * record this fact, and wait for those additional Known-Answer records, before deciding whether to respond.*/
     fnet_bool_t                 is_legacy_unicast;                              /* If the source UDP port in a received Multicast DNS query is not port 5353*/
-    fnet_bool_t                 is_shared;                                      /* Response contains only shared records. 
+    fnet_bool_t                 is_shared;                                      /* Response contains only shared records.
                                                                                 * RFC 6762: In any case where there may be multiple responses, such as queries
                                                                                 * where the answer is a member of a shared resource record set, each
                                                                                 * responder SHOULD delay its response by a random amount of time
                                                                                 * selected with uniform random distribution in the range 20-120 ms.  */
     fnet_uint32_t               is_shared_timestamp;                            /* Timestamp of shared response query.*/
     struct sockaddr             remote_address;                                 /* Remote address.*/
-    fnet_address_family_t       response_address_family;                        /* Address family used in mDNS response.*/                 
-    fnet_mdns_query_type_t     response_type;                                   /* Response type used in mDNS response.*/  
+    fnet_address_family_t       response_address_family;                        /* Address family used in mDNS response.*/
+    fnet_mdns_query_type_t     response_type;                                   /* Response type used in mDNS response.*/
     fnet_mdns_service_if_t     service_if_list[FNET_CFG_MDNS_SERVICE_MAX];      /* Service Discovery List */
 } fnet_mdns_if_t;
 
@@ -188,7 +188,7 @@ typedef struct fnet_mdns_if
 FNET_COMP_PACKED_BEGIN
 typedef struct fnet_mdns_header_s
 {
-    fnet_uint16_t    ip  FNET_COMP_PACKED; 
+    fnet_uint16_t    ip  FNET_COMP_PACKED;
     fnet_uint16_t    flags   FNET_COMP_PACKED;          /* flags */
     fnet_uint16_t    qdcount FNET_COMP_PACKED;          /* count of questions */
     fnet_uint16_t    ancount FNET_COMP_PACKED;          /* count of answers */
@@ -462,7 +462,7 @@ fnet_mdns_service_desc_t fnet_mdns_service_register(fnet_mdns_desc_t mdns_desc,
             for(i = 0; i<FNET_CFG_MDNS_SERVICE_MAX; i++)
             {
                 /* Find empty service entry.*/
-                if(mdns_if->service_if_list[i].service_type == NULL) 
+                if(mdns_if->service_if_list[i].service_type == NULL)
                 {
                     mdns_if->service_if_list[i].service_type = service->service_type;
                     mdns_if->service_if_list[i].service_port = service->service_port;
@@ -582,7 +582,7 @@ static void fnet_mdns_update_name(fnet_mdns_if_t *mdns_if, const fnet_char_t *na
         /* Copy name. */
         fnet_strcpy(mdns_if->host_name, name);
         fnet_strcpy(mdns_if->service_name, name);
-       
+
         /* Allow only legal characters in address record names.*/
         for(c = mdns_if->host_name; *c != '\0'; c++)
         {
@@ -607,7 +607,7 @@ static void fnet_mdns_update_name(fnet_mdns_if_t *mdns_if, const fnet_char_t *na
     FNET_DEBUG_MDNS("MDNS: Host-name set to (%s).", mdns_if->host_name);
 }
 /************************************************************************
-* DESCRIPTION: Update counter of host and service name. 
+* DESCRIPTION: Update counter of host and service name.
 ************************************************************************/
 static void fnet_mdns_update_name_counter(fnet_mdns_if_t *mdns_if)
 {
@@ -780,7 +780,7 @@ static fnet_bool_t fnet_mdns_cmp_rr_name(const char *rr_name, const char *name_1
 }
 
 /************************************************************************
-* DESCRIPTION: Compare R name with sub-name. 
+* DESCRIPTION: Compare R name with sub-name.
 ************************************************************************/
 static fnet_bool_t fnet_mdns_cmp_name(const char **rr_name_p, const char *name)
 {
@@ -821,8 +821,8 @@ static fnet_bool_t fnet_mdns_cmp_name(const char **rr_name_p, const char *name)
 }
 
 /************************************************************************
-* DESCRIPTION: Put RR name to rr_name. Retutns pointer to the next pointer; 0 if error. 
-If rr_name or rr_name_size are 0, just skip name. 
+* DESCRIPTION: Put RR name to rr_name. Retutns pointer to the next pointer; 0 if error.
+If rr_name or rr_name_size are 0, just skip name.
 ************************************************************************/
 static const fnet_uint8_t *fnet_mdns_get_rr_name(char *rr_name, fnet_uint32_t rr_name_size, const fnet_uint8_t *rr, const fnet_uint8_t *packet)
 {
@@ -832,7 +832,7 @@ static const fnet_uint8_t *fnet_mdns_get_rr_name(char *rr_name, fnet_uint32_t rr
     const fnet_uint8_t   *ptr = rr;
     fnet_uint8_t         length = *rr;
     fnet_uint16_t        offset = 0;
-    const fnet_uint8_t   *result = ptr; 
+    const fnet_uint8_t   *result = ptr;
 
     while(length != 0)
     {
@@ -861,7 +861,7 @@ static const fnet_uint8_t *fnet_mdns_get_rr_name(char *rr_name, fnet_uint32_t rr
         {
             goto ERROR;
         }
-                
+
         length = *ptr;
 
         if( rr_name && rr_name_size ) /* Copy to rr_name buffer.*/
@@ -872,7 +872,7 @@ static const fnet_uint8_t *fnet_mdns_get_rr_name(char *rr_name, fnet_uint32_t rr
 
                 rr_name += (length+1);
                 rr_name_size -= (length+1);
-            }        
+            }
             else
             {
                 goto ERROR;
@@ -917,10 +917,10 @@ static fnet_mdns_query_type_t fnet_mdns_get_query_type(fnet_uint16_t type)
             break;
         case FNET_HTONS(FNET_MDNS_RR_ANY):
             query_rr_type = FNET_MDNS_QUERY_ANY;
-            break; 
+            break;
         default:
             query_rr_type = FNET_MDNS_QUERY_NONE;
-            break;                                
+            break;
     }
 
     return query_rr_type;
@@ -937,7 +937,7 @@ static void fnet_mdns_print_qe_name(const fnet_char_t *prefix, const fnet_char_t
     fnet_uint8_t    name_length_index = 0;
     fnet_index_t    i;
 
-    fnet_print("%s", prefix); /* Print prefix*/    
+    fnet_print("%s", prefix); /* Print prefix*/
 
     for(i=0; i<qe_name_legth; i++)
     {
@@ -1018,14 +1018,14 @@ static const fnet_uint8_t * fnet_mdns_process_query(fnet_mdns_if_t *mdns_if, fne
                             {
                                 service->response_type |= query_type;
                             }
-                            mdns_if->response_address_family |= address_family;         
+                            mdns_if->response_address_family |= address_family;
                         }
                     }
                     break;
                 case FNET_MDNS_STATE_PROBING:
                     /* Compare received hostname with my_device.local or my_device._hap._tcp.local*/
-                    if(fnet_mdns_is_our_host_name(mdns_if, qe_name) 
-                        || fnet_mdns_get_service_by_name(mdns_if, qe_name)) 
+                    if(fnet_mdns_is_our_host_name(mdns_if, qe_name)
+                        || fnet_mdns_get_service_by_name(mdns_if, qe_name))
                     {
                     #if FNET_CFG_DEBUG_MDNS && FNET_CFG_DEBUG
                         fnet_mdns_print_qe_name("MDNS: RX Probe for:", qe_name);
@@ -1059,19 +1059,19 @@ static const fnet_uint8_t * fnet_mdns_process_query(fnet_mdns_if_t *mdns_if, fne
 }
 
 /************************************************************************
-* DESCRIPTION: Avoid duplicate answer. 
+* DESCRIPTION: Avoid duplicate answer.
 ************************************************************************/
 static void fnet_mdns_process_duplicate_answer(fnet_mdns_if_t *mdns_if, const fnet_uint8_t *an_ptr, const fnet_uint8_t *packet, fnet_uint32_t packet_size)
 {
     FNET_ASSERT(mdns_if != NULL);
     FNET_ASSERT(an_ptr != NULL);
-    FNET_ASSERT(packet != NULL); 
+    FNET_ASSERT(packet != NULL);
 
     fnet_uint8_t            our_rr[FNET_MDNS_RR_PROBE_LEN_MAX];
     fnet_mdns_header_t      *mdns_header = (fnet_mdns_header_t *)packet;
     fnet_uint16_t           an_count = FNET_HTONS(mdns_header->ancount);
     const fnet_uint8_t      *ptr = an_ptr;
-    fnet_mdns_rr_header_t   *rr_header;   
+    fnet_mdns_rr_header_t   *rr_header;
     fnet_uint32_t           i;
     fnet_mdns_query_type_t  rr_type;
     fnet_bool_t             skip;
@@ -1090,7 +1090,7 @@ static void fnet_mdns_process_duplicate_answer(fnet_mdns_if_t *mdns_if, const fn
         }
 
         rr_type = fnet_mdns_get_query_type(rr_header->type);
- 
+
         skip = FNET_FALSE;
 
         /* Generate our record.*/
@@ -1156,7 +1156,7 @@ static void fnet_mdns_process_duplicate_answer(fnet_mdns_if_t *mdns_if, const fn
                 skip = FNET_TRUE;
                 break;
         }
-        
+
         if(skip == FNET_TRUE)
         {   /* Skip RR record.*/
             ptr += sizeof(fnet_mdns_rr_header_t) + FNET_HTONS(rr_header->data_length);
@@ -1218,12 +1218,12 @@ static void fnet_mdns_process_simultaneous_probe(fnet_mdns_if_t *mdns_if, const
         if(fnet_mdns_is_rr_win(our_rr, ns_ptr, ns_count, packet) == FNET_TRUE)
         {
             fnet_uint32_t    i;
-            
-            is_win = FNET_TRUE;    
-            
+
+            is_win = FNET_TRUE;
+
             for(i = 0; i<FNET_CFG_MDNS_SERVICE_MAX; i++)
             {
-                if(mdns_if->service_if_list[i].service_type != NULL) 
+                if(mdns_if->service_if_list[i].service_type != NULL)
                 {
                     /* Prepare and Compare Our RR SRV records */
                     if(fnet_mdns_add_rr_srv(mdns_if, our_rr,  sizeof(our_rr), &mdns_if->service_if_list[i], mdns_if->rr_ttl, FNET_FALSE, FNET_FALSE) == NULL)
@@ -1237,7 +1237,7 @@ static void fnet_mdns_process_simultaneous_probe(fnet_mdns_if_t *mdns_if, const
                     else
                     {
                         is_win = FNET_FALSE;
-                        break; 
+                        break;
                     }
                 }
             }
@@ -1249,7 +1249,7 @@ static void fnet_mdns_process_simultaneous_probe(fnet_mdns_if_t *mdns_if, const
         /* RFC6762: If the host finds that its
         own data is lexicographically earlier, then it defers to the winning
         host by waiting one second, and then begins probing for this record again.*/
-        mdns_if->probe_wait_interval = FNET_MDNS_PROBE_DEFER_WAIT;     
+        mdns_if->probe_wait_interval = FNET_MDNS_PROBE_DEFER_WAIT;
         /* Save conflict timestamp.*/
         mdns_if->host_name_conflict_timestamp = fnet_timer_get_ms(); //TBD move to state change.
         fnet_mdns_change_state(mdns_if, FNET_MDNS_STATE_PROBING_WAIT); /* Reset probing.*/
@@ -1259,7 +1259,7 @@ static void fnet_mdns_process_simultaneous_probe(fnet_mdns_if_t *mdns_if, const
 }
 
 /************************************************************************
-* DESCRIPTION: Get pointer to Answer Record. 
+* DESCRIPTION: Get pointer to Answer Record.
 ************************************************************************/
 static const fnet_uint8_t *fnet_mdns_get_an(const fnet_uint8_t *packet, fnet_uint32_t packet_size)
 {
@@ -1267,7 +1267,7 @@ static const fnet_uint8_t *fnet_mdns_get_an(const fnet_uint8_t *packet, fnet_uin
 
     fnet_mdns_header_t      *mdns_header = (fnet_mdns_header_t *)packet;
     fnet_uint16_t           qd_count; /* Question Count */
-    fnet_uint16_t           an_count; /* Answer Record Count */    
+    fnet_uint16_t           an_count; /* Answer Record Count */
     const fnet_uint8_t      *result = NULL;
     fnet_index_t            i;
     const fnet_uint8_t      *ptr;
@@ -1276,7 +1276,7 @@ static const fnet_uint8_t *fnet_mdns_get_an(const fnet_uint8_t *packet, fnet_uin
     {
         qd_count = FNET_HTONS(mdns_header->qdcount);  /* Question Count */
         an_count = FNET_HTONS(mdns_header->ancount);  /* Answer Record Count */
-    
+
         /* Skip mDNS header.*/
         ptr = packet + sizeof(fnet_mdns_header_t);
 
@@ -1307,7 +1307,7 @@ static const fnet_uint8_t *fnet_mdns_get_an(const fnet_uint8_t *packet, fnet_uin
 }
 
 /************************************************************************
-* DESCRIPTION: Get pointer to Name Server (Authority Record). 
+* DESCRIPTION: Get pointer to Name Server (Authority Record).
 ************************************************************************/
 static const fnet_uint8_t *fnet_mdns_get_ns(fnet_uint8_t *packet, fnet_uint32_t packet_size)
 {
@@ -1315,8 +1315,8 @@ static const fnet_uint8_t *fnet_mdns_get_ns(fnet_uint8_t *packet, fnet_uint32_t
 
     fnet_mdns_header_t      *mdns_header = (fnet_mdns_header_t *)packet;
     fnet_uint16_t           qd_count; /* Question Count */
-    fnet_uint16_t           an_count; /* Answer Record Count */    
-    fnet_uint16_t           ns_count; /* Authority Record Count */   
+    fnet_uint16_t           an_count; /* Answer Record Count */
+    fnet_uint16_t           ns_count; /* Authority Record Count */
     const fnet_uint8_t      *result = NULL;
     fnet_index_t            i;
     const fnet_uint8_t      *ptr;
@@ -1326,7 +1326,7 @@ static const fnet_uint8_t *fnet_mdns_get_ns(fnet_uint8_t *packet, fnet_uint32_t
         qd_count = FNET_HTONS(mdns_header->qdcount);  /* Question Count */
         an_count = FNET_HTONS(mdns_header->ancount);  /* Answer Record Count */
         ns_count = FNET_HTONS(mdns_header->nscount);  /* Authority Record Count */
-    
+
         /* Skip mDNS header.*/
         ptr = packet + sizeof(fnet_mdns_header_t);
 
@@ -1363,7 +1363,7 @@ static const fnet_uint8_t *fnet_mdns_get_ns(fnet_uint8_t *packet, fnet_uint32_t
             {
                 goto ERROR;
             }
-        }  
+        }
 
         if(ns_count > 0)
         {
@@ -1387,7 +1387,7 @@ static fnet_int32_t fnet_mdns_cmp_rr(fnet_uint8_t *our_rr, const fnet_uint8_t **
     fnet_uint16_t           rr_type;        /* RR type */
     fnet_uint16_t           rr_class;       /* RR class */
     const fnet_uint8_t      *rr_data;
-    fnet_uint16_t           rr_data_length; 
+    fnet_uint16_t           rr_data_length;
     fnet_mdns_rr_header_t   *rr_header;
     const fnet_uint8_t      *ptr = *rr;
     fnet_char_t             rr_name[FNET_MDNS_RR_NAME_LEN_MAX];
@@ -1395,7 +1395,7 @@ static fnet_int32_t fnet_mdns_cmp_rr(fnet_uint8_t *our_rr, const fnet_uint8_t **
     fnet_uint16_t           our_rr_class;       /* RR class */
     const fnet_uint8_t      *our_rr_data;
     fnet_uint16_t           our_rr_data_length;
-    fnet_mdns_rr_header_t   *our_rr_header;   
+    fnet_mdns_rr_header_t   *our_rr_header;
     fnet_int32_t            result;
 
     our_rr_header = (fnet_mdns_rr_header_t *)(our_rr + fnet_strlen((char *)our_rr)+1);
@@ -1418,17 +1418,17 @@ static fnet_int32_t fnet_mdns_cmp_rr(fnet_uint8_t *our_rr, const fnet_uint8_t **
     if(ptr)
     {
         rr_header = (fnet_mdns_rr_header_t *)ptr;
-        ptr += sizeof(fnet_mdns_rr_header_t); 
+        ptr += sizeof(fnet_mdns_rr_header_t);
 
         rr_data_length = FNET_HTONS(rr_header->data_length);
-     
+
         /* Compare RR names.*/
         if(fnet_strcmp((char*)our_rr, (char*)rr_name) == 0)
         {
             rr_data = ptr;
             rr_class = FNET_HTONS(rr_header->rr_class) & (~FNET_HTONS(FNET_MDNS_HEADER_CACHE_FLUSH));
             rr_type = FNET_HTONS(rr_header->type);
-     
+
             /* RFC6762: The determination of "lexicographically later" is performed by first
             comparing the record class (excluding the cache-flush bit described
             in Section 10.2), then the record type, then raw comparison of the
@@ -1447,7 +1447,7 @@ static fnet_int32_t fnet_mdns_cmp_rr(fnet_uint8_t *our_rr, const fnet_uint8_t **
             {
                 /* RFC6762: Otherwise, if the record types
                 differ, then the numerically greater type is considered
-                "lexicographically later".*/ 
+                "lexicographically later".*/
                 if(rr_type < our_rr_type)
                 {
                     result = 1; /* Win. */
@@ -1457,21 +1457,21 @@ static fnet_int32_t fnet_mdns_cmp_rr(fnet_uint8_t *our_rr, const fnet_uint8_t **
                     result = -1; /* Loss. */
                 }
                 /* RFC6762: If the rrtype and rrclass both match,
-                then the rdata is compared.*/ 
-                else if(rr_data_length) 
+                then the rdata is compared.*/
+                else if(rr_data_length)
                 {
                     int             cmp_res;
                     fnet_uint16_t        cmp_length;
-     
+
                     cmp_length = (rr_data_length > our_rr_data_length)? our_rr_data_length : rr_data_length; /* Get min length value */
-     
+
                     cmp_res = fnet_memcmp(rr_data, our_rr_data, cmp_length);
-     
+
                     if(cmp_res < 0)
                     {
                         result = 1; /* Win. */
-                    }                                              
-                    else if (cmp_res > 0) 
+                    }
+                    else if (cmp_res > 0)
                     {
                         result = -1; /* Loss. */
                     }
@@ -1498,7 +1498,7 @@ static fnet_int32_t fnet_mdns_cmp_rr(fnet_uint8_t *our_rr, const fnet_uint8_t **
                             }
                             else
                             {
-                                result = 1; 
+                                result = 1;
                             }
                         }
                     }
@@ -1559,18 +1559,18 @@ static fnet_bool_t fnet_mdns_is_rr_win(fnet_uint8_t *our_rr, const fnet_uint8_t
 
     if(i == ns_count)
     {
-       result = FNET_FALSE; 
+       result = FNET_FALSE;
     }
     else
     {
-       result = FNET_TRUE; 
+       result = FNET_TRUE;
     }
 
     return result;
 }
 
 /************************************************************************
-* DESCRIPTION: Process MDNS response 
+* DESCRIPTION: Process MDNS response
 ************************************************************************/
 static const fnet_uint8_t *fnet_mdns_process_response(fnet_mdns_if_t *mdns_if, const fnet_uint8_t * ptr, fnet_uint8_t *packet, fnet_uint32_t packet_size)
 {
@@ -1581,7 +1581,7 @@ static const fnet_uint8_t *fnet_mdns_process_response(fnet_mdns_if_t *mdns_if, c
     fnet_char_t    rr_name[FNET_MDNS_RR_NAME_LEN_MAX];
 
     /* Header follows the hostname and the terminating zero */
-    fnet_mdns_rr_header_t *rr_header; 
+    fnet_mdns_rr_header_t *rr_header;
 
     if( packet_size > (sizeof(fnet_mdns_header_t) + sizeof(fnet_mdns_rr_header_t)) ) /* TND make it universal*/
     {
@@ -1599,8 +1599,8 @@ static const fnet_uint8_t *fnet_mdns_process_response(fnet_mdns_if_t *mdns_if, c
                 && ( rr_header->rr_class == FNET_HTONS((FNET_MDNS_HEADER_CLASS_IN | FNET_MDNS_HEADER_CACHE_FLUSH)) )
             #if 0 /* Cause of Test warnings.*/
                 && ((rr_header->type == FNET_HTONS(FNET_MDNS_RR_SRV)) ||
-                    (rr_header->type == FNET_HTONS(FNET_MDNS_RR_A)) || 
-                    (rr_header->type == FNET_HTONS(FNET_MDNS_RR_AAAA))) 
+                    (rr_header->type == FNET_HTONS(FNET_MDNS_RR_A)) ||
+                    (rr_header->type == FNET_HTONS(FNET_MDNS_RR_AAAA)))
             #endif
                 )   /* service instance name */
             {
@@ -1655,7 +1655,7 @@ static void fnet_mdns_recv(fnet_mdns_if_t *mdns_if)
     const fnet_uint8_t      *ptr;
     fnet_index_t            i;
     fnet_size_t             addr_len;
- 
+
     /* Receive UDP data */
     addr_len = sizeof(mdns_if->remote_address);
     received = fnet_socket_recvfrom( mdns_if->socket_listen, mdns_if->buffer, sizeof(mdns_if->buffer), 0u, &mdns_if->remote_address, &addr_len );
@@ -1670,9 +1670,9 @@ static void fnet_mdns_recv(fnet_mdns_if_t *mdns_if)
                 if((size_t)received > sizeof(fnet_mdns_header_t))
                 {
                     mdns_header = (fnet_mdns_header_t*)&mdns_if->buffer[0];
- 
+
                     char *hostname = (char*)&mdns_if->buffer[sizeof(fnet_mdns_header_t)];
- 
+
                     /* Query */
                     if( ((mdns_header->flags & FNET_HTONS(FNET_MDNS_HEADER_FLAGS_QR)) == 0)       /* Query.*/
                                && ((mdns_header->flags & FNET_HTONS(FNET_MDNS_HEADER_FLAGS_OPCODE)) == 0) ) /* Standard Query */
@@ -1685,7 +1685,7 @@ static void fnet_mdns_recv(fnet_mdns_if_t *mdns_if)
                         {
                             mdns_if->is_legacy_unicast = FNET_FALSE;
                         }
- 
+
                         if( (mdns_header->flags & FNET_HTONS(FNET_MDNS_HEADER_FLAGS_TC)) == 0)       /* Trancation.*/
                         {
                             mdns_if->is_truncated = FNET_FALSE;
@@ -1694,7 +1694,7 @@ static void fnet_mdns_recv(fnet_mdns_if_t *mdns_if)
                         {
                             mdns_if->is_truncated = FNET_TRUE;
                         }
- 
+
                         ptr = (fnet_uint8_t*)hostname;
                         for(i=0; i<FNET_HTONS(mdns_header->qdcount); i++)
                         {
@@ -1704,14 +1704,14 @@ static void fnet_mdns_recv(fnet_mdns_if_t *mdns_if)
                                 return;
                             }
                         }
-                        
+
                         /* Duplicate Suppression.*/
                         if(mdns_if->response_type != FNET_MDNS_QUERY_NONE)
                         {
                             const fnet_uint8_t           *an_ptr;
- 
+
                             an_ptr = fnet_mdns_get_an(mdns_if->buffer, received);
-                            
+
                             /* Eliminate duplicated answers */
                             if(an_ptr)
                             {
@@ -1728,7 +1728,7 @@ static void fnet_mdns_recv(fnet_mdns_if_t *mdns_if)
                             )
                     {
                         cnt = FNET_HTONS(mdns_header->nscount) + FNET_HTONS(mdns_header->arcount) + FNET_HTONS(mdns_header->ancount) + FNET_HTONS(mdns_header->qdcount);
- 
+
                         ptr = (fnet_uint8_t*)hostname;
                         for(i=0; (i < cnt) && (ptr < (mdns_if->buffer + received)); i++)
                         {
@@ -1747,11 +1747,11 @@ static void fnet_mdns_recv(fnet_mdns_if_t *mdns_if)
                 break;
         }
     }
- 
+
 }
 
 /************************************************************************
-* DESCRIPTION: Prepare domain name - replace dots by length of string 
+* DESCRIPTION: Prepare domain name - replace dots by length of string
 ************************************************************************/
 static fnet_uint8_t *fnet_mdns_add_domain_name(fnet_uint8_t *buf, fnet_uint32_t buf_size, const char * domain_name)
 {
@@ -1760,7 +1760,7 @@ static fnet_uint8_t *fnet_mdns_add_domain_name(fnet_uint8_t *buf, fnet_uint32_t
 
     fnet_uint32_t   domain_len = fnet_strlen(domain_name) + 1;
     fnet_uint32_t   len = 0;
-    fnet_index_t    i;      
+    fnet_index_t    i;
     fnet_index_t    p = 0;
     fnet_uint8_t    *result = NULL;
 
@@ -1898,7 +1898,7 @@ static void fnet_mdns_send_probe(fnet_mdns_if_t *mdns_if)
     }
     nscount++;
 #endif
-   
+
     /* Prepare RR AAAA record */
     ptr = fnet_mdns_add_rr_aaaa(mdns_if, ptr, (buf_end - ptr), mdns_if->rr_ttl_ip, FNET_FALSE, FNET_TRUE);
     if(ptr == NULL)
@@ -2031,7 +2031,7 @@ static void fnet_mdns_send_response(fnet_mdns_if_t *mdns_if, fnet_uint32_t ttl,
     /* Answer records */
     for(i = 0; i<FNET_CFG_MDNS_SERVICE_MAX; i++)
     {
-        if(mdns_if->service_if_list[i].service_type) 
+        if(mdns_if->service_if_list[i].service_type)
         {
             /* Prepare TXT record */
             if(mdns_if->service_if_list[i].response_type & FNET_MDNS_QUERY_TXT)
@@ -2076,7 +2076,7 @@ static void fnet_mdns_send_response(fnet_mdns_if_t *mdns_if, fnet_uint32_t ttl,
 #if FNET_CFG_IP4
     // Do not send A record in IPV6 only stack
     /* Prepare RR A record */
-    if(mdns_if->response_type & FNET_MDNS_QUERY_A) 
+    if(mdns_if->response_type & FNET_MDNS_QUERY_A)
     {
         ptr = fnet_mdns_add_rr_a(mdns_if, ptr, (buf_end - ptr), ttl, flush, FNET_TRUE);
         if(ptr == NULL)
@@ -2108,7 +2108,7 @@ static void fnet_mdns_send_response(fnet_mdns_if_t *mdns_if, fnet_uint32_t ttl,
     o  All address records (type "A" and "AAAA") named in the SRV rdata.*/
     for(i = 0; i<FNET_CFG_MDNS_SERVICE_MAX; i++)
     {
-        if(mdns_if->service_if_list[i].service_type) 
+        if(mdns_if->service_if_list[i].service_type)
         {
             if(mdns_if->service_if_list[i].response_type & FNET_MDNS_QUERY_PTR)
             {
@@ -2442,7 +2442,7 @@ static fnet_uint8_t * fnet_mdns_add_rr_aaaa(fnet_mdns_if_t *mdns_if, fnet_uint8_
     fnet_netif_ip6_addr_info_t  addr_info = {.state = FNET_NETIF_IP6_ADDR_STATE_NOT_USED};
 
     fnet_netif_get_ip6_addr (mdns_if->netif, 0u, &addr_info); /* Just get 1st address.*/
- 
+
     ptr = fnet_mdns_add_host_name(mdns_if, ptr, (buf+buf_size) - ptr, compression);
     if(ptr == NULL)
     {
@@ -2522,7 +2522,7 @@ static fnet_uint8_t * fnet_mdns_add_host_name(fnet_mdns_if_t *mdns_if, fnet_uint
 {
     FNET_ASSERT(mdns_if != NULL);
     FNET_ASSERT(buf != NULL);
-    
+
     fnet_uint8_t     *ptr = buf;
     fnet_uint8_t     *result = NULL;
 
@@ -2541,7 +2541,7 @@ static fnet_uint8_t * fnet_mdns_add_host_name(fnet_mdns_if_t *mdns_if, fnet_uint
         {
             /* Offset, used by Domain Name Compression.*/
             fnet_uint16_t offset = ptr - mdns_if->buffer;
-                
+
             if(offset <= 0x3FFF) /* Check offset maximum value.*/
             {
                 mdns_if->offset_host_name = offset;
@@ -2578,7 +2578,7 @@ static fnet_uint8_t * fnet_mdns_add_service_name(fnet_mdns_if_t *mdns_if, fnet_u
 {
     FNET_ASSERT(mdns_if != NULL);
     FNET_ASSERT(buf != NULL);
-    
+
     fnet_uint16_t    offset;
     fnet_uint8_t     *ptr = buf;
     fnet_uint8_t     *result = NULL;
@@ -2700,14 +2700,14 @@ static fnet_uint8_t * fnet_mdns_add_service_type_name(fnet_mdns_if_t *mdns_if, f
 }
 
 /************************************************************************
-* DESCRIPTION:  Determines if host_name is our fully qualified domain 
+* DESCRIPTION:  Determines if host_name is our fully qualified domain
 *               name FQDN (hostname.domain).
 ************************************************************************/
 static fnet_bool_t fnet_mdns_is_our_host_name(fnet_mdns_if_t *mdns_if, char *host_name)
 {
     FNET_ASSERT(mdns_if != NULL);
 
-    return fnet_mdns_cmp_rr_name(host_name, "", mdns_if->host_name);    
+    return fnet_mdns_cmp_rr_name(host_name, "", mdns_if->host_name);
 }
 
 /************************************************************************
@@ -2722,7 +2722,7 @@ static fnet_mdns_service_if_t *fnet_mdns_get_service_by_name(fnet_mdns_if_t *mdn
 
     for(i = 0; i<FNET_CFG_MDNS_SERVICE_MAX; i++)
     {
-        if(mdns_if->service_if_list[i].service_type != NULL) 
+        if(mdns_if->service_if_list[i].service_type != NULL)
         {
             if(fnet_mdns_cmp_rr_name(service_name, mdns_if->service_name, mdns_if->service_if_list[i].service_type) == FNET_TRUE)
             {
@@ -2747,7 +2747,7 @@ static fnet_mdns_service_if_t *fnet_mdns_get_service_by_type(fnet_mdns_if_t *mdn
 
     for(i = 0; i<FNET_CFG_MDNS_SERVICE_MAX; i++)
     {
-        if(mdns_if->service_if_list[i].service_type != NULL) 
+        if(mdns_if->service_if_list[i].service_type != NULL)
         {
             if(fnet_mdns_cmp_rr_name(service_name, "", mdns_if->service_if_list[i].service_type) == FNET_TRUE)
             {
diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.h b/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.h
index ff3e2f71197..3c2cd12bf28 100644
--- a/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.h
+++ b/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2017, Arm Limited and affiliates.
+* Copyright (c) 2017, Pelion and affiliates.
 * SPDX-License-Identifier: Apache-2.0
 * Copyright 2016 by Andrey Butok. FNET Community.
 *
@@ -71,7 +71,7 @@ struct fnet_mdns_params
 };
 
 /**************************************************************************/ /*!
- * @brief The mDNS Service structure defining application-specific 
+ * @brief The mDNS Service structure defining application-specific
  * service, advertised by the mDNS server.
  * @see fnet_mdns_service_register()
  ******************************************************************************/
@@ -79,7 +79,7 @@ typedef struct fnet_mdns_service
 {
     const char*         service_type;               /**< @brief Service Type. Null-terminated string. Example "_http._tcp". */
     fnet_uint16_t       service_port;               /**< @brief Service Port number (in network byte order). */
-    const fnet_uint8_t* (*service_get_txt)(void);   /**< @brief Call-back function, which returns a pointer to the service TXT record (null-terminated). 
+    const fnet_uint8_t* (*service_get_txt)(void);   /**< @brief Call-back function, which returns a pointer to the service TXT record (null-terminated).
                                                     If the service does not provide any TXT record, this parameter must be set to NULL. */
 } fnet_mdns_service_t;
 
@@ -173,7 +173,7 @@ fnet_mdns_service_desc_t fnet_mdns_service_register(fnet_mdns_desc_t mdns_desc,
  ******************************************************************************
  *
  * This function unregisters application service, assigned to the @c service_desc
- * descriptor, and stops its advertisement by the mDNS server.  
+ * descriptor, and stops its advertisement by the mDNS server.
  *
  ******************************************************************************/
 void fnet_mdns_service_unregister(fnet_mdns_service_desc_t service_desc);
@@ -189,7 +189,7 @@ void fnet_mdns_service_unregister(fnet_mdns_service_desc_t service_desc);
  ******************************************************************************
  *
  * This function sends unsolicited mDNS announcement.@n
- * Application may call it when any advertised application-specific parameter 
+ * Application may call it when any advertised application-specific parameter
  * has changed (e.g. network interface IP address or service TXT-record content).@n
  * RFC 6762: "At any time, if the rdata of any of a host's Multicast DNS records
  *  changes, the host MUST repeat the Announcing step to
diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.c b/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.c
index 8dbd864af9b..608d7b57295 100644
--- a/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.c
+++ b/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.c
@@ -1,5 +1,5 @@
 /**************************************************************************
-* Copyright (c) 2017, Arm Limited and affiliates.
+* Copyright (c) 2017, Pelion and affiliates.
 * SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial.h b/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial.h
index 3bfde795206..f2268124e0f 100644
--- a/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial.h
+++ b/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2017, Arm Limited and affiliates.
+* Copyright (c) 2017, Pelion and affiliates.
 * SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_debug.h b/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_debug.h
index b918c9b10b8..fa26aa6bd80 100644
--- a/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_debug.h
+++ b/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_debug.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2017, Arm Limited and affiliates.
+* Copyright (c) 2017, Pelion and affiliates.
 * SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Andrey Butok. Freescale Semiconductor, Inc.
diff --git a/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.c b/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.c
index 61c2580ce4b..0627d706b24 100644
--- a/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.c
+++ b/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2017, Arm Limited and affiliates.
+* Copyright (c) 2017, Pelion and affiliates.
 * SPDX-License-Identifier: Apache-2.0
 * Copyright 2011-2016 by Andrey Butok. FNET Community.
 * Copyright 2008-2010 by Freescale Semiconductor, Inc.
diff --git a/source/Service_Libs/mdns/fnet_user_config.h b/source/Service_Libs/mdns/fnet_user_config.h
index 3c742838981..d94de3e1a76 100644
--- a/source/Service_Libs/mdns/fnet_user_config.h
+++ b/source/Service_Libs/mdns/fnet_user_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mdns/ns_fnet_events.c b/source/Service_Libs/mdns/ns_fnet_events.c
index 1749e7b2580..71e150010d4 100644
--- a/source/Service_Libs/mdns/ns_fnet_events.c
+++ b/source/Service_Libs/mdns/ns_fnet_events.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mdns/ns_fnet_events.h b/source/Service_Libs/mdns/ns_fnet_events.h
index 9a3afae8658..ded8a0207ea 100644
--- a/source/Service_Libs/mdns/ns_fnet_events.h
+++ b/source/Service_Libs/mdns/ns_fnet_events.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mdns/ns_fnet_port.c b/source/Service_Libs/mdns/ns_fnet_port.c
index 456a2f200e1..5b7dc1553d7 100644
--- a/source/Service_Libs/mdns/ns_fnet_port.c
+++ b/source/Service_Libs/mdns/ns_fnet_port.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, Arm Limited and affiliates.
+ * Copyright (c) 2017-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mdns/ns_fnet_types.h b/source/Service_Libs/mdns/ns_fnet_types.h
index 6609d381e47..15ca5a80a88 100644
--- a/source/Service_Libs/mdns/ns_fnet_types.h
+++ b/source/Service_Libs/mdns/ns_fnet_types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited and affiliates.
+ * Copyright (c) 2017, Peliond and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mdns/ns_mdns_api.c b/source/Service_Libs/mdns/ns_mdns_api.c
index e0c89581468..2afb44fffa7 100644
--- a/source/Service_Libs/mdns/ns_mdns_api.c
+++ b/source/Service_Libs/mdns/ns_mdns_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, Arm Limited and affiliates.
+ * Copyright (c) 2017-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

From 7d853de8624863c9242c585488e7030be74e017f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=20Lepp=C3=A4nen?= <mika.leppanen@arm.com>
Date: Wed, 12 May 2021 11:24:42 +0300
Subject: [PATCH 20/43] When EAPOL waiting queue is full oldest entry is
 removed

When list is full oldest supplicant entry is deleted and purge request
(empty EAPOL message) for that supplicant is sent to LLC to remove
the LLC EAPOL entry.
---
 source/6LoWPAN/ws/ws_pae_auth.c               |  23 ++-
 source/Security/kmp/kmp_api.h                 |   1 +
 .../protocols/msg_sec_prot/msg_sec_prot.c     | 148 ++++++++++++++++++
 .../protocols/msg_sec_prot/msg_sec_prot.h     |  37 +++++
 sources.mk                                    |   1 +
 5 files changed, 206 insertions(+), 4 deletions(-)
 create mode 100644 source/Security/protocols/msg_sec_prot/msg_sec_prot.c
 create mode 100644 source/Security/protocols/msg_sec_prot/msg_sec_prot.h

diff --git a/source/6LoWPAN/ws/ws_pae_auth.c b/source/6LoWPAN/ws/ws_pae_auth.c
index 452f3c5015d..7c2a76c7719 100644
--- a/source/6LoWPAN/ws/ws_pae_auth.c
+++ b/source/6LoWPAN/ws/ws_pae_auth.c
@@ -44,6 +44,7 @@
 #include "Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.h"
 #include "Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.h"
 #include "Security/protocols/radius_sec_prot/radius_client_sec_prot.h"
+#include "Security/protocols/msg_sec_prot/msg_sec_prot.h"
 #include "6LoWPAN/ws/ws_cfg_settings.h"
 #include "6LoWPAN/ws/ws_pae_controller.h"
 #include "6LoWPAN/ws/ws_pae_timers.h"
@@ -237,6 +238,10 @@ int8_t ws_pae_auth_init(protocol_interface_info_entry_t *interface_ptr, sec_prot
         goto error;
     }
 
+    if (msg_sec_prot_register(pae_auth->kmp_service) < 0) {
+        goto error;
+    }
+
     if (tasklet_id < 0) {
         tasklet_id = eventOS_event_handler_create(ws_pae_auth_tasklet_handler, PAE_TASKLET_INIT);
         if (tasklet_id < 0) {
@@ -964,10 +969,20 @@ static supp_entry_t *ws_pae_auth_waiting_supp_list_add(pae_auth_t *pae_auth, sup
         ns_list_add_to_start(&pae_auth->waiting_supp_list, supp_entry);
         pae_auth->waiting_supp_list_size++;
     } else {
-        // Create a new supplicant entry if not at limit
+        // If the waiting list if full removes the oldest entry from the list
         if (pae_auth->waiting_supp_list_size > WAITING_SUPPLICANT_LIST_MAX_SIZE) {
-            tr_info("PAE: waiting list full, eui-64: %s", trace_array(addr->eui_64, 8));
-            return NULL;
+            supp_entry_t *delete_supp = ns_list_get_last(&pae_auth->waiting_supp_list);
+            if (!delete_supp) {
+                return NULL;
+            }
+            tr_info("PAE: waiting list full, eui-64: %s, deleted eui-64: %s", trace_array(addr->eui_64, 8), trace_array(delete_supp->addr.eui_64, 8));
+            // Create new instance
+            kmp_api_t *new_kmp = ws_pae_auth_kmp_create_and_start(pae_auth->kmp_service, MSG_PROT, pae_auth->relay_socked_msg_if_instance_id, delete_supp, pae_auth->sec_cfg);
+            if (!new_kmp) {
+                return NULL;
+            }
+            kmp_api_create_request(new_kmp, MSG_PROT, &delete_supp->addr, &delete_supp->sec_keys);
+            (void) ws_pae_lib_supp_list_remove(pae_auth, &pae_auth->waiting_supp_list, delete_supp, ws_pae_auth_waiting_supp_deleted);
         }
         supp_entry = ws_pae_lib_supp_list_add(&pae_auth->waiting_supp_list, addr);
         if (!supp_entry) {
@@ -981,7 +996,7 @@ static supp_entry_t *ws_pae_auth_waiting_supp_list_add(pae_auth_t *pae_auth, sup
     // 90 percent of the EAPOL temporary entry lifetime (10 ticks per second)
     supp_entry->waiting_ticks = pae_auth->sec_cfg->timing_cfg.temp_eapol_min_timeout * 900 / 100;
 
-    tr_debug("PAE: to waiting, list size %i, retry %i, eui-64: %s", pae_auth->waiting_supp_list_size, supp_entry->waiting_ticks, trace_array(supp_entry->addr.eui_64, 8));
+    tr_info("PAE: to waiting, list size %i, retry %i, eui-64: %s", pae_auth->waiting_supp_list_size, supp_entry->waiting_ticks, trace_array(supp_entry->addr.eui_64, 8));
 
     return supp_entry;
 }
diff --git a/source/Security/kmp/kmp_api.h b/source/Security/kmp/kmp_api.h
index 3c880de2921..dd0e9aef605 100644
--- a/source/Security/kmp/kmp_api.h
+++ b/source/Security/kmp/kmp_api.h
@@ -33,6 +33,7 @@ typedef enum {
 
     IEEE_802_1X_MKA        = 1,
     RADIUS_IEEE_802_1X_MKA = 2,
+    MSG_PROT               = 5,
     IEEE_802_11_4WH        = 6,
     IEEE_802_11_GKH        = 7,
     TLS_PROT               = 8,
diff --git a/source/Security/protocols/msg_sec_prot/msg_sec_prot.c b/source/Security/protocols/msg_sec_prot/msg_sec_prot.c
new file mode 100644
index 00000000000..13bfac4943d
--- /dev/null
+++ b/source/Security/protocols/msg_sec_prot/msg_sec_prot.c
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2021, 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "nsconfig.h"
+#include <string.h>
+#include "ns_types.h"
+#include "ns_list.h"
+#include "ns_trace.h"
+#include "nsdynmemLIB.h"
+#include "fhss_config.h"
+#include "NWK_INTERFACE/Include/protocol.h"
+#include "6LoWPAN/ws/ws_config.h"
+#include "Security/protocols/sec_prot_cfg.h"
+#include "Security/kmp/kmp_addr.h"
+#include "Security/kmp/kmp_api.h"
+#include "Security/PANA/pana_eap_header.h"
+#include "Security/eapol/eapol_helper.h"
+#include "Security/eapol/kde_helper.h"
+#include "Security/protocols/sec_prot_certs.h"
+#include "Security/protocols/sec_prot_keys.h"
+#include "Security/protocols/sec_prot.h"
+#include "Security/protocols/sec_prot_lib.h"
+#include "Security/protocols/msg_sec_prot/msg_sec_prot.h"
+
+#ifdef HAVE_WS
+
+#define TRACE_GROUP "msep"
+
+typedef enum {
+    MSG_STATE_INIT = SEC_STATE_INIT,
+    MSG_STATE_CREATE_REQ = SEC_STATE_CREATE_REQ,
+    MSG_STATE_FINISH = SEC_STATE_FINISH,
+    MSG_STATE_FINISHED = SEC_STATE_FINISHED
+} msg_sec_prot_state_e;
+
+typedef struct {
+    sec_prot_common_t              common;       /**< Common data */
+} msg_sec_prot_int_t;
+
+static uint16_t msg_sec_prot_size(void);
+static int8_t msg_sec_prot_init(sec_prot_t *prot);
+static void msg_sec_prot_delete(sec_prot_t *prot);
+
+static void msg_sec_prot_create_request(sec_prot_t *prot, sec_prot_keys_t *sec_keys);
+static void msg_sec_prot_state_machine(sec_prot_t *prot);
+static int8_t msg_sec_prot_auth_rejected_send(sec_prot_t *prot, sec_prot_keys_t *sec_keys);
+
+#define msg_sec_prot_get(prot) (msg_sec_prot_int_t *) &prot->data
+
+int8_t msg_sec_prot_register(kmp_service_t *service)
+{
+    if (!service) {
+        return -1;
+    }
+
+    if (kmp_service_sec_protocol_register(service, MSG_PROT, msg_sec_prot_size, msg_sec_prot_init) < 0) {
+        return -1;
+    }
+
+    return 0;
+}
+
+static uint16_t msg_sec_prot_size(void)
+{
+    return sizeof(msg_sec_prot_int_t);
+}
+
+static int8_t msg_sec_prot_init(sec_prot_t *prot)
+{
+    prot->create_req = msg_sec_prot_create_request;
+    prot->delete = msg_sec_prot_delete;
+    prot->state_machine = msg_sec_prot_state_machine;
+
+    msg_sec_prot_int_t *data = msg_sec_prot_get(prot);
+    sec_prot_init(&data->common);
+    sec_prot_state_set(prot, &data->common, MSG_STATE_INIT);
+
+    return 0;
+}
+
+static void msg_sec_prot_delete(sec_prot_t *prot)
+{
+    (void) prot;
+}
+
+static void msg_sec_prot_create_request(sec_prot_t *prot, sec_prot_keys_t *sec_keys)
+{
+    (void) sec_keys;
+
+    prot->state_machine(prot);
+}
+
+static int8_t msg_sec_prot_auth_rejected_send(sec_prot_t *prot, sec_prot_keys_t *sec_keys)
+{
+    (void) sec_keys;
+
+    uint8_t *eapol_pdu_frame = ns_dyn_mem_temporary_alloc(prot->header_size);
+
+    // Send zero length message to relay which requests LLC to remove EAPOL temporary entry based on EUI-64
+    if (prot->send(prot, eapol_pdu_frame, prot->header_size) < 0) {
+        return -1;
+    }
+
+    return 0;
+}
+
+static void msg_sec_prot_state_machine(sec_prot_t *prot)
+{
+    msg_sec_prot_int_t *data = msg_sec_prot_get(prot);
+
+    switch (sec_prot_state_get(&data->common)) {
+        case MSG_STATE_INIT:
+            sec_prot_state_set(prot, &data->common, MSG_STATE_CREATE_REQ);
+            break;
+        case MSG_STATE_CREATE_REQ:
+            // KMP-CREATE.confirm
+            prot->create_conf(prot, sec_prot_result_get(&data->common));
+            // Authentication rejected (will continue only after new EAPOL Initial-Key)
+            (void) msg_sec_prot_auth_rejected_send(prot, prot->sec_keys);
+            sec_prot_state_set(prot, &data->common, MSG_STATE_FINISH);
+            break;
+        case MSG_STATE_FINISH:
+            sec_prot_state_set(prot, &data->common, MSG_STATE_FINISHED);
+            /* fall through */
+        case MSG_STATE_FINISHED:
+            prot->finished(prot);
+            break;
+        default:
+            break;
+    }
+}
+
+#endif /* HAVE_WS */
+
diff --git a/source/Security/protocols/msg_sec_prot/msg_sec_prot.h b/source/Security/protocols/msg_sec_prot/msg_sec_prot.h
new file mode 100644
index 00000000000..cad8881027e
--- /dev/null
+++ b/source/Security/protocols/msg_sec_prot/msg_sec_prot.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021, 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MSG_SEC_PROT_H_
+#define MSG_SEC_PROT_H_
+
+/*
+ * Message security protocol. Protocol can be used for sending messages from
+ * authenticator EAPOL components to lower layers on authenticator.
+ *
+ */
+
+/**
+ * msg_sec_prot_register register message security protocol to KMP service
+ *
+ * \param service KMP service
+ *
+ * \return < 0 failure
+ * \return >= 0 success
+ */
+int8_t msg_sec_prot_register(kmp_service_t *service);
+
+#endif /* MSG_SEC_PROT_H_ */
diff --git a/sources.mk b/sources.mk
index ef0ec512537..462cc0366ad 100644
--- a/sources.mk
+++ b/sources.mk
@@ -123,6 +123,7 @@ SRCS += \
 	source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.c \
 	source/Security/protocols/radius_sec_prot/radius_client_sec_prot.c \
 	source/Security/protocols/radius_sec_prot/avp_helper.c \
+	source/Security/protocols/msg_sec_prot/msg_sec_prot.c \
 	source/Security/protocols/tls_sec_prot/tls_sec_prot.c \
 	source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.c \
 	source/Security/PANA/eap_protocol.c \

From 57ec0281a8f3b9d45c435a7a03f6642d4059eebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=20Lepp=C3=A4nen?= <mika.leppanen@arm.com>
Date: Fri, 14 May 2021 10:39:48 +0300
Subject: [PATCH 21/43] Corrected comparison

---
 source/6LoWPAN/ws/ws_pae_auth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/6LoWPAN/ws/ws_pae_auth.c b/source/6LoWPAN/ws/ws_pae_auth.c
index 7c2a76c7719..05c51d5f3cd 100644
--- a/source/6LoWPAN/ws/ws_pae_auth.c
+++ b/source/6LoWPAN/ws/ws_pae_auth.c
@@ -970,7 +970,7 @@ static supp_entry_t *ws_pae_auth_waiting_supp_list_add(pae_auth_t *pae_auth, sup
         pae_auth->waiting_supp_list_size++;
     } else {
         // If the waiting list if full removes the oldest entry from the list
-        if (pae_auth->waiting_supp_list_size > WAITING_SUPPLICANT_LIST_MAX_SIZE) {
+        if (pae_auth->waiting_supp_list_size >= WAITING_SUPPLICANT_LIST_MAX_SIZE) {
             supp_entry_t *delete_supp = ns_list_get_last(&pae_auth->waiting_supp_list);
             if (!delete_supp) {
                 return NULL;

From 511bd5a3adffbb928034d9a22cad31e0dd7197a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=20Lepp=C3=A4nen?= <mika.leppanen@arm.com>
Date: Fri, 14 May 2021 15:13:06 +0300
Subject: [PATCH 22/43] Corrected coding style

---
 source/Security/protocols/msg_sec_prot/msg_sec_prot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/Security/protocols/msg_sec_prot/msg_sec_prot.c b/source/Security/protocols/msg_sec_prot/msg_sec_prot.c
index 13bfac4943d..b658574ad5a 100644
--- a/source/Security/protocols/msg_sec_prot/msg_sec_prot.c
+++ b/source/Security/protocols/msg_sec_prot/msg_sec_prot.c
@@ -135,7 +135,7 @@ static void msg_sec_prot_state_machine(sec_prot_t *prot)
             break;
         case MSG_STATE_FINISH:
             sec_prot_state_set(prot, &data->common, MSG_STATE_FINISHED);
-            /* fall through */
+        /* fall through */
         case MSG_STATE_FINISHED:
             prot->finished(prot);
             break;

From dbd83be16d5a93e2a18be9846e8d927466638b4b Mon Sep 17 00:00:00 2001
From: Arto Kinnunen <Arto.Kinnunen@arm.com>
Date: Tue, 18 May 2021 10:58:41 +0300
Subject: [PATCH 23/43] Fix copyrights (#2631)

-Update remaining ARM copyrights
-Fix files where copyright was added twice
-Fix typos
-Update Apache/BSD license text
---
 LICENSE-Apache-2.0                            |  2 +-
 LICENSE-BSD-3-Clause                          |  2 +-
 run_unit_tests.sh                             |  2 +-
 .../protocols/msg_sec_prot/msg_sec_prot.c     |  2 +-
 .../protocols/msg_sec_prot/msg_sec_prot.h     |  2 +-
 source/Service_Libs/mdns/ns_fnet_types.h      |  2 +-
 .../6LoWPAN/ws_management_api/run_tests       |  4 +++-
 .../ws_mpx_header/ws_mpx_headertest.cpp       | 19 +------------------
 .../mle_service_frame_counter_table_stub.c    | 18 +-----------------
 test/nanostack/unittest/stub/ws_ie_lib_stub.c | 18 +-----------------
 .../unittest/stub/ws_mpx_header_stub.c        | 18 +-----------------
 .../unittest/stub/ws_neighbour_class_stub.c   | 18 +-----------------
 xsl_script.sh                                 |  2 +-
 13 files changed, 15 insertions(+), 94 deletions(-)

diff --git a/LICENSE-Apache-2.0 b/LICENSE-Apache-2.0
index ae3cb70b6bb..a7155e2dc76 100644
--- a/LICENSE-Apache-2.0
+++ b/LICENSE-Apache-2.0
@@ -1,4 +1,4 @@
-Copyright 2017 Arm Limited and its affiliates 
+Copyright 2017, Pelion and affiliates.
 SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/LICENSE-BSD-3-Clause b/LICENSE-BSD-3-Clause
index a6fe7d9a0a5..5c59c7c5967 100644
--- a/LICENSE-BSD-3-Clause
+++ b/LICENSE-BSD-3-Clause
@@ -1,4 +1,4 @@
-Copyright 2017 Arm Limited and affiliates.
+Copyright 2017, Pelion and affiliates.
 SPDX-License-Identifier: BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or without
diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index f6ceee78bf5..f5eb65cce14 100755
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2015-2017, Arm Limited and affiliates.
+# Copyright (c) 2015-2017, Pelion and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/msg_sec_prot/msg_sec_prot.c b/source/Security/protocols/msg_sec_prot/msg_sec_prot.c
index b658574ad5a..ddaf69a0ceb 100644
--- a/source/Security/protocols/msg_sec_prot/msg_sec_prot.c
+++ b/source/Security/protocols/msg_sec_prot/msg_sec_prot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Arm Limited and affiliates.
+ * Copyright (c) 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Security/protocols/msg_sec_prot/msg_sec_prot.h b/source/Security/protocols/msg_sec_prot/msg_sec_prot.h
index cad8881027e..611f30ce986 100644
--- a/source/Security/protocols/msg_sec_prot/msg_sec_prot.h
+++ b/source/Security/protocols/msg_sec_prot/msg_sec_prot.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Arm Limited and affiliates.
+ * Copyright (c) 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/source/Service_Libs/mdns/ns_fnet_types.h b/source/Service_Libs/mdns/ns_fnet_types.h
index 15ca5a80a88..9d8c9ed9146 100644
--- a/source/Service_Libs/mdns/ns_fnet_types.h
+++ b/source/Service_Libs/mdns/ns_fnet_types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Peliond and affiliates.
+ * Copyright (c) 2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/6LoWPAN/ws_management_api/run_tests b/test/nanostack/unittest/6LoWPAN/ws_management_api/run_tests
index a0ff3c36ced..cdf20451770 100755
--- a/test/nanostack/unittest/6LoWPAN/ws_management_api/run_tests
+++ b/test/nanostack/unittest/6LoWPAN/ws_management_api/run_tests
@@ -1,5 +1,6 @@
 #!/bin/bash
-# Copyright (c) 2018, Arm Limited and affiliates.
+#
+# Copyright (c) 2018, Pelion and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 echo
 echo Build ws_management_api unit tests
 echo
diff --git a/test/nanostack/unittest/6LoWPAN/ws_mpx_header/ws_mpx_headertest.cpp b/test/nanostack/unittest/6LoWPAN/ws_mpx_header/ws_mpx_headertest.cpp
index ee915fc6a64..ecd23c576d4 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_mpx_header/ws_mpx_headertest.cpp
+++ b/test/nanostack/unittest/6LoWPAN/ws_mpx_header/ws_mpx_headertest.cpp
@@ -1,22 +1,5 @@
 /*
- * Copyright (c) 2018, Pelion 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Copyright (c) 2016, Arm Limited and affiliates.
+ * Copyright (c) 2016, 2018, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/mle_service_frame_counter_table_stub.c b/test/nanostack/unittest/stub/mle_service_frame_counter_table_stub.c
index d8c728dec09..3792e34b9f3 100644
--- a/test/nanostack/unittest/stub/mle_service_frame_counter_table_stub.c
+++ b/test/nanostack/unittest/stub/mle_service_frame_counter_table_stub.c
@@ -1,21 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Pelion 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_ie_lib_stub.c b/test/nanostack/unittest/stub/ws_ie_lib_stub.c
index 40eddf6861d..e988d0e2880 100644
--- a/test/nanostack/unittest/stub/ws_ie_lib_stub.c
+++ b/test/nanostack/unittest/stub/ws_ie_lib_stub.c
@@ -1,21 +1,5 @@
 /*
- * Copyright (c) 2018-2020, Pelion 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_mpx_header_stub.c b/test/nanostack/unittest/stub/ws_mpx_header_stub.c
index dd7d9c67bbf..b7ba9577c21 100644
--- a/test/nanostack/unittest/stub/ws_mpx_header_stub.c
+++ b/test/nanostack/unittest/stub/ws_mpx_header_stub.c
@@ -1,21 +1,5 @@
 /*
- * Copyright (c) 2018, Pelion 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/nanostack/unittest/stub/ws_neighbour_class_stub.c b/test/nanostack/unittest/stub/ws_neighbour_class_stub.c
index b4f156f5b2b..fde6c333557 100644
--- a/test/nanostack/unittest/stub/ws_neighbour_class_stub.c
+++ b/test/nanostack/unittest/stub/ws_neighbour_class_stub.c
@@ -1,21 +1,5 @@
 /*
- * Copyright (c) 2018-2020, Pelion 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/xsl_script.sh b/xsl_script.sh
index 5dae1cddee4..d9ea3de19b1 100755
--- a/xsl_script.sh
+++ b/xsl_script.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2015-2017, Arm Limited and affiliates.
+# Copyright (c) 2015-2017, Pelion and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

From 24168f891b1fad6a1853c4ff5b4fd3e664b020ab Mon Sep 17 00:00:00 2001
From: Jarkko Paso <jarkko.paso@arm.com>
Date: Tue, 1 Jun 2021 10:07:04 +0300
Subject: [PATCH 24/43] Do not send too old packets (#2632)

* Do not send packets that are queued on adaptation layer over 30 seconds

* Do not allow new data request overtake existing one in MAC queue

* Revert "Do not allow new data request overtake existing one in MAC queue"

This reverts commit 5c660e0246139acd1dab99094fe3fdcf1138ad60.

* Do not send any old packets

* Return data request to adaptation layer after timeout

* Fixed missing PHY timestamp cb in unit tests

* Allow removing only normal priority buffers

* Unit tests for removing old buffers from MAC queue

* Cleaning

* Timeout value defined for all buffer priorities

* Updated unit tests

* Updated change log
---
 CHANGELOG.md                                  |   1 +
 source/6LoWPAN/adaptation_interface.c         |  41 +++++-
 source/MAC/IEEE802_15_4/mac_mcps_sap.c        |  56 ++++++--
 source/MAC/IEEE802_15_4/mac_mcps_sap.h        |   2 +-
 source/MAC/IEEE802_15_4/mac_mlme.c            |   2 +-
 .../mac/mac_mcps_sap/test_mac_mcps_sap.c      | 131 +++++++++++++++---
 6 files changed, 189 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 634048781ae..f7ed41cc336 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Filter RPL parents based on DEVICE_MIN_SENS configuration with Threshold and Hysteresis.
 * Filter EAPOL parents based on DEVICE_MIN_SENS configuration with Threshold and Hysteresis to prevent EAPOL failures caused by bad signal levels
 * Adaptation layer removes oldest packets first when stack needs to release memory or reduce traffic
+* Use QoS specific timeout to drop old packets from TX queue to prioritize limited bandwidth.
 
 ### Changes
 * Statistics for MAC data request latencies. Separated to adaptation layer and MAC queueing delays.
diff --git a/source/6LoWPAN/adaptation_interface.c b/source/6LoWPAN/adaptation_interface.c
index 58bd7154de5..c33533688e3 100644
--- a/source/6LoWPAN/adaptation_interface.c
+++ b/source/6LoWPAN/adaptation_interface.c
@@ -120,6 +120,10 @@ typedef struct {
 #define LOWPAN_MEM_LIMIT_REMOVE_MAX 10000 // Remove when at memory limit
 #define LOWPAN_MEM_LIMIT_REMOVE_EF_MODE 20000 // Remove when out of memory and we are in EF mode
 
+#define LOWPAN_TX_BUFFER_AGE_LIMIT_LOW_PRIORITY     30 // Remove low priority packets older than limit (seconds)
+#define LOWPAN_TX_BUFFER_AGE_LIMIT_HIGH_PRIORITY    60 // Remove high priority packets older than limit (seconds)
+#define LOWPAN_TX_BUFFER_AGE_LIMIT_EF_PRIORITY      120 // Remove expedited forwarding packets older than limit (seconds)
+
 
 
 static NS_LIST_DEFINE(fragmenter_interface_list, fragmenter_interface_t, link);
@@ -1294,6 +1298,23 @@ void lowpan_adaptation_interface_slow_timer(protocol_interface_info_entry_t *cur
     }
 }
 
+static bool lowpan_adaptation_interface_check_buffer_timeout(buffer_t *buf)
+{
+    // Convert from 100ms slots to seconds
+    uint32_t buffer_age_s = (protocol_core_monotonic_time - buf->adaptation_timestamp) / 10;
+
+    if ((buf->priority == QOS_NORMAL) && (buffer_age_s > LOWPAN_TX_BUFFER_AGE_LIMIT_LOW_PRIORITY)) {
+        return true;
+    } else if ((buf->priority == QOS_HIGH) && (buffer_age_s > LOWPAN_TX_BUFFER_AGE_LIMIT_HIGH_PRIORITY)) {
+        return true;
+    } else if ((buf->priority == QOS_NETWORK_CTRL) && (buffer_age_s > LOWPAN_TX_BUFFER_AGE_LIMIT_HIGH_PRIORITY)) {
+        return true;
+    } else if ((buf->priority == QOS_EXPEDITE_FORWARD) && (buffer_age_s > LOWPAN_TX_BUFFER_AGE_LIMIT_EF_PRIORITY)) {
+        return true;
+    }
+    return false;
+}
+
 int8_t lowpan_adaptation_interface_tx(protocol_interface_info_entry_t *cur, buffer_t *buf)
 {
     bool is_room_for_new_message;
@@ -1309,13 +1330,7 @@ int8_t lowpan_adaptation_interface_tx(protocol_interface_info_entry_t *cur, buff
     if (!interface_ptr) {
         goto tx_error_handler;
     }
-    // Set TX start timestamp
-    if (!buf->adaptation_timestamp) {
-        buf->adaptation_timestamp = protocol_core_monotonic_time;
-        if (!buf->adaptation_timestamp) {
-            buf->adaptation_timestamp--;
-        }
-    }
+
     uint8_t traffic_class = buf->options.traffic_class >> IP_TCLASS_DSCP_SHIFT;
 
     if (traffic_class == IP_DSCP_EF) {
@@ -1327,6 +1342,18 @@ int8_t lowpan_adaptation_interface_tx(protocol_interface_info_entry_t *cur, buff
         buffer_priority_set(buf, QOS_HIGH);
     }
 
+    if (!buf->adaptation_timestamp) {
+        // Set TX start timestamp
+        buf->adaptation_timestamp = protocol_core_monotonic_time;
+        if (!buf->adaptation_timestamp) {
+            buf->adaptation_timestamp--;
+        }
+    } else if (lowpan_adaptation_interface_check_buffer_timeout(buf)) {
+        // Remove old buffers
+        socket_tx_buffer_event_and_free(buf, SOCKET_TX_FAIL);
+        return -1;
+    }
+
     //Update priority status
     lowpan_adaptation_priority_status_update(cur, interface_ptr, buf->priority);
 
diff --git a/source/MAC/IEEE802_15_4/mac_mcps_sap.c b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
index 70ae3491b6c..163aca581e3 100644
--- a/source/MAC/IEEE802_15_4/mac_mcps_sap.c
+++ b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
@@ -56,6 +56,9 @@
 
 // Used to set TX time (us) with FHSS. Must be <= 65ms.
 #define MAC_TX_PROCESSING_DELAY_INITIAL 2000
+// Give up on data request after given timeout (seconds)
+#define DATA_REQUEST_TIMEOUT_NORMAL_PRIORITY_S  30
+#define DATA_REQUEST_TIMEOUT_EF_PRIORITY_S      120
 
 typedef struct {
     uint8_t address[8];
@@ -275,7 +278,7 @@ void mcps_sap_data_req_handler_ext(protocol_interface_rf_mac_setup_s *rf_mac_set
             }
             break;
         case MAC_DATA_HIGH_PRIORITY:
-            buffer->priority = MAC_PD_DATA_HIGH_PRIOTITY;
+            buffer->priority = MAC_PD_DATA_HIGH_PRIORITY;
             break;
         case MAC_DATA_MEDIUM_PRIORITY:
             buffer->priority = MAC_PD_DATA_MEDIUM_PRIORITY;
@@ -1102,6 +1105,18 @@ static void mac_mcps_asynch_finish(protocol_interface_rf_mac_setup_s *rf_mac_set
     }
 }
 
+static bool mcps_sap_check_buffer_timeout(protocol_interface_rf_mac_setup_s *rf_mac_setup, mac_pre_build_frame_t *buffer)
+{
+    // Convert from 1us slots to seconds
+    uint32_t buffer_age_s = (mac_mcps_sap_get_phy_timestamp(rf_mac_setup) - buffer->request_start_time_us) / 1000000;
+    if ((buffer->priority == MAC_PD_DATA_NORMAL_PRIORITY) && (buffer_age_s > DATA_REQUEST_TIMEOUT_NORMAL_PRIORITY_S)) {
+        return true;
+    } else if ((buffer->priority == MAC_PD_DATA_EF_PRIORITY) && (buffer_age_s > DATA_REQUEST_TIMEOUT_EF_PRIORITY_S)) {
+        return true;
+    }
+    return false;
+}
+
 void mac_mcps_trig_buffer_from_queue(protocol_interface_rf_mac_setup_s *rf_mac_setup)
 {
     if (!rf_mac_setup) {
@@ -1121,22 +1136,31 @@ void mac_mcps_trig_buffer_from_queue(protocol_interface_rf_mac_setup_s *rf_mac_s
         buffer = mcps_sap_pd_req_queue_read(rf_mac_setup, is_bc_queue, false);
 
         if (buffer) {
-            //Here
-            if (buffer->ExtendedFrameExchange) {
-                //Update here state and store peer
-                memcpy(rf_mac_setup->mac_edfe_info->PeerAddr, buffer->DstAddr, 8);
-                rf_mac_setup->mac_edfe_info->state = MAC_EDFE_FRAME_CONNECTING;
-            }
-            rf_mac_setup->active_pd_data_request = buffer;
-            if (mcps_pd_data_request(rf_mac_setup, buffer) != 0) {
+            if (mcps_sap_check_buffer_timeout(rf_mac_setup, buffer)) {
+                // Buffer is quite old. Return it to adaptation layer with timeout event.
+                rf_mac_setup->mac_tx_result = MAC_TX_TIMEOUT;
                 if (buffer->ExtendedFrameExchange) {
                     rf_mac_setup->mac_edfe_info->state = MAC_EDFE_FRAME_IDLE;
                 }
-                rf_mac_setup->active_pd_data_request = NULL;
                 mac_mcps_asynch_finish(rf_mac_setup, buffer);
                 mcps_data_confirm_handle(rf_mac_setup, buffer, NULL);
             } else {
-                return;
+                if (buffer->ExtendedFrameExchange) {
+                    //Update here state and store peer
+                    memcpy(rf_mac_setup->mac_edfe_info->PeerAddr, buffer->DstAddr, 8);
+                    rf_mac_setup->mac_edfe_info->state = MAC_EDFE_FRAME_CONNECTING;
+                }
+                rf_mac_setup->active_pd_data_request = buffer;
+                if (mcps_pd_data_request(rf_mac_setup, buffer) != 0) {
+                    if (buffer->ExtendedFrameExchange) {
+                        rf_mac_setup->mac_edfe_info->state = MAC_EDFE_FRAME_IDLE;
+                    }
+                    rf_mac_setup->active_pd_data_request = NULL;
+                    mac_mcps_asynch_finish(rf_mac_setup, buffer);
+                    mcps_data_confirm_handle(rf_mac_setup, buffer, NULL);
+                } else {
+                    return;
+                }
             }
         } else {
             return;
@@ -2437,10 +2461,16 @@ static mac_pre_build_frame_t *mcps_sap_pd_req_queue_read(protocol_interface_rf_m
 
     mac_pre_build_frame_t *buffer = queue;
     mac_pre_build_frame_t *prev = NULL;
-    // With FHSS, check TX conditions
+    /* With FHSS, read buffer out from queue if:
+     * - Buffer has timed out, OR
+     * - Buffer is asynch request, OR
+     * - Queue is flushed, OR
+     * - Blacklisting AND FHSS allows buffer to be transmitted
+     */
     if (rf_mac_setup->fhss_api) {
         while (buffer) {
-            if (buffer->asynch_request ||
+            if (mcps_sap_check_buffer_timeout(rf_mac_setup, buffer) ||
+                    buffer->asynch_request ||
                     (flush == true) ||
                     ((mcps_check_packet_blacklist(rf_mac_setup, buffer) == false) &&
                      (rf_mac_setup->fhss_api->check_tx_conditions(rf_mac_setup->fhss_api, !mac_is_ack_request_set(buffer),
diff --git a/source/MAC/IEEE802_15_4/mac_mcps_sap.h b/source/MAC/IEEE802_15_4/mac_mcps_sap.h
index b357447f0fd..94247d58b87 100644
--- a/source/MAC/IEEE802_15_4/mac_mcps_sap.h
+++ b/source/MAC/IEEE802_15_4/mac_mcps_sap.h
@@ -48,7 +48,7 @@ typedef enum {
 
 #define MAC_PD_DATA_NORMAL_PRIORITY 0    //Normal MCPS DATA REQ
 #define MAC_PD_DATA_MEDIUM_PRIORITY 1    //Indirect Data which is polled
-#define MAC_PD_DATA_HIGH_PRIOTITY   2    //Beacon request Beacon response
+#define MAC_PD_DATA_HIGH_PRIORITY   2    //Beacon request Beacon response
 #define MAC_PD_DATA_EF_PRIORITY     3    //Expedited forwarding
 #define MAC_PD_DATA_TX_IMMEDIATELY  4    //Only for packets whose transmission was interrupted by wrong channel type. E.g. unicast on broadcast channel.
 
diff --git a/source/MAC/IEEE802_15_4/mac_mlme.c b/source/MAC/IEEE802_15_4/mac_mlme.c
index 21357c7db85..9d39b35202e 100644
--- a/source/MAC/IEEE802_15_4/mac_mlme.c
+++ b/source/MAC/IEEE802_15_4/mac_mlme.c
@@ -1837,7 +1837,7 @@ int8_t mac_mlme_beacon_tx(protocol_interface_rf_mac_setup_s *rf_ptr)
             ptr += BEACON_OPTION_JOIN_PRIORITY_LEN;
         }*/
     }
-    buf->priority = MAC_PD_DATA_HIGH_PRIOTITY;
+    buf->priority = MAC_PD_DATA_HIGH_PRIORITY;
     mcps_sap_pd_req_queue_write(rf_ptr, buf);
     sw_mac_stats_update(rf_ptr, STAT_MAC_BEA_TX_COUNT, 0);
     return 0;
diff --git a/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.c b/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.c
index 8fb0d430d1f..be5a4b37f8e 100644
--- a/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.c
+++ b/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.c
@@ -238,6 +238,27 @@ static  arm_device_driver_list_s *rf_client_driver_allocate()
     return driver;
 }
 
+uint32_t test_timestamp = 1000000;
+static int8_t test_rf_extension(phy_extension_type_e extension, uint8_t *buf)
+{
+    switch (extension) {
+        case PHY_EXTENSION_GET_TIMESTAMP:
+            buf[3] = test_timestamp >> 24;
+            buf[2] = test_timestamp >> 16;
+            buf[1] = test_timestamp >> 8;
+            buf[0] = test_timestamp;
+            test_timestamp += 100000;
+            break;
+        case PHY_EXTENSION_READ_LAST_ACK_PENDING_STATUS:
+            *buf = 1;
+            break;
+        case PHY_EXTENSION_READ_RX_TIME:
+            common_write_32_bit(100, buf);
+        default:
+            break;
+    }
+    return 0;
+}
 
 static protocol_interface_rf_mac_setup_s *test_mac_rf_mac_class_allocate(void)
 {
@@ -261,32 +282,11 @@ static protocol_interface_rf_mac_setup_s *test_mac_rf_mac_class_allocate(void)
     dev_driver->phy_header_length = 0;
     driver->phy_driver = dev_driver;
     rf_mac_setup->dev_driver = driver;
+    rf_mac_setup->dev_driver->phy_driver->extension = test_rf_extension;
 
     return rf_mac_setup;
 }
 
-uint32_t test_timestamp = 1000000;
-static int8_t test_rf_extension(phy_extension_type_e extension, uint8_t *buf)
-{
-    switch (extension) {
-        case PHY_EXTENSION_GET_TIMESTAMP:
-            buf[3] = test_timestamp >> 24;
-            buf[2] = test_timestamp >> 16;
-            buf[1] = test_timestamp >> 8;
-            buf[0] = test_timestamp;
-            test_timestamp += 100000;
-            break;
-        case PHY_EXTENSION_READ_LAST_ACK_PENDING_STATUS:
-            *buf = 1;
-            break;
-        case PHY_EXTENSION_READ_RX_TIME:
-            common_write_32_bit(100, buf);
-        default:
-            break;
-    }
-    return 0;
-}
-
 static int8_t test_rf_tx(uint8_t *data, uint16_t length, uint8_t tx_handle, data_protocol_e protocol)
 {
     return 0;
@@ -3046,6 +3046,93 @@ bool test_mac_mcps_trig_buffer_from_queue()
         return false;
     }
     mac_mcps_buffer_queue_free(rf_mac_setup);
+
+    // Test removing old buffers from queue
+    rf_mac_setup->fhss_api = ns_fhss_create(0, 0, 0);
+    // Add 4 buffers in queue, buf and buf2 are too old and should be removed
+    buf = tes_mac_mcps_temporary_buffer_get(0);
+    buf2 = tes_mac_mcps_temporary_buffer_get(0);
+    mac_pre_build_frame_t *buf3 = tes_mac_mcps_temporary_buffer_get(0);
+    mac_pre_build_frame_t *buf4 = tes_mac_mcps_temporary_buffer_get(0);
+    buf->request_start_time_us = test_timestamp - 32000000;
+    buf2->request_start_time_us = test_timestamp - 31000000;
+    buf3->request_start_time_us = test_timestamp - 25000000;
+    buf4->request_start_time_us = test_timestamp - 23000000;
+    rf_mac_setup->pd_data_request_queue_to_go = buf;
+    rf_mac_setup->pd_data_request_queue_to_go->next = buf2;
+    rf_mac_setup->pd_data_request_queue_to_go->next->next = buf3;
+    rf_mac_setup->pd_data_request_queue_to_go->next->next->next = buf4;
+    rf_mac_setup->unicast_queue_size = 4;
+    fhss_config_stub.bool_value = false;
+    fhss_tx_condition = true;
+    // Trig should remove first two buffers and take third as active data request
+    mac_mcps_trig_buffer_from_queue(rf_mac_setup);
+    if (rf_mac_setup->active_pd_data_request != buf3) {
+        test_mac_rf_mac_class_free(rf_mac_setup);
+        printf("Fail: Remove old buffers, wrong buffer activated\r\n");
+        return false;
+    }
+    mac_mcps_buffer_queue_free(rf_mac_setup);
+
+    // Test removing old buffers with low priority from queue
+    rf_mac_setup->fhss_api = ns_fhss_create(0, 0, 0);
+    // Add 4 buffers in queue, buf and buf2 are too old but only first one should be removed
+    buf = tes_mac_mcps_temporary_buffer_get(0);
+    buf2 = tes_mac_mcps_temporary_buffer_get(0);
+    buf3 = tes_mac_mcps_temporary_buffer_get(0);
+    buf4 = tes_mac_mcps_temporary_buffer_get(0);
+    buf->request_start_time_us = test_timestamp - 32000000;
+    buf2->request_start_time_us = test_timestamp - 31000000;
+    buf3->request_start_time_us = test_timestamp - 25000000;
+    buf4->request_start_time_us = test_timestamp - 23000000;
+    // Change buf2 priority to medium
+    buf2->priority = MAC_PD_DATA_MEDIUM_PRIORITY;
+    rf_mac_setup->pd_data_request_queue_to_go = buf;
+    rf_mac_setup->pd_data_request_queue_to_go->next = buf2;
+    rf_mac_setup->pd_data_request_queue_to_go->next->next = buf3;
+    rf_mac_setup->pd_data_request_queue_to_go->next->next->next = buf4;
+    rf_mac_setup->unicast_queue_size = 4;
+    fhss_config_stub.bool_value = false;
+    fhss_tx_condition = true;
+    // Trig should remove first buffer and take second as active data request
+    mac_mcps_trig_buffer_from_queue(rf_mac_setup);
+    if (rf_mac_setup->active_pd_data_request != buf2) {
+        test_mac_rf_mac_class_free(rf_mac_setup);
+        printf("Fail: Remove old buffers with priority, wrong buffer activated\r\n");
+        return false;
+    }
+    mac_mcps_buffer_queue_free(rf_mac_setup);
+
+    // Test removing old buffers with EF priority from queue
+    rf_mac_setup->fhss_api = ns_fhss_create(0, 0, 0);
+    // Add 4 buffers in queue, buf(normal priority) and buf2(EF priority) are too old and should be removed
+    buf = tes_mac_mcps_temporary_buffer_get(0);
+    buf2 = tes_mac_mcps_temporary_buffer_get(0);
+    buf3 = tes_mac_mcps_temporary_buffer_get(0);
+    buf4 = tes_mac_mcps_temporary_buffer_get(0);
+    buf->request_start_time_us = test_timestamp - 32000000;
+    buf2->request_start_time_us = test_timestamp - 121000000;
+    buf3->request_start_time_us = test_timestamp - 100000000;
+    buf4->request_start_time_us = test_timestamp - 23000000;
+    // Change buf2 and buf3 priority to expedited forwarding
+    buf2->priority = MAC_PD_DATA_EF_PRIORITY;
+    buf3->priority = MAC_PD_DATA_EF_PRIORITY;
+    rf_mac_setup->pd_data_request_queue_to_go = buf;
+    rf_mac_setup->pd_data_request_queue_to_go->next = buf2;
+    rf_mac_setup->pd_data_request_queue_to_go->next->next = buf3;
+    rf_mac_setup->pd_data_request_queue_to_go->next->next->next = buf4;
+    rf_mac_setup->unicast_queue_size = 4;
+    fhss_config_stub.bool_value = false;
+    fhss_tx_condition = true;
+    // Trig should remove first two buffers and take third as active data request
+    mac_mcps_trig_buffer_from_queue(rf_mac_setup);
+    if (rf_mac_setup->active_pd_data_request != buf3) {
+        test_mac_rf_mac_class_free(rf_mac_setup);
+        printf("Fail: Remove old buffers with EF priority, wrong buffer activated\r\n");
+        return false;
+    }
+    mac_mcps_buffer_queue_free(rf_mac_setup);
+
     // Free test setup struct
     test_mac_rf_mac_class_free(rf_mac_setup);
     return true;

From e283e6285c872871b9c4442100c99347d01be2dd Mon Sep 17 00:00:00 2001
From: Jarkko Paso <jarkko.paso@arm.com>
Date: Wed, 2 Jun 2021 11:18:57 +0300
Subject: [PATCH 25/43] Fixed channel mask usage with OFDM configurations
 (#2633)

* Fixed channel mask usage with OFDM configurations

* Updated change log
---
 CHANGELOG.md                  |  1 +
 source/6LoWPAN/ws/ws_common.c | 27 +++++++--------------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7ed41cc336..c9b21b98813 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 ### Bug fixes
 * Added ignoring of retry messages from RADIUS server when waiting EAP-TLS
 * Removed empty EAPOL-key message send after 4WH completion to nodes on relay
+* Fixed channel mask usage with OFDM configurations
 
 
 ## Release v13.0.0 (15-04-2021)
diff --git a/source/6LoWPAN/ws/ws_common.c b/source/6LoWPAN/ws/ws_common.c
index 61537832df7..42a9ceb764b 100644
--- a/source/6LoWPAN/ws/ws_common.c
+++ b/source/6LoWPAN/ws/ws_common.c
@@ -75,13 +75,6 @@ int8_t ws_generate_channel_list(uint32_t *channel_mask, uint16_t number_of_chann
         channel_mask[0 + (i / 32)] |= (1 << (i % 32));
     }
     // Disable unsupported channels per regional frequency bands
-    if (regulatory_domain == REG_DOMAIN_NA) {
-        if (channel_plan_id == 1) {
-            ws_disable_channels_in_range(channel_mask, number_of_channels, 1, 7);
-        } else if (channel_plan_id == 5) {
-            ws_disable_channels_in_range(channel_mask, number_of_channels, 5, 7);
-        }
-    }
     if (regulatory_domain == REG_DOMAIN_BZ) {
         if (channel_plan_id == 255) {
             if (operating_class == 1) {
@@ -93,17 +86,11 @@ int8_t ws_generate_channel_list(uint32_t *channel_mask, uint16_t number_of_chann
             }
         } else {
             if (channel_plan_id == 1) {
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 1, 7);
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 64, 64);
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 72, 103);
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 106, 111);
+                ws_disable_channels_in_range(channel_mask, number_of_channels, 26, 64);
             } else if (channel_plan_id == 2) {
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 24, 24);
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 32, 47);
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 52, 55);
+                ws_disable_channels_in_range(channel_mask, number_of_channels, 12, 32);
             } else if (channel_plan_id == 5) {
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 5, 10);
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 19, 23);
+                ws_disable_channels_in_range(channel_mask, number_of_channels, 3, 10);
             }
         }
     }
@@ -424,11 +411,11 @@ uint16_t ws_common_channel_number_calc(uint8_t regulatory_domain, uint8_t operat
             }
         } else {
             if (channel_plan_id == 1) {
-                return 136;
+                return 129;
             } else if (channel_plan_id == 2) {
                 return 64;
             } else if (channel_plan_id == 5) {
-                return 24;
+                return 21;
             }
         }
     } else if (regulatory_domain == REG_DOMAIN_JP) {
@@ -450,11 +437,11 @@ uint16_t ws_common_channel_number_calc(uint8_t regulatory_domain, uint8_t operat
             }
         } else {
             if (channel_plan_id == 1) {
-                return 136;
+                return 129;
             } else if (channel_plan_id == 2) {
                 return 64;
             } else if (channel_plan_id == 5) {
-                return 24;
+                return 21;
             }
         }
     } else if (regulatory_domain == REG_DOMAIN_WW) {

From c97695cfc68b297fbcd7f78aa8ef53184881c060 Mon Sep 17 00:00:00 2001
From: Juha Heiskanen <juha.heiskanen@arm.com>
Date: Fri, 4 Jun 2021 09:17:10 +0300
Subject: [PATCH 26/43] Bug fix: EAPOL parent compare fix

Added check that if Compared parent tx fail count is smaller return true.
---
 CHANGELOG.md                     | 1 +
 source/6LoWPAN/ws/ws_bootstrap.c | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9b21b98813..85c545d6e46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 ### Bug fixes
 * Added ignoring of retry messages from RADIUS server when waiting EAP-TLS
 * Removed empty EAPOL-key message send after 4WH completion to nodes on relay
+* EAPOL parent candidate compare fix for better TX failure count
 * Fixed channel mask usage with OFDM configurations
 
 
diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
index 332fe782a6e..3e9089461bb 100644
--- a/source/6LoWPAN/ws/ws_bootstrap.c
+++ b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -1445,6 +1445,10 @@ static bool ws_bootstrap_candidate_parent_compare(parent_info_t *p1, parent_info
         return false;
     }
 
+    if (p2->tx_fail < p1->tx_fail) {
+        return true;
+    }
+
     if (p1->link_acceptable && !p2->link_acceptable) {
         // Link acceptable is always better than not
         return true;

From 7905df666daed9e434e98bb7e7b50f39e2370332 Mon Sep 17 00:00:00 2001
From: Jarkko Paso <jarkko.paso@arm.com>
Date: Wed, 9 Jun 2021 12:06:22 +0300
Subject: [PATCH 27/43] Restart or remove transmission when MAC data request
 timeouts (#2636)

* Data request timeout to 10s. Adapt layer will remove or resend

* Updated unit tests

* Removed debug traces

* Do not timeout broadcast frames
---
 source/6LoWPAN/adaptation_interface.c         |  5 ++
 source/MAC/IEEE802_15_4/mac_mcps_sap.c        |  8 +--
 .../mac/mac_mcps_sap/test_mac_mcps_sap.c      | 71 ++-----------------
 3 files changed, 15 insertions(+), 69 deletions(-)

diff --git a/source/6LoWPAN/adaptation_interface.c b/source/6LoWPAN/adaptation_interface.c
index c33533688e3..73c5c08c599 100644
--- a/source/6LoWPAN/adaptation_interface.c
+++ b/source/6LoWPAN/adaptation_interface.c
@@ -1631,6 +1631,11 @@ int8_t lowpan_adaptation_interface_tx_confirm(protocol_interface_info_entry_t *c
         }
     } else if ((confirm->status == MLME_BUSY_CHAN) && !ws_info(cur)) {
         lowpan_data_request_to_mac(cur, buf, tx_ptr, interface_ptr);
+    } else if ((buf->link_specific.ieee802_15_4.requestAck) && (confirm->status == MLME_TRANSACTION_EXPIRED)) {
+        lowpan_adaptation_tx_queue_write_to_front(cur, interface_ptr, buf);
+        ns_list_remove(&interface_ptr->activeUnicastList, tx_ptr);
+        ns_dyn_mem_free(tx_ptr);
+        interface_ptr->activeTxList_size--;
     } else {
 
 
diff --git a/source/MAC/IEEE802_15_4/mac_mcps_sap.c b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
index 163aca581e3..782bee98b04 100644
--- a/source/MAC/IEEE802_15_4/mac_mcps_sap.c
+++ b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
@@ -57,8 +57,7 @@
 // Used to set TX time (us) with FHSS. Must be <= 65ms.
 #define MAC_TX_PROCESSING_DELAY_INITIAL 2000
 // Give up on data request after given timeout (seconds)
-#define DATA_REQUEST_TIMEOUT_NORMAL_PRIORITY_S  30
-#define DATA_REQUEST_TIMEOUT_EF_PRIORITY_S      120
+#define DATA_REQUEST_TIMEOUT_NORMAL_PRIORITY_S  10
 
 typedef struct {
     uint8_t address[8];
@@ -1109,9 +1108,8 @@ static bool mcps_sap_check_buffer_timeout(protocol_interface_rf_mac_setup_s *rf_
 {
     // Convert from 1us slots to seconds
     uint32_t buffer_age_s = (mac_mcps_sap_get_phy_timestamp(rf_mac_setup) - buffer->request_start_time_us) / 1000000;
-    if ((buffer->priority == MAC_PD_DATA_NORMAL_PRIORITY) && (buffer_age_s > DATA_REQUEST_TIMEOUT_NORMAL_PRIORITY_S)) {
-        return true;
-    } else if ((buffer->priority == MAC_PD_DATA_EF_PRIORITY) && (buffer_age_s > DATA_REQUEST_TIMEOUT_EF_PRIORITY_S)) {
+    // Do not timeout broadcast frames. Broadcast interval could be very long.
+    if (buffer->fcf_dsn.ackRequested && (buffer_age_s > DATA_REQUEST_TIMEOUT_NORMAL_PRIORITY_S)) {
         return true;
     }
     return false;
diff --git a/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.c b/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.c
index be5a4b37f8e..ae22177bf76 100644
--- a/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.c
+++ b/test/nanostack/unittest/mac/mac_mcps_sap/test_mac_mcps_sap.c
@@ -62,6 +62,7 @@
 #include <string.h>
 
 static uint8_t tes_mac_mcps_mac64[8];
+uint32_t test_timestamp = 1000000;
 
 static mac_pre_build_frame_t *tes_mac_mcps_temporary_buffer_get(uint16_t length)
 {
@@ -74,6 +75,8 @@ static mac_pre_build_frame_t *tes_mac_mcps_temporary_buffer_get(uint16_t length)
         buf->mac_allocated_payload_ptr = true;
         buf->mac_payload_length = length;
     }
+    buf->request_start_time_us = test_timestamp - 100000;
+    buf->fcf_dsn.ackRequested = true;
 
     return buf;
 }
@@ -238,7 +241,6 @@ static  arm_device_driver_list_s *rf_client_driver_allocate()
     return driver;
 }
 
-uint32_t test_timestamp = 1000000;
 static int8_t test_rf_extension(phy_extension_type_e extension, uint8_t *buf)
 {
     switch (extension) {
@@ -3054,10 +3056,10 @@ bool test_mac_mcps_trig_buffer_from_queue()
     buf2 = tes_mac_mcps_temporary_buffer_get(0);
     mac_pre_build_frame_t *buf3 = tes_mac_mcps_temporary_buffer_get(0);
     mac_pre_build_frame_t *buf4 = tes_mac_mcps_temporary_buffer_get(0);
-    buf->request_start_time_us = test_timestamp - 32000000;
-    buf2->request_start_time_us = test_timestamp - 31000000;
-    buf3->request_start_time_us = test_timestamp - 25000000;
-    buf4->request_start_time_us = test_timestamp - 23000000;
+    buf->request_start_time_us = test_timestamp - 12000000;
+    buf2->request_start_time_us = test_timestamp - 11000000;
+    buf3->request_start_time_us = test_timestamp - 5000000;
+    buf4->request_start_time_us = test_timestamp - 3000000;
     rf_mac_setup->pd_data_request_queue_to_go = buf;
     rf_mac_setup->pd_data_request_queue_to_go->next = buf2;
     rf_mac_setup->pd_data_request_queue_to_go->next->next = buf3;
@@ -3074,65 +3076,6 @@ bool test_mac_mcps_trig_buffer_from_queue()
     }
     mac_mcps_buffer_queue_free(rf_mac_setup);
 
-    // Test removing old buffers with low priority from queue
-    rf_mac_setup->fhss_api = ns_fhss_create(0, 0, 0);
-    // Add 4 buffers in queue, buf and buf2 are too old but only first one should be removed
-    buf = tes_mac_mcps_temporary_buffer_get(0);
-    buf2 = tes_mac_mcps_temporary_buffer_get(0);
-    buf3 = tes_mac_mcps_temporary_buffer_get(0);
-    buf4 = tes_mac_mcps_temporary_buffer_get(0);
-    buf->request_start_time_us = test_timestamp - 32000000;
-    buf2->request_start_time_us = test_timestamp - 31000000;
-    buf3->request_start_time_us = test_timestamp - 25000000;
-    buf4->request_start_time_us = test_timestamp - 23000000;
-    // Change buf2 priority to medium
-    buf2->priority = MAC_PD_DATA_MEDIUM_PRIORITY;
-    rf_mac_setup->pd_data_request_queue_to_go = buf;
-    rf_mac_setup->pd_data_request_queue_to_go->next = buf2;
-    rf_mac_setup->pd_data_request_queue_to_go->next->next = buf3;
-    rf_mac_setup->pd_data_request_queue_to_go->next->next->next = buf4;
-    rf_mac_setup->unicast_queue_size = 4;
-    fhss_config_stub.bool_value = false;
-    fhss_tx_condition = true;
-    // Trig should remove first buffer and take second as active data request
-    mac_mcps_trig_buffer_from_queue(rf_mac_setup);
-    if (rf_mac_setup->active_pd_data_request != buf2) {
-        test_mac_rf_mac_class_free(rf_mac_setup);
-        printf("Fail: Remove old buffers with priority, wrong buffer activated\r\n");
-        return false;
-    }
-    mac_mcps_buffer_queue_free(rf_mac_setup);
-
-    // Test removing old buffers with EF priority from queue
-    rf_mac_setup->fhss_api = ns_fhss_create(0, 0, 0);
-    // Add 4 buffers in queue, buf(normal priority) and buf2(EF priority) are too old and should be removed
-    buf = tes_mac_mcps_temporary_buffer_get(0);
-    buf2 = tes_mac_mcps_temporary_buffer_get(0);
-    buf3 = tes_mac_mcps_temporary_buffer_get(0);
-    buf4 = tes_mac_mcps_temporary_buffer_get(0);
-    buf->request_start_time_us = test_timestamp - 32000000;
-    buf2->request_start_time_us = test_timestamp - 121000000;
-    buf3->request_start_time_us = test_timestamp - 100000000;
-    buf4->request_start_time_us = test_timestamp - 23000000;
-    // Change buf2 and buf3 priority to expedited forwarding
-    buf2->priority = MAC_PD_DATA_EF_PRIORITY;
-    buf3->priority = MAC_PD_DATA_EF_PRIORITY;
-    rf_mac_setup->pd_data_request_queue_to_go = buf;
-    rf_mac_setup->pd_data_request_queue_to_go->next = buf2;
-    rf_mac_setup->pd_data_request_queue_to_go->next->next = buf3;
-    rf_mac_setup->pd_data_request_queue_to_go->next->next->next = buf4;
-    rf_mac_setup->unicast_queue_size = 4;
-    fhss_config_stub.bool_value = false;
-    fhss_tx_condition = true;
-    // Trig should remove first two buffers and take third as active data request
-    mac_mcps_trig_buffer_from_queue(rf_mac_setup);
-    if (rf_mac_setup->active_pd_data_request != buf3) {
-        test_mac_rf_mac_class_free(rf_mac_setup);
-        printf("Fail: Remove old buffers with EF priority, wrong buffer activated\r\n");
-        return false;
-    }
-    mac_mcps_buffer_queue_free(rf_mac_setup);
-
     // Free test setup struct
     test_mac_rf_mac_class_free(rf_mac_setup);
     return true;

From 6d290dc3c156a255e9bed6b4f171dc50fa5f4f47 Mon Sep 17 00:00:00 2001
From: Arto Kinnunen <Arto.Kinnunen@arm.com>
Date: Wed, 9 Jun 2021 13:14:54 +0300
Subject: [PATCH 28/43] System time read/write callbacks (#2637)

- Add new API for setting system time read and write callbacks.
- Update ws_pae to use the new time service.
---
 CHANGELOG.md                           |  1 +
 nanostack/ns_time_api.h                | 32 ++++++++++++---
 source/6LoWPAN/ws/ws_empty_functions.c |  5 ---
 source/6LoWPAN/ws/ws_pae_time.c        | 22 +++++-----
 source/Service_Libs/utils/ns_time.c    | 55 +++++++++++++++++++++++++
 source/Service_Libs/utils/ns_time.h    | 56 ++++++++++++++++++++++++++
 sources.mk                             |  1 +
 7 files changed, 148 insertions(+), 24 deletions(-)
 create mode 100644 source/Service_Libs/utils/ns_time.c
 create mode 100644 source/Service_Libs/utils/ns_time.h

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85c545d6e46..8112af0b6a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * Filter EAPOL parents based on DEVICE_MIN_SENS configuration with Threshold and Hysteresis to prevent EAPOL failures caused by bad signal levels
 * Adaptation layer removes oldest packets first when stack needs to release memory or reduce traffic
 * Use QoS specific timeout to drop old packets from TX queue to prioritize limited bandwidth.
+* Added network time syncronisation support. Network node can update device current time if accurate time was received from the network.
 
 ### Changes
 * Statistics for MAC data request latencies. Separated to adaptation layer and MAC queueing delays.
diff --git a/nanostack/ns_time_api.h b/nanostack/ns_time_api.h
index 9e9e9539f89..4b1907cfc90 100644
--- a/nanostack/ns_time_api.h
+++ b/nanostack/ns_time_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pelion and affiliates.
+ * Copyright (c) 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,7 +29,7 @@
 #include "ns_types.h"
 
 /**
- * System time callback.
+ * System time read callback.
  *
  * Callback shall return the system time in seconds after 1970.
  *
@@ -39,13 +39,33 @@
 typedef uint64_t ns_time_api_system_time_callback(void);
 
 /**
- * System time callback set.
+ * System time write callback.
  *
- * Sets callback for the system time.
+ * Callback will write the time in seconds after 1970.
  *
- * \param callback system time callback
+ * \param seconds system time in seconds
+ *
+ */
+typedef void ns_time_api_system_time_write_callback(uint64_t write_time);
+
+/**
+ * System time read callback set.
+ *
+ * Sets callback for the system time read.
+ *
+ * \param callback_rd system time read callback
+ *
+ */
+void ns_time_api_system_time_callback_set(ns_time_api_system_time_callback callback_rd);
+
+/**
+ * Set system time write callback.
+ *
+ * Sets system time write callback.
+ *
+ * \param callback_wr system time write callback.
  *
  */
-void ns_time_api_system_time_callback_set(ns_time_api_system_time_callback callback);
+void ns_time_api_system_time_write_callback_set(ns_time_api_system_time_write_callback callback_wr);
 
 #endif /* NS_TIME_API_H_ */
diff --git a/source/6LoWPAN/ws/ws_empty_functions.c b/source/6LoWPAN/ws/ws_empty_functions.c
index 83bb511f147..f7e14fdb798 100644
--- a/source/6LoWPAN/ws/ws_empty_functions.c
+++ b/source/6LoWPAN/ws/ws_empty_functions.c
@@ -440,11 +440,6 @@ int ws_statistics_stop(int8_t interface_id)
     return -1;
 }
 
-void ns_time_api_system_time_callback_set(ns_time_api_system_time_callback callback)
-{
-    (void) callback;
-}
-
 int ws_stack_info_get(int8_t interface_id, ws_stack_info_t *info_ptr)
 {
     (void) interface_id;
diff --git a/source/6LoWPAN/ws/ws_pae_time.c b/source/6LoWPAN/ws/ws_pae_time.c
index 9b5b16d7c73..55a3e8b5c68 100644
--- a/source/6LoWPAN/ws/ws_pae_time.c
+++ b/source/6LoWPAN/ws/ws_pae_time.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pelion and affiliates.
+ * Copyright (c) 2020-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,6 +25,7 @@
 #include "6LoWPAN/ws/ws_pae_time.h"
 #include "Security/protocols/sec_prot_certs.h"
 #include "Security/protocols/sec_prot_keys.h"
+#include "Service_Libs/utils/ns_time.h"
 
 #ifdef HAVE_WS
 
@@ -34,7 +35,6 @@
 #define CURRENT_TIME_INIT_VALUE        1577836800
 
 static uint64_t current_time = CURRENT_TIME_INIT_VALUE;
-static ns_time_api_system_time_callback *system_time_callback = NULL;
 
 uint16_t ws_pae_time_to_short_convert(uint32_t time)
 {
@@ -148,8 +148,9 @@ int8_t ws_pae_time_diff_calc(uint64_t curr_time, uint64_t comp_time, uint32_t *t
 
 uint64_t ws_pae_current_time_get(void)
 {
-    if (system_time_callback) {
-        return system_time_callback();
+    uint64_t new_time;
+    if (ns_time_system_time_read(&new_time) == 0) {
+        return new_time;
     }
 
     return current_time;
@@ -162,15 +163,15 @@ void ws_pae_current_time_update(uint16_t seconds)
 
 int8_t ws_pae_current_time_set(uint64_t time)
 {
+    uint64_t new_system_time;
     current_time = time;
 
     tr_debug("Current time set: %"PRIi64, time);
 
-    if (system_time_callback) {
-        uint64_t system_time = system_time_callback();
+    if (ns_time_system_time_read(&new_system_time) == 0) {
         // System time has gone backwards
-        if (system_time < current_time || system_time > current_time + SYSTEM_TIME_MAXIMUM_DIFF) {
-            tr_error("FATAL: system time less than reference time or more than 12 months in future: %"PRIi64" reference time: %"PRIi64, system_time, current_time);
+        if (new_system_time < current_time || new_system_time > current_time + SYSTEM_TIME_MAXIMUM_DIFF) {
+            tr_error("FATAL: system time less than reference time or more than 12 months in future: %"PRIi64" reference time: %"PRIi64, new_system_time, current_time);
             return -1;
         }
     }
@@ -178,10 +179,5 @@ int8_t ws_pae_current_time_set(uint64_t time)
     return 0;
 }
 
-void ns_time_api_system_time_callback_set(ns_time_api_system_time_callback callback)
-{
-    system_time_callback = callback;
-}
-
 #endif /* HAVE_WS */
 
diff --git a/source/Service_Libs/utils/ns_time.c b/source/Service_Libs/utils/ns_time.c
new file mode 100644
index 00000000000..9e8bf761b3a
--- /dev/null
+++ b/source/Service_Libs/utils/ns_time.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2021, Pelion 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <string.h>
+#include <stdio.h>
+#include "ns_types.h"
+#include "ns_time_api.h" //ns_time_api_system_time_callback
+
+static ns_time_api_system_time_callback *system_time_read_callback = NULL;
+static ns_time_api_system_time_write_callback *system_time_write_callback = NULL;
+
+void ns_time_api_system_time_callback_set(ns_time_api_system_time_callback callback_rd)
+{
+    system_time_read_callback = callback_rd;
+}
+
+void ns_time_api_system_time_write_callback_set(ns_time_api_system_time_write_callback callback_wr)
+{
+    system_time_write_callback = callback_wr;
+}
+
+int ns_time_system_time_write(uint64_t time_write)
+{
+    if (system_time_write_callback) {
+        system_time_write_callback(time_write);
+        return 0;
+    }
+
+    return -1;
+}
+
+int ns_time_system_time_read(uint64_t *time_read)
+{
+    if (system_time_read_callback && time_read) {
+        uint64_t new_time = system_time_read_callback();
+        *time_read = new_time;
+        return 0;
+    }
+
+    return -1;
+}
diff --git a/source/Service_Libs/utils/ns_time.h b/source/Service_Libs/utils/ns_time.h
new file mode 100644
index 00000000000..27299ce0bbd
--- /dev/null
+++ b/source/Service_Libs/utils/ns_time.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2021, Pelion 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _NS_TIME_H_
+#define _NS_TIME_H_
+
+/**
+ * \file ns_time.h
+ * \brief Nanostack internal time handling API.
+ */
+
+/**
+ * Write new time as a platform time
+ *
+ * Write a new time to platform provided time system.
+ * Platform time callbacks must be set by using method ns_time_api_system_time_callbacks_set.
+ *
+ * \param time_write time to be written as a new system time.
+ *
+ * \return 0 in success.
+ * \return <0 in case of errors.
+ *
+ */
+int ns_time_system_time_write(uint64_t time_write);
+
+/**
+ * Read platform time from a time callback
+ *
+ * Read a new time from time system provided by the platform.
+ * Platform time callbacks must be set by using the method ns_time_api_system_time_callbacks_set.
+ *
+ * \param time_read Address to variable where new time will be written.
+ *
+ * \return 0 in success.
+ * \return <0 in case of errors.
+ *
+ */
+int ns_time_system_time_read(uint64_t *time_read);
+
+
+
+#endif /* _NS_TIME_H_ */
diff --git a/sources.mk b/sources.mk
index 462cc0366ad..7c5af85febc 100644
--- a/sources.mk
+++ b/sources.mk
@@ -212,6 +212,7 @@ SRCS += \
 	source/Service_Libs/utils/ns_crc.c \
 	source/Service_Libs/utils/isqrt.c \
 	source/Service_Libs/utils/ns_file_system.c \
+	source/Service_Libs/utils/ns_time.c \
 	source/Service_Libs/utils/ns_conf.c \
 	source/Service_Libs/mdns/ns_mdns_api.c \
 	source/Service_Libs/mdns/ns_fnet_port.c \

From 560619d85d9064948df58c28cc18c1d6b466edec Mon Sep 17 00:00:00 2001
From: Mika Tervonen <mika.tervonen@arm.com>
Date: Mon, 7 Jun 2021 15:01:21 +0300
Subject: [PATCH 29/43] Add network time vendor data element to DHCPv6 reply
 message

New ARM vendor data specified where Network time can be distributed
Added support for Dynamic vendor data for individual request
changed vendor data length to uint16
Removed static variables from border router
---
 source/6LoWPAN/ws/ws_bbr_api.c                | 48 ++++++++++++---
 source/6LoWPAN/ws/ws_bootstrap.c              | 29 ++++++++++
 source/DHCPv6_Server/DHCPv6_Server_service.c  | 17 +++++-
 source/DHCPv6_Server/DHCPv6_server_service.h  |  4 +-
 source/libDHCPv6/libDHCPv6_server.c           | 25 +++++++-
 source/libDHCPv6/libDHCPv6_server.h           |  5 +-
 source/libDHCPv6/libDHCPv6_vendordata.c       | 58 +++++++++++++++++++
 source/libDHCPv6/libDHCPv6_vendordata.h       | 38 ++++++++++++
 .../stub/dhcpv6_server_service_stub.c         |  8 ++-
 9 files changed, 218 insertions(+), 14 deletions(-)

diff --git a/source/6LoWPAN/ws/ws_bbr_api.c b/source/6LoWPAN/ws/ws_bbr_api.c
index 6daa996c80a..051fca51adb 100644
--- a/source/6LoWPAN/ws/ws_bbr_api.c
+++ b/source/6LoWPAN/ws/ws_bbr_api.c
@@ -42,6 +42,7 @@
 #include "ws_management_api.h"
 #include "net_rpl.h"
 #include "Service_Libs/nd_proxy/nd_proxy.h"
+#include "Service_Libs/utils/ns_time.h"
 #include "6LoWPAN/ws/ws_bbr_api_internal.h"
 #include "6LoWPAN/ws/ws_pae_controller.h"
 #include "6LoWPAN/lowpan_adaptation_interface.h"
@@ -96,9 +97,6 @@ static uint8_t current_global_prefix[16] = {0}; // DHCP requires 16 bytes prefix
 static uint32_t bbr_delay_timer = BBR_CHECK_INTERVAL; // initial delay.
 static uint32_t global_prefix_unavailable_timer = 0; // initial delay.
 
-static uint8_t *dhcp_vendor_data_ptr = NULL;
-static uint8_t dhcp_vendor_data_len = 0;
-
 static rpl_dodag_conf_t rpl_conf = {
     // Lifetime values
     .default_lifetime = 120,
@@ -485,9 +483,38 @@ static bool wisun_dhcp_address_add_cb(int8_t interfaceId, dhcp_address_cache_upd
     return true;
 }
 
+static uint8_t *ws_bbr_dhcp_server_dynamic_vendor_data_write(int8_t interfaceId, uint8_t *ptr, uint16_t *data_len)
+{
+    // If local time is not available vendor data is not written and data_len is not modified
+    (void)interfaceId;
+
+    uint64_t time_read;
+
+    if (0 != ns_time_system_time_read(&time_read)) {
+        return ptr;
+    }
+
+    if (data_len) {
+        *data_len += net_vendor_option_current_time_length();
+    }
+    if (!ptr) {
+        return ptr;
+    }
+    time_read += 2208988800; // Time starts now from the 0 era instead of First day of Unix (1 Jan 1970)
+
+    uint32_t era = time_read / (uint64_t)(4294967296);
+    uint32_t timestamp = time_read - (era * (uint64_t)(4294967296));
+    ptr = net_vendor_option_current_time_write(ptr, era, timestamp, 0);
+
+    return ptr;
+}
+
+
 static void ws_bbr_dhcp_server_dns_info_update(protocol_interface_info_entry_t *cur, uint8_t *global_id)
 {
     //add DNS server information to DHCP server that is learned from the backbone interface.
+    uint8_t *dhcp_vendor_data_ptr = NULL;
+    uint8_t dhcp_vendor_data_len = 0;
     uint8_t dns_server_address[16];
     uint8_t *dns_search_list_ptr = NULL;
     uint8_t dns_search_list_len = 0;
@@ -497,33 +524,40 @@ static void ws_bbr_dhcp_server_dns_info_update(protocol_interface_info_entry_t *
         DHCPv6_server_service_set_dns_server(cur->id, global_id, dns_server_address, dns_search_list_ptr, dns_search_list_len);
     }
 
-    //TODO Generate vendor data in Wi-SUN network include the cached DNS query results in some sort of TLV format
+    //Generate ARM specific vendor data in Wi-SUN network
+    // Cached DNS query results
+    // Network Time
+
     int vendor_data_len = 0;
     for (int n = 0; n < MAX_DNS_RESOLUTIONS; n++) {
         if (pre_resolved_dns_queries[n].domain_name != NULL) {
             vendor_data_len += net_dns_option_vendor_option_data_dns_query_length(pre_resolved_dns_queries[n].domain_name);
         }
     }
+
     if (vendor_data_len) {
-        ns_dyn_mem_free(dhcp_vendor_data_ptr);
-        dhcp_vendor_data_ptr = ns_dyn_mem_alloc(vendor_data_len);
+        dhcp_vendor_data_ptr = ns_dyn_mem_temporary_alloc(vendor_data_len);
         if (!dhcp_vendor_data_ptr) {
             tr_warn("Vendor info set fail");
             return;
         }
         dhcp_vendor_data_len = vendor_data_len;
     }
+    // Write ARM vendor data
+    uint8_t *ptr = dhcp_vendor_data_ptr;
+
     if (dhcp_vendor_data_ptr) {
         // Write vendor data
-        uint8_t *ptr = dhcp_vendor_data_ptr;
         for (int n = 0; n < MAX_DNS_RESOLUTIONS; n++) {
             if (pre_resolved_dns_queries[n].domain_name != NULL) {
                 ptr = net_dns_option_vendor_option_data_dns_query_write(ptr, pre_resolved_dns_queries[n].address, pre_resolved_dns_queries[n].domain_name);
             }
         }
     }
+    DHCPv6_server_service_set_vendor_data_callback(cur->id, global_id, ARM_ENTERPRISE_NUMBER, ws_bbr_dhcp_server_dynamic_vendor_data_write);
 
     DHCPv6_server_service_set_vendor_data(cur->id, global_id, ARM_ENTERPRISE_NUMBER, dhcp_vendor_data_ptr, dhcp_vendor_data_len);
+    ns_dyn_mem_free(dhcp_vendor_data_ptr);
 }
 
 static void wisun_dhcp_address_remove_cb(int8_t interfaceId, uint8_t *targetAddress, void *prefix_info)
diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
index 3e9089461bb..c66f53f2c32 100644
--- a/source/6LoWPAN/ws/ws_bootstrap.c
+++ b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -49,6 +49,7 @@
 #include "Common_Protocols/ip.h"
 #include "Service_Libs/Trickle/trickle.h"
 #include "Service_Libs/fhss/channel_list.h"
+#include "Service_Libs/utils/ns_time.h"
 #include "6LoWPAN/ws/ws_common_defines.h"
 #include "6LoWPAN/ws/ws_common_defines.h"
 #include "6LoWPAN/ws/ws_config.h"
@@ -999,6 +1000,34 @@ static void ws_bootstrap_dhcp_info_notify_cb(int8_t interface, dhcp_option_notif
                         net_dns_query_result_set(interface, address, domain, server_info->life_time);
                     }
                 }
+                if (option_type == ARM_DHCP_VENDOR_DATA_NETWORK_TIME) {
+                    // Process ARM Network Time
+                    // Get Current time
+                    // Get Round trip time of the DHCP request
+                    // Estimated error is elapsed time of request
+                    // If current time difference is larger than estimated error update current time
+                    //     set the time for server time + *.5 RTT
+                    int32_t era;
+                    uint32_t offset;
+                    if (net_vendor_option_current_time_read(options->option.vendor_spesific.data, options->option.vendor_spesific.data_length, &era, &offset, NULL)) {
+                        uint32_t estimated_error = 10;
+                        uint64_t current_time;
+                        uint64_t network_time = (era * (uint64_t)(4294967296)) + offset - 2208988800; //Convert to First day of Unix (1 Jan 1970)
+                        if (0 == ns_time_system_time_read(&current_time)) {
+                            uint64_t difference;
+                            if (current_time > network_time) {
+                                difference = current_time - network_time;
+                            } else {
+                                difference = network_time - current_time;
+                            }
+                            if (difference > estimated_error) {
+                                // Larger than 10 second difference update the time
+                                int ret = ns_time_system_time_write(network_time);
+                                tr_info("Network Time %s: Era:%"PRId32" Offset:%"PRIu32" old time: %"PRIu64" time: %"PRIu64, ret == 0 ? "updated" : "update FAILED", era, offset, current_time, network_time);
+                            }
+                        }
+                    }
+                }
 
                 options->option.vendor_spesific.data_length -= option_len;
                 options->option.vendor_spesific.data += option_len;
diff --git a/source/DHCPv6_Server/DHCPv6_Server_service.c b/source/DHCPv6_Server/DHCPv6_Server_service.c
index 625dd859a0e..790d7e6064d 100644
--- a/source/DHCPv6_Server/DHCPv6_Server_service.c
+++ b/source/DHCPv6_Server/DHCPv6_Server_service.c
@@ -464,7 +464,7 @@ int DHCPv6_server_service_set_dns_server(int8_t interface, uint8_t guaPrefix[sta
     return 0;
 }
 
-int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, uint8_t *dhcp_vendor_data_ptr, uint8_t dhcp_vendor_data_len)
+int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, uint8_t *dhcp_vendor_data_ptr, uint16_t dhcp_vendor_data_len)
 {
     dhcpv6_gua_server_entry_s *serverInfo = libdhcpv6_server_data_get_by_prefix_and_interfaceid(interface, guaPrefix);
     if (!serverInfo) {
@@ -496,6 +496,21 @@ int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[st
     return 0;
 }
 
+int DHCPv6_server_service_set_vendor_data_callback(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, dhcp_vendor_data_cb *vendor_data_cb)
+{
+    dhcpv6_gua_server_entry_s *serverInfo = libdhcpv6_server_data_get_by_prefix_and_interfaceid(interface, guaPrefix);
+    if (!serverInfo) {
+        return -1;
+    }
+
+    dhcpv6_vendor_data_t *vendor_data_entry = libdhcpv6_vendor_data_allocate(serverInfo, enterprise_number);
+
+    if (!vendor_data_entry) {
+        return -1;
+    }
+    vendor_data_entry->vendor_data_cb = vendor_data_cb;
+    return 0;
+}
 #else
 
 int DHCPv6_server_service_init(int8_t interface, uint8_t guaPrefix[static 16], uint8_t serverDUID[static 8], uint16_t serverDUIDType)
diff --git a/source/DHCPv6_Server/DHCPv6_server_service.h b/source/DHCPv6_Server/DHCPv6_server_service.h
index 20dbdb5d432..e2228072093 100644
--- a/source/DHCPv6_Server/DHCPv6_server_service.h
+++ b/source/DHCPv6_Server/DHCPv6_server_service.h
@@ -98,7 +98,9 @@ int DHCPv6_server_service_set_address_validlifetime(int8_t interface, uint8_t gu
 
 int DHCPv6_server_service_set_dns_server(int8_t interface, uint8_t guaPrefix[static 16], uint8_t dns_server_address[static 16], uint8_t *dns_search_list_ptr, uint8_t dns_search_list_len);
 
-int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, uint8_t *dhcp_vendor_data_ptr, uint8_t dhcp_vendor_data_len);
+int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, uint8_t *dhcp_vendor_data_ptr, uint16_t dhcp_vendor_data_len);
+
+int DHCPv6_server_service_set_vendor_data_callback(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, dhcp_vendor_data_cb *vendor_data_cb);
 
 #else
 #define DHCPv6_server_service_delete(interface, guaPrefix, delete_gua_addresses)
diff --git a/source/libDHCPv6/libDHCPv6_server.c b/source/libDHCPv6/libDHCPv6_server.c
index 5cb06bc1930..87bdfe5a930 100644
--- a/source/libDHCPv6/libDHCPv6_server.c
+++ b/source/libDHCPv6/libDHCPv6_server.c
@@ -461,12 +461,12 @@ dhcpv6_vendor_data_t *libdhcpv6_vendor_data_allocate(dhcpv6_gua_server_entry_s *
     }
     ns_list_add_to_end(&serverInfo->vendorDataList, entry);
     entry->enterprise_number = enterprise_number;
+    entry->vendor_data_cb = NULL;
     entry->vendor_data = NULL;
     entry->vendor_data_length = 0;
     return entry;
 }
 
-
 uint16_t libdhcpv6_dns_server_message_sizes(dhcpv6_gua_server_entry_s *serverInfo)
 {
     uint16_t message_size = 0;
@@ -482,7 +482,13 @@ uint16_t libdhcpv6_vendor_data_message_sizes(dhcpv6_gua_server_entry_s *serverIn
 {
     uint16_t message_size = 0;
     ns_list_foreach(dhcpv6_vendor_data_t, cur, &serverInfo->vendorDataList) {
-        message_size += 4 + 4 + cur->vendor_data_length; //Type + Length + enterprise + vendor_data_length
+        uint16_t size = cur->vendor_data_length; //Type + Length + enterprise + vendor_data_length
+        if (cur->vendor_data_cb) {
+            cur->vendor_data_cb(serverInfo->interfaceId, NULL, &size);
+        }
+        if (size != 0) {
+            message_size += 2 + 2 + 4 + size;
+        }
     }
     return message_size;
 }
@@ -510,7 +516,17 @@ uint8_t *libdhcpv6_vendor_data_message_writes(dhcpv6_gua_server_entry_s *serverI
 {
     ns_list_foreach(dhcpv6_vendor_data_t, cur, &serverInfo->vendorDataList) {
 
-        uint16_t length = cur->vendor_data_length + 4;
+        uint16_t length = cur->vendor_data_length;
+
+        if (cur->vendor_data_cb) {
+            cur->vendor_data_cb(serverInfo->interfaceId, NULL, &length);
+        }
+        if (length == 0) {
+            // No vendor data
+            continue;
+        }
+        length += 4;
+
         ptr = common_write_16_bit(DHCPV6_OPTION_VENDOR_SPECIFIC_INFO, ptr);
         ptr = common_write_16_bit(length, ptr); //Length
         ptr = common_write_32_bit(cur->enterprise_number, ptr);
@@ -518,6 +534,9 @@ uint8_t *libdhcpv6_vendor_data_message_writes(dhcpv6_gua_server_entry_s *serverI
             memcpy(ptr, cur->vendor_data, cur->vendor_data_length);
             ptr += cur->vendor_data_length;
         }
+        if (cur->vendor_data_cb) {
+            ptr = cur->vendor_data_cb(serverInfo->interfaceId, ptr, NULL);
+        }
     }
     return ptr;
 }
diff --git a/source/libDHCPv6/libDHCPv6_server.h b/source/libDHCPv6/libDHCPv6_server.h
index bf26c679d13..f7615ba7dac 100644
--- a/source/libDHCPv6/libDHCPv6_server.h
+++ b/source/libDHCPv6/libDHCPv6_server.h
@@ -32,6 +32,8 @@
 #define DHCP_ADDRESS_ID_START 2
 
 typedef void (dhcp_address_prefer_remove_cb)(int8_t interfaceId, uint8_t *targetAddress, void *prefix_info);
+typedef uint8_t *(dhcp_vendor_data_cb)(int8_t interfaceId, uint8_t *ptr, uint16_t *dhcp_vendor_data_len);
+
 
 typedef struct dhcpv6_allocated_address_entry_s {
     uint8_t             linkId[8];  /*!< Services UL64 */
@@ -54,8 +56,9 @@ typedef struct dhcpv6_dns_server_data_s {
 
 typedef struct dhcpv6_vendor_data_s {
     uint32_t            enterprise_number;
+    dhcp_vendor_data_cb *vendor_data_cb;    // Additional vendor data that can be set for individual reply
     uint8_t             *vendor_data;
-    uint8_t             vendor_data_length;
+    uint16_t             vendor_data_length;
     ns_list_link_t      link;               /*!< List link entry */
 } dhcpv6_vendor_data_t;
 
diff --git a/source/libDHCPv6/libDHCPv6_vendordata.c b/source/libDHCPv6/libDHCPv6_vendordata.c
index 88b87fe005d..fb6b909c7c6 100644
--- a/source/libDHCPv6/libDHCPv6_vendordata.c
+++ b/source/libDHCPv6/libDHCPv6_vendordata.c
@@ -98,3 +98,61 @@ uint16_t net_dns_option_vendor_option_data_dns_query_read(uint8_t *ptr, uint16_t
     }
     return option_len;
 }
+
+uint16_t net_vendor_option_current_time_length(void)
+{
+    return 4 + 3 * sizeof(uint32_t);
+}
+
+uint8_t *net_vendor_option_current_time_write(uint8_t *ptr, int32_t era, uint32_t offset, uint32_t fraction)
+{
+    /*
+     * Time value written using NTP time format
+     * Following rfc5905
+     */
+
+    ptr = common_write_16_bit(ARM_DHCP_VENDOR_DATA_NETWORK_TIME, ptr);
+    ptr = common_write_16_bit(3 * sizeof(uint32_t), ptr);
+    ptr = common_write_32_bit((uint32_t)era, ptr);
+    ptr = common_write_32_bit(offset, ptr);
+    ptr = common_write_32_bit(fraction, ptr);
+    return ptr;
+}
+
+uint8_t *net_vendor_option_current_time_read(uint8_t *ptr, uint16_t length, int32_t *era, uint32_t *offset, uint32_t *fraction)
+{
+    /*
+     * Time value written using NTP time format
+     * Following rfc5905
+     */
+    uint16_t option_len;
+
+    if (length < net_vendor_option_current_time_length()) {
+        // Corrupted as there is no room for all fields
+        return 0;
+    }
+
+    if (common_read_16_bit(ptr) != ARM_DHCP_VENDOR_DATA_NETWORK_TIME) {
+        return 0;
+    }
+
+    option_len = common_read_16_bit(ptr + 2);
+    ptr += 4;
+
+    if (option_len < 3 * sizeof(uint32_t)) {
+        // Corrupted as not enough room for fields
+        return 0;
+    }
+
+    if (era) {
+        *era = (int32_t)common_read_32_bit(ptr);
+    }
+    if (offset) {
+        *offset = common_read_32_bit(ptr + sizeof(uint32_t));
+    }
+    if (fraction) {
+        *fraction = common_read_32_bit(ptr + 2 * sizeof(uint32_t));
+    }
+
+    return ptr;
+}
diff --git a/source/libDHCPv6/libDHCPv6_vendordata.h b/source/libDHCPv6/libDHCPv6_vendordata.h
index bc50fca81d7..a9974e88625 100644
--- a/source/libDHCPv6/libDHCPv6_vendordata.h
+++ b/source/libDHCPv6/libDHCPv6_vendordata.h
@@ -32,6 +32,40 @@
  * */
 #define ARM_DHCP_VENDOR_DATA_DNS_QUERY_RESULT 297
 
+/* ARM Defined vendor data option to distribute network time through DHCP server
+ * Format. This can be used to syncronice the times of Wi-SUN devices to match the
+ * time of border router.
+ *
+ * Following rfc5905 date format.
+ *  +-------------+------------+-----+---------------+------------------+
+ *  | Date        | MJD        | NTP | NTP Timestamp | Epoch            |
+ *  |             |            | Era | Era Offset    |                  |
+ *  +-------------+------------+-----+---------------+------------------+
+ *  | 1 Jan -4712 | -2,400,001 | -49 | 1,795,583,104 | 1st day Julian   |
+ *  | 1 Jan -1    | -679,306   | -14 | 139,775,744   | 2 BCE            |
+ *  | 1 Jan 0     | -678,491   | -14 | 171,311,744   | 1 BCE            |
+ *  | 1 Jan 1     | -678,575   | -14 | 202,939,144   | 1 CE             |
+ *  | 4 Oct 1582  | -100,851   | -3  | 2,873,647,488 | Last day Julian  |
+ *  | 15 Oct 1582 | -100,840   | -3  | 2,874,597,888 | First day        |
+ *  |             |            |     |               | Gregorian        |
+ *  | 31 Dec 1899 | 15019      | -1  | 4,294,880,896 | Last day NTP Era |
+ *  |             |            |     |               | -1               |
+ *  | 1 Jan 1900  | 15020      | 0   | 0             | First day NTP    |
+ *  |             |            |     |               | Era 0            |
+ *  | 1 Jan 1970  | 40,587     | 0   | 2,208,988,800 | First day UNIX   |
+ *  | 1 Jan 1972  | 41,317     | 0   | 2,272,060,800 | First day UTC    |
+ *  | 31 Dec 1999 | 51,543     | 0   | 3,155,587,200 | Last day 20th    |
+ *  |             |            |     |               | Century          |
+ *  | 8 Feb 2036  | 64,731     | 1   | 63,104        | First day NTP    |
+ *  |             |            |     |               | Era 1            |
+ *  +-------------+------------+-----+---------------+------------------+
+ * int32_t Era
+ * uint32_t offset
+ * uint32_t fraction
+ *
+ * */
+#define ARM_DHCP_VENDOR_DATA_NETWORK_TIME 298
+
 /* DHCPv6 vendor options to distribute ARM vendor data*/
 
 uint16_t net_dns_option_vendor_option_data_dns_query_length(char *domain);
@@ -40,5 +74,9 @@ uint8_t *net_dns_option_vendor_option_data_dns_query_write(uint8_t *ptr, uint8_t
 uint16_t net_dns_option_vendor_option_data_get_next(uint8_t *ptr, uint16_t length, uint16_t *type);
 uint16_t net_dns_option_vendor_option_data_dns_query_read(uint8_t *ptr, uint16_t length, uint8_t **address, char **domain);
 
+uint16_t net_vendor_option_current_time_length(void);
+uint8_t *net_vendor_option_current_time_write(uint8_t *ptr, int32_t era, uint32_t offset, uint32_t fraction);
+uint8_t *net_vendor_option_current_time_read(uint8_t *ptr, uint16_t length, int32_t *era, uint32_t *offset, uint32_t *fraction);
+
 
 #endif /* LIBDHCPV6_VENDOR_DATA_H_ */
diff --git a/test/nanostack/unittest/stub/dhcpv6_server_service_stub.c b/test/nanostack/unittest/stub/dhcpv6_server_service_stub.c
index 8c225af77ab..cad7fb2cda1 100644
--- a/test/nanostack/unittest/stub/dhcpv6_server_service_stub.c
+++ b/test/nanostack/unittest/stub/dhcpv6_server_service_stub.c
@@ -140,8 +140,14 @@ int DHCPv6_server_service_set_dns_server(int8_t interface, uint8_t guaPrefix[sta
     return 0;
 }
 
-int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, uint8_t *dhcp_vendor_data_ptr, uint8_t dhcp_vendor_data_len)
+int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, uint8_t *dhcp_vendor_data_ptr, uint16_t dhcp_vendor_data_len)
 {
     return 0;
 }
+
+int DHCPv6_server_service_set_vendor_data_callback(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, dhcp_vendor_data_cb *vendor_data_cb)
+{
+    return 0;
+}
+
 #endif

From d6f44218d6711dfcefd32c7a953814d232daf8be Mon Sep 17 00:00:00 2001
From: Alban Jeantheau <Alban.Jeantheau@silabs.com>
Date: Tue, 8 Jun 2021 15:48:55 +0200
Subject: [PATCH 30/43] Correct ufsi timing calculation

When calculating ufsi, the function was relying
on the slot processed by the unicast fhss timer
callback, which can be delayed. When it happens
the slot value is wrong, and the ufsi is incorrect.

The ufsi is then used by the peer to determined
the reply channel, so the devices are thus
unsynchronized until the next uplink packet.
---
 source/Service_Libs/fhss/fhss_ws.c | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/source/Service_Libs/fhss/fhss_ws.c b/source/Service_Libs/fhss/fhss_ws.c
index 74b36b708e3..7e2a3e40b17 100644
--- a/source/Service_Libs/fhss/fhss_ws.c
+++ b/source/Service_Libs/fhss/fhss_ws.c
@@ -499,16 +499,35 @@ static uint32_t fhss_ws_calculate_ufsi(fhss_structure_t *fhss_structure, uint32_
         }
     }
     cur_slot--;
-    uint32_t remaining_time_ms = 0;
-    if (fhss_structure->ws->unicast_timer_running == true) {
-        remaining_time_ms = US_TO_MS(get_remaining_slots_us(fhss_structure, fhss_unicast_handler, MS_TO_US(dwell_time) - NS_TO_US((int64_t)(fhss_structure->ws->drift_per_millisecond_ns * dwell_time))));
-    }
+
     uint32_t time_to_tx = 0;
     uint32_t cur_time = fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api);
     if (cur_time < tx_time) {
         time_to_tx = US_TO_MS(tx_time - cur_time);
     }
-    uint64_t ms_since_seq_start = (cur_slot * dwell_time) + (dwell_time - remaining_time_ms) + time_to_tx;
+    uint64_t ms_since_seq_start;
+    if (fhss_structure->ws->unicast_timer_running == true) {
+        if (fhss_structure->ws->next_uc_timeout < cur_time) {
+            // The unicast timer has already expired, so count all previous slots
+            // plus 1 completed slot
+            // plus the time from timer expiration to now
+            // plus the time until Tx
+            ms_since_seq_start = ((cur_slot + 1) * dwell_time) + US_TO_MS(cur_time - fhss_structure->ws->next_uc_timeout) + time_to_tx;
+        } else {
+            // The unicast timer is still running, so count all previous slots
+            // plus the remaining time in the slot
+            // plus the time until Tx
+            uint32_t remaining_time_ms  = US_TO_MS(fhss_structure->ws->next_uc_timeout - cur_time);
+            ms_since_seq_start = (cur_slot * dwell_time) + (dwell_time - remaining_time_ms) + time_to_tx;
+        }
+    } else {
+        // The unicast timer is not running. Act as if the slot has completed.
+        // count all previous slots
+        // plus 1 completed slot
+        // plus the time until Tx
+        ms_since_seq_start = ( (cur_slot + 1) * dwell_time) + time_to_tx;
+    }
+
     uint32_t seq_length = 0x10000;
     if (fhss_structure->ws->fhss_configuration.ws_uc_channel_function == WS_TR51CF) {
         ms_since_seq_start %= (dwell_time * fhss_structure->number_of_uc_channels);

From 411cf5c7a4ae5810391798041b05170e9eae9ac6 Mon Sep 17 00:00:00 2001
From: Alban Jeantheau <Alban.Jeantheau@silabs.com>
Date: Fri, 11 Jun 2021 10:35:47 +0200
Subject: [PATCH 31/43] coding style

---
 source/Service_Libs/fhss/fhss_ws.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/Service_Libs/fhss/fhss_ws.c b/source/Service_Libs/fhss/fhss_ws.c
index 7e2a3e40b17..728ce3acdd9 100644
--- a/source/Service_Libs/fhss/fhss_ws.c
+++ b/source/Service_Libs/fhss/fhss_ws.c
@@ -525,7 +525,7 @@ static uint32_t fhss_ws_calculate_ufsi(fhss_structure_t *fhss_structure, uint32_
         // count all previous slots
         // plus 1 completed slot
         // plus the time until Tx
-        ms_since_seq_start = ( (cur_slot + 1) * dwell_time) + time_to_tx;
+        ms_since_seq_start = ((cur_slot + 1) * dwell_time) + time_to_tx;
     }
 
     uint32_t seq_length = 0x10000;

From 436f16e84fb2134f0883c9beee9af8fa568504bb Mon Sep 17 00:00:00 2001
From: AlbanJeantheau-silabs
 <77835662+AlbanJeantheau-silabs@users.noreply.github.com>
Date: Fri, 11 Jun 2021 10:39:16 +0200
Subject: [PATCH 32/43] Handle timer rollover in calculate_ufsi

Co-authored-by: Jarkko Paso <jarkko.paso@arm.com>
---
 source/Service_Libs/fhss/fhss_ws.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/Service_Libs/fhss/fhss_ws.c b/source/Service_Libs/fhss/fhss_ws.c
index 728ce3acdd9..e0a2eff2557 100644
--- a/source/Service_Libs/fhss/fhss_ws.c
+++ b/source/Service_Libs/fhss/fhss_ws.c
@@ -502,12 +502,14 @@ static uint32_t fhss_ws_calculate_ufsi(fhss_structure_t *fhss_structure, uint32_
 
     uint32_t time_to_tx = 0;
     uint32_t cur_time = fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api);
-    if (cur_time < tx_time) {
+    // High time to TX value (1000ms) is because actual TX time already passed.
+    if (US_TO_MS(tx_time - cur_time) < 1000) {
         time_to_tx = US_TO_MS(tx_time - cur_time);
     }
     uint64_t ms_since_seq_start;
     if (fhss_structure->ws->unicast_timer_running == true) {
-        if (fhss_structure->ws->next_uc_timeout < cur_time) {
+        // Allow timer interrupt to delay max 10 seconds, otherwise assume next_uc_timeout overflowed
+        if ((fhss_structure->ws->next_uc_timeout < cur_time) && ((cur_time - fhss_structure->ws->next_uc_timeout) < 10000000)) {
             // The unicast timer has already expired, so count all previous slots
             // plus 1 completed slot
             // plus the time from timer expiration to now

From 20123477c636898e2d5b9c90a57298c7b17ac7e5 Mon Sep 17 00:00:00 2001
From: Jarkko Paso <jarkko.paso@arm.com>
Date: Mon, 14 Jun 2021 11:46:36 +0300
Subject: [PATCH 33/43] Fixed FHSS UFSI calculation unit tests

---
 .../service_libs/fhss_ws/test_fhss_ws.c       | 56 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.c b/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.c
index 37660c0516d..67f3ce0311b 100644
--- a/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.c
+++ b/test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.c
@@ -648,13 +648,36 @@ bool test_fhss_ws_synch_state_set_callback()
     return true;
 }
 
+static void test_reset_synch_info(uint8_t *synch_info)
+{
+    memset(synch_info, 0, 100);
+    synch_info[0] = 0x05;
+    synch_info[1] = 0x15;
+    synch_info[2] = 0x02;
+    synch_info[3] = 0x00;
+    synch_info[4] = 0x00;
+    synch_info[5] = 0x00;
+    synch_info[6] = 0x00;
+    synch_info[7] = 0x05;
+    synch_info[8] = 0x15;
+    synch_info[9] = 0x01;
+    synch_info[10] = 0x04;
+    synch_info[11] = 0x00;
+    synch_info[12] = 0x00;
+    synch_info[13] = 0x00;
+    synch_info[14] = 0x00;
+    synch_info[15] = 0x3f;
+}
+
 bool test_fhss_ws_write_synch_info_callback()
 {
     fhss_api_t *api = test_generate_fhss_api();
     fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
     fhss_common_stub.fhss_struct.rx_channel = 0;
     fhss_common_stub.fhss_struct.ws->unicast_timer_running = true;
-    uint8_t synch_info[100] = {0x05, 0x15, 0x02, 0x00, 0x00, 0x00, 0x00, 0x05, 0x15, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x3f};
+    uint8_t synch_info[100];
+    test_reset_synch_info(synch_info);
+
     // Test when FHSS struct not found
     disable_fhss_struct();
     if (fhss_common_stub.fhss_struct.fhss_api->write_synch_info(api, synch_info, sizeof(synch_info), DEFAULT_FRAME_TYPE, DEFAULT_TX_TIME) != -1) {
@@ -671,6 +694,7 @@ bool test_fhss_ws_write_synch_info_callback()
     }
     fhss_platform_stub.remaining_slots_value = 100000;
     fhss_callbacks_stub.uint32_value = 1000000;
+    fhss_common_stub.fhss_struct.ws->next_uc_timeout = fhss_callbacks_stub.uint32_value + fhss_platform_stub.remaining_slots_value;
     /* Test the UFSI field in synch info
      * slot:           |               0(200ms)        |               1(200ms)        |               2(200ms)        |               3(200ms)        |
      *                 |                      ufsi(597ms) -> 1001599                                                  |
@@ -680,8 +704,10 @@ bool test_fhss_ws_write_synch_info_callback()
             || (test_ufsi(&synch_info[11], 1001599) != true)) {
         return false;
     }
+    test_reset_synch_info(synch_info);
     // Test when timestamp overflows
     fhss_callbacks_stub.uint32_value = 4294960000;
+    fhss_common_stub.fhss_struct.ws->next_uc_timeout = fhss_callbacks_stub.uint32_value + fhss_platform_stub.remaining_slots_value;
     /* Test the UFSI field in synch info
      * slot:           |               0(200ms)        |               1(200ms)        |               2(200ms)        |               3(200ms)        |
      *                 |                      ufsi(597ms) -> 1001599                                                  |
@@ -691,7 +717,33 @@ bool test_fhss_ws_write_synch_info_callback()
             || (test_ufsi(&synch_info[11], 1001599) != true)) {
         return false;
     }
-
+    test_reset_synch_info(synch_info);
+    // Test when TX time has passed
+    fhss_callbacks_stub.uint32_value = 1000000;
+    fhss_common_stub.fhss_struct.ws->next_uc_timeout = fhss_callbacks_stub.uint32_value + fhss_platform_stub.remaining_slots_value;
+    /* Test the UFSI field in synch info
+     * slot:           |               0(200ms)        |               1(200ms)        |               2(200ms)        |               3(200ms)        |
+     *                 |                      ufsi(500ms) -> 838860
+     * timestamps:                                                 TX at 995000us|written at 1000000us|
+     */
+    if ((fhss_common_stub.fhss_struct.fhss_api->write_synch_info(api, synch_info, sizeof(synch_info), DEFAULT_FRAME_TYPE, fhss_callbacks_stub.uint32_value - 5000) != 0)
+            || (test_ufsi(&synch_info[11], 838860) != true)) {
+        return false;
+    }
+    test_reset_synch_info(synch_info);
+    // Test when interrupt is delayed
+    fhss_platform_stub.remaining_slots_value = 0;
+    fhss_callbacks_stub.uint32_value = 1000000;
+    fhss_common_stub.fhss_struct.ws->next_uc_timeout = fhss_callbacks_stub.uint32_value - 5000;
+    /* Test the UFSI field in synch info
+     * slot:           |               0(200ms)        |               1(200ms)        |               2(200ms)        |               3(200ms)        |
+     *                 |                      ufsi(597ms) -> 1001599
+     * timestamps:                                                                                  written at 1000000us|TX at 1005000us|
+     */
+    if ((fhss_common_stub.fhss_struct.fhss_api->write_synch_info(api, synch_info, sizeof(synch_info), DEFAULT_FRAME_TYPE, fhss_callbacks_stub.uint32_value + 7000) != 0)
+            || (test_ufsi(&synch_info[11], 1026765) != true)) {
+        return false;
+    }
     // Test when IE element not found
     memset(synch_info, 0, sizeof(synch_info));
     if (fhss_common_stub.fhss_struct.fhss_api->write_synch_info(api, synch_info, sizeof(synch_info), DEFAULT_FRAME_TYPE, DEFAULT_TX_TIME) != 0) {

From 0b8295356763033eedf1c130560617bd0c21f1a4 Mon Sep 17 00:00:00 2001
From: Juha Heiskanen <juha.heiskanen@arm.com>
Date: Fri, 11 Jun 2021 13:55:23 +0300
Subject: [PATCH 34/43] Traceroute bug fix.

Fixed broken traceroute functionality when Border router forward multihop destination by hop limit 1.
---
 CHANGELOG.md          | 1 +
 source/RPL/rpl_data.c | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8112af0b6a7..2a98efc8697 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 * Removed empty EAPOL-key message send after 4WH completion to nodes on relay
 * EAPOL parent candidate compare fix for better TX failure count
 * Fixed channel mask usage with OFDM configurations
+* Fixed recursive tunnel build problem when sending packets with hop count 1 from Border router to multi hop destination
 
 
 ## Release v13.0.0 (15-04-2021)
diff --git a/source/RPL/rpl_data.c b/source/RPL/rpl_data.c
index d9841aef967..f94057e5e68 100644
--- a/source/RPL/rpl_data.c
+++ b/source/RPL/rpl_data.c
@@ -351,8 +351,9 @@ static buffer_t *rpl_data_exthdr_provider_hbh_2(buffer_t *buf, rpl_instance_t *i
     //     size because of the LL addresses used on the outer header, so
     //     this is an unconditional change. Exception remains for local
     //     DODAGs, where the destination address must be the DODAGID.
-    if (addr_ipv6_equal(route_info->next_hop_addr, buf->dst_sa.address)  || (!rpl_policy_force_tunnel() &&
-                                                                             addr_ipv6_equal(buf->dst_sa.address, dodag->id))) {
+    const uint8_t *ip_dest = buf->route->ip_dest ? buf->route->ip_dest : buf->dst_sa.address;
+    if (addr_ipv6_equal(route_info->next_hop_addr, ip_dest)  || (!rpl_policy_force_tunnel() &&
+                                                                 addr_ipv6_equal(ip_dest, dodag->id))) {
         destination_in_instance = true;
 
         if (buf->rpl_option) {
@@ -997,7 +998,7 @@ static buffer_t *rpl_data_exthdr_provider_srh(buffer_t *buf, ipv6_exthdr_stage_t
      * (RFC 6554 4.1). When not tunnelling, we include all hops regardless,
      * which means the final destination is there as needed.
      */
-    srh_info = rpl_data_sr_compute_header_size(final_rpl_dest, buf->options.tunnelled && buf->options.type == IPV6_NH_IPV6 ? buf->options.hop_limit : 0xFF);
+    srh_info = rpl_data_sr_compute_header_size(final_rpl_dest, buf->options.tunnelled ? buf->options.hop_limit : 0xFF);
     if (!srh_info) {
         /* No source routing header required - this must be because it's one hop. */
         /* In this case, we do need to add a HbH option header */
@@ -1033,6 +1034,7 @@ static buffer_t *rpl_data_exthdr_provider_srh(buffer_t *buf, ipv6_exthdr_stage_t
             if (final_rpl_dest != buf->dst_sa.address) {
                 memcpy(buf->dst_sa.address, final_rpl_dest, 16);
             }
+            buf->route->ip_dest = rpl_data_sr_next_hop();
             *result = IPV6_EXTHDR_MODIFY_TUNNEL;
             buf->src_sa.addr_type = ADDR_NONE; // force auto-selection
             return buf;

From d925145d339be4438d5ab1eff530fb025fcc1d6f Mon Sep 17 00:00:00 2001
From: Mika Tervonen <mika.tervonen@arm.com>
Date: Mon, 14 Jun 2021 12:15:20 +0300
Subject: [PATCH 35/43] Add RTT calculation for DHCP Time calculation

Calculate the RTT of DHCP requests and report in address callback

When receiving DHCP Time vendor data use RTT value to estimate the error
Take RTT into account when setting the time
---
 nanostack/dhcp_service_api.h                        | 10 ++++++++++
 source/6LoWPAN/ws/ws_bootstrap.c                    |  9 ++++++++-
 source/DHCPv6_client/dhcpv6_client_api.h            |  1 +
 source/DHCPv6_client/dhcpv6_client_service.c        |  9 +++++++--
 source/libDHCPv6/dhcp_service_api.c                 | 13 +++++++++++++
 .../nanostack/unittest/stub/dhcp_service_api_stub.c |  4 ++++
 6 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/nanostack/dhcp_service_api.h b/nanostack/dhcp_service_api.h
index e3485bf99e3..0a576c1d6c2 100644
--- a/nanostack/dhcp_service_api.h
+++ b/nanostack/dhcp_service_api.h
@@ -226,6 +226,16 @@ void dhcp_service_set_retry_timers(uint32_t msg_tr_id, uint16_t timeout_init, ui
  */
 void dhcp_service_update_server_address(uint32_t msg_tr_id, uint8_t *server_address);
 
+/**
+ * \brief Get Round Trip time of the request
+ *
+ * get the elapsed time of the request from last message sent to server.
+ *
+ * \param msg_tr_id The message transaction ID.
+ *
+ */
+uint32_t dhcp_service_rtt_get(uint32_t msg_tr_id);
+
 /**
  * \brief Stops transactions for a message (retransmissions).
  *
diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
index c66f53f2c32..b3f97518c34 100644
--- a/source/6LoWPAN/ws/ws_bootstrap.c
+++ b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -1010,11 +1010,18 @@ static void ws_bootstrap_dhcp_info_notify_cb(int8_t interface, dhcp_option_notif
                     int32_t era;
                     uint32_t offset;
                     if (net_vendor_option_current_time_read(options->option.vendor_spesific.data, options->option.vendor_spesific.data_length, &era, &offset, NULL)) {
-                        uint32_t estimated_error = 10;
                         uint64_t current_time;
                         uint64_t network_time = (era * (uint64_t)(4294967296)) + offset - 2208988800; //Convert to First day of Unix (1 Jan 1970)
+
+                        tr_debug("Network Time option Era:%"PRId32" Offset:%"PRIu32" rtt: %"PRId32" time: %"PRIu64,  era, offset, server_info->rtt, network_time);
                         if (0 == ns_time_system_time_read(&current_time)) {
                             uint64_t difference;
+                            // We only adjust clock if time has drifted more than 10 seconds to avoid constant changing of time
+                            // If Round trip time is very high the accuracy is reduced.
+                            uint32_t estimated_error = 10 + server_info->rtt / 10;
+                            // Take into account the round trip time it took the response to arrive from the time server Write the time.
+                            network_time += server_info->rtt / 20;
+
                             if (current_time > network_time) {
                                 difference = current_time - network_time;
                             } else {
diff --git a/source/DHCPv6_client/dhcpv6_client_api.h b/source/DHCPv6_client/dhcpv6_client_api.h
index f9cadbca64f..26e87d530eb 100644
--- a/source/DHCPv6_client/dhcpv6_client_api.h
+++ b/source/DHCPv6_client/dhcpv6_client_api.h
@@ -84,6 +84,7 @@ typedef struct dhcp_server_notify_info {
     uint16_t duid_type;
     uint16_t duid_length;
     uint32_t life_time;
+    uint32_t rtt; // Round trip time with 100ms tics.
     uint8_t *duid;
 } dhcp_server_notify_info_t;
 
diff --git a/source/DHCPv6_client/dhcpv6_client_service.c b/source/DHCPv6_client/dhcpv6_client_service.c
index 4b894a5cb90..15b2dbe4cc9 100644
--- a/source/DHCPv6_client/dhcpv6_client_service.c
+++ b/source/DHCPv6_client/dhcpv6_client_service.c
@@ -241,7 +241,7 @@ void dhcpv6_client_send_error_cb(dhcpv6_client_server_data_t *srv_data_ptr)
 }
 
 
-static void dhcp_vendor_information_notify(uint8_t *ptr, uint16_t data_len, dhcp_client_class_t *dhcp_client, dhcpv6_client_server_data_t *srv_data_ptr)
+static void dhcp_vendor_information_notify(uint8_t *ptr, uint16_t data_len, dhcp_client_class_t *dhcp_client, dhcpv6_client_server_data_t *srv_data_ptr, uint32_t message_rtt)
 {
     if (!dhcp_client->option_information_cb) {
         return;
@@ -261,6 +261,8 @@ static void dhcp_vendor_information_notify(uint8_t *ptr, uint16_t data_len, dhcp
     server_info.duid = srv_data_ptr->serverDUID.duid + 2; // Skip the type
     server_info.duid_type = srv_data_ptr->serverDUID.type;
     server_info.duid_length = srv_data_ptr->serverDUID.duid_length - 2;// remove the type
+    server_info.rtt = message_rtt;
+
 
     while (data_len >= 4) {
         type = common_read_16_bit(ptr);
@@ -309,6 +311,7 @@ int dhcp_solicit_resp_cb(uint16_t instance_id, void *ptr, uint8_t msg_name,  uin
     dhcp_duid_options_params_t clientId;
     dhcp_duid_options_params_t serverId;
     dhcpv6_client_server_data_t *srv_data_ptr = NULL;
+    uint32_t message_rtt;
     (void)instance_id;
 
     //Validate that started TR ID class is still at list
@@ -327,6 +330,8 @@ int dhcp_solicit_resp_cb(uint16_t instance_id, void *ptr, uint8_t msg_name,  uin
     }
 
 
+    message_rtt = dhcp_service_rtt_get(srv_data_ptr->transActionId);
+
     //Clear Active Transaction state
     srv_data_ptr->transActionId = 0;
 
@@ -399,7 +404,7 @@ int dhcp_solicit_resp_cb(uint16_t instance_id, void *ptr, uint8_t msg_name,  uin
     }
 
     //Optional Options notify from Reply
-    dhcp_vendor_information_notify(msg_ptr, msg_len, dhcp_client, srv_data_ptr);
+    dhcp_vendor_information_notify(msg_ptr, msg_len, dhcp_client, srv_data_ptr, message_rtt);
 
     return RET_MSG_ACCEPTED;
 error_exit:
diff --git a/source/libDHCPv6/dhcp_service_api.c b/source/libDHCPv6/dhcp_service_api.c
index 44822e46771..db8dd42ba2f 100644
--- a/source/libDHCPv6/dhcp_service_api.c
+++ b/source/libDHCPv6/dhcp_service_api.c
@@ -75,6 +75,7 @@ typedef struct {
     void  *client_obj_ptr;
     uint32_t msg_tr_id;
     uint32_t message_tr_id;
+    uint32_t transmit_time;
     uint32_t first_transmit_time;
     uint16_t delayed_tx;
     uint16_t timeout;
@@ -795,6 +796,7 @@ uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr,
     msg_tr_ptr->recv_resp_cb = receive_resp_cb;
     msg_tr_ptr->delayed_tx = delay_tx;
     msg_tr_ptr->first_transmit_time = 0;
+    msg_tr_ptr->transmit_time = 0;
     dhcp_tr_set_retry_timers(msg_tr_ptr, msg_tr_ptr->msg_ptr[0]);
     common_write_24_bit(msg_tr_ptr->msg_tr_id, &msg_tr_ptr->msg_ptr[1]);
 
@@ -826,6 +828,16 @@ void dhcp_service_update_server_address(uint32_t msg_tr_id, uint8_t *server_addr
     }
 }
 
+uint32_t dhcp_service_rtt_get(uint32_t msg_tr_id)
+{
+    msg_tr_t *msg_tr_ptr = dhcp_tr_find(msg_tr_id);
+
+    if (msg_tr_ptr && msg_tr_ptr->transmit_time) {
+        return protocol_core_monotonic_time - msg_tr_ptr->transmit_time;
+    }
+    return 0;
+}
+
 void dhcp_service_req_remove(uint32_t msg_tr_id)
 {
     if (dhcp_service) {
@@ -927,6 +939,7 @@ void dhcp_service_send_message(msg_tr_t *msg_tr_ptr)
             int16_t tc = 0;
             socket_setsockopt(msg_tr_ptr->socket, SOCKET_IPPROTO_IPV6, SOCKET_IPV6_TCLASS, &tc, sizeof(tc));
             retval = socket_sendto(msg_tr_ptr->socket, &msg_tr_ptr->addr, msg_tr_ptr->msg_ptr, msg_tr_ptr->msg_len);
+            msg_tr_ptr->transmit_time = protocol_core_monotonic_time ? protocol_core_monotonic_time : 1;
             if (msg_tr_ptr->first_transmit_time == 0 && retval == 0) {
                 //Mark first pushed message timestamp
                 msg_tr_ptr->first_transmit_time = protocol_core_monotonic_time ? protocol_core_monotonic_time : 1;
diff --git a/test/nanostack/unittest/stub/dhcp_service_api_stub.c b/test/nanostack/unittest/stub/dhcp_service_api_stub.c
index d6d818ce258..c60fff5945b 100644
--- a/test/nanostack/unittest/stub/dhcp_service_api_stub.c
+++ b/test/nanostack/unittest/stub/dhcp_service_api_stub.c
@@ -155,6 +155,10 @@ uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr,
 void dhcp_service_set_retry_timers(uint32_t msg_tr_id, uint16_t timeout_init, uint16_t timeout_max, uint8_t retrans_max)
 {
 }
+uint32_t dhcp_service_rtt_get(uint32_t msg_tr_id)
+{
+    return 0;
+}
 
 void dhcp_service_req_remove(uint32_t msg_tr_id)
 {

From 667b191223b7a63c41a2ded7bf07e28382a407e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=20Lepp=C3=A4nen?= <mika.leppanen@arm.com>
Date: Tue, 1 Jun 2021 15:52:05 +0300
Subject: [PATCH 36/43] Changed initial EAPOL-key retries from trickle to
 exponential backup

Changed initial EAPOL-key trickle to exponential backup and adjusted the timings
according to testing.
---
 source/6LoWPAN/ws/ws_cfg_settings.c           |  52 ++--
 source/6LoWPAN/ws/ws_cfg_settings.h           |   8 +-
 source/6LoWPAN/ws/ws_config.h                 |  67 +++--
 source/6LoWPAN/ws/ws_pae_controller.c         |   8 +-
 source/6LoWPAN/ws/ws_pae_supp.c               | 239 ++++++++----------
 source/Security/protocols/sec_prot_cfg.h      |   5 +-
 .../ws_cfg_settings/test_ws_cfg_settings.c    |  34 +--
 7 files changed, 205 insertions(+), 208 deletions(-)

diff --git a/source/6LoWPAN/ws/ws_cfg_settings.c b/source/6LoWPAN/ws/ws_cfg_settings.c
index 5da0292b1d9..74ae9dd51d1 100644
--- a/source/6LoWPAN/ws/ws_cfg_settings.c
+++ b/source/6LoWPAN/ws/ws_cfg_settings.c
@@ -467,10 +467,10 @@ static void ws_cfg_network_size_config_set_small(ws_cfg_nw_size_t *cfg)
     cfg->sec_prot.sec_prot_trickle_timer_exp = SEC_PROT_TIMER_EXPIRATIONS;
     cfg->sec_prot.sec_prot_retry_timeout = SEC_PROT_RETRY_TIMEOUT_SMALL;
 
-    cfg->sec_prot.initial_key_retry_delay = DEFAULT_INITIAL_KEY_RETRY_TIMER;
-    cfg->sec_prot.initial_key_imin = SMALL_NW_INITIAL_KEY_TRICKLE_IMIN_SECS;
-    cfg->sec_prot.initial_key_imax = SMALL_NW_INITIAL_KEY_TRICKLE_IMAX_SECS;
-    cfg->sec_prot.initial_key_retry_cnt = DEFAULT_INITIAL_KEY_RETRY_COUNT;
+    cfg->sec_prot.initial_key_retry_min = SMALL_NW_INITIAL_KEY_RETRY_MIN_SECS;
+    cfg->sec_prot.initial_key_retry_max = SMALL_NW_INITIAL_KEY_RETRY_MAX_SECS;
+    cfg->sec_prot.initial_key_retry_max_limit = SMALL_NW_INITIAL_KEY_RETRY_MAX_LIMIT_SECS;
+    cfg->sec_prot.initial_key_retry_cnt = SMALL_NW_INITIAL_KEY_RETRY_COUNT;
 
     // Multicast timing configuration
     cfg->mpl.mpl_trickle_imin = MPL_SMALL_IMIN;
@@ -510,10 +510,10 @@ static void ws_cfg_network_size_config_set_medium(ws_cfg_nw_size_t *cfg)
     cfg->sec_prot.sec_prot_trickle_timer_exp = SEC_PROT_TIMER_EXPIRATIONS;
     cfg->sec_prot.sec_prot_retry_timeout = SEC_PROT_RETRY_TIMEOUT_SMALL;
 
-    cfg->sec_prot.initial_key_retry_delay = DEFAULT_INITIAL_KEY_RETRY_TIMER;
-    cfg->sec_prot.initial_key_imin = MEDIUM_NW_INITIAL_KEY_TRICKLE_IMIN_SECS;
-    cfg->sec_prot.initial_key_imax = MEDIUM_NW_INITIAL_KEY_TRICKLE_IMAX_SECS;
-    cfg->sec_prot.initial_key_retry_cnt = DEFAULT_INITIAL_KEY_RETRY_COUNT;
+    cfg->sec_prot.initial_key_retry_min = MEDIUM_NW_INITIAL_KEY_RETRY_MIN_SECS;
+    cfg->sec_prot.initial_key_retry_max = MEDIUM_NW_INITIAL_KEY_RETRY_MAX_SECS;
+    cfg->sec_prot.initial_key_retry_max_limit = MEDIUM_NW_INITIAL_KEY_RETRY_MAX_LIMIT_SECS;
+    cfg->sec_prot.initial_key_retry_cnt = MEDIUM_NW_INITIAL_KEY_RETRY_COUNT;
 
     // Multicast timing configuration
     cfg->mpl.mpl_trickle_imin = MPL_MEDIUM_IMIN;
@@ -552,9 +552,9 @@ static void ws_cfg_network_size_config_set_large(ws_cfg_nw_size_t *cfg)
     cfg->sec_prot.sec_prot_trickle_timer_exp = SEC_PROT_TIMER_EXPIRATIONS;
     cfg->sec_prot.sec_prot_retry_timeout = SEC_PROT_RETRY_TIMEOUT_LARGE;
 
-    cfg->sec_prot.initial_key_retry_delay = NONE_INITIAL_KEY_RETRY_TIMER;
-    cfg->sec_prot.initial_key_imin = LARGE_NW_INITIAL_KEY_TRICKLE_IMIN_SECS;
-    cfg->sec_prot.initial_key_imax = LARGE_NW_INITIAL_KEY_TRICKLE_IMAX_SECS;
+    cfg->sec_prot.initial_key_retry_min = LARGE_NW_INITIAL_KEY_RETRY_MIN_SECS;
+    cfg->sec_prot.initial_key_retry_max = LARGE_NW_INITIAL_KEY_RETRY_MAX_SECS;
+    cfg->sec_prot.initial_key_retry_max_limit = LARGE_NW_INITIAL_KEY_RETRY_MAX_LIMIT_SECS;
     cfg->sec_prot.initial_key_retry_cnt = LARGE_NW_INITIAL_KEY_RETRY_COUNT;
 
     // Multicast timing configuration
@@ -595,9 +595,9 @@ static void ws_cfg_network_size_config_set_xlarge(ws_cfg_nw_size_t *cfg)
     cfg->sec_prot.sec_prot_trickle_timer_exp = SEC_PROT_TIMER_EXPIRATIONS;
     cfg->sec_prot.sec_prot_retry_timeout = SEC_PROT_RETRY_TIMEOUT_LARGE;
 
-    cfg->sec_prot.initial_key_retry_delay = NONE_INITIAL_KEY_RETRY_TIMER;
-    cfg->sec_prot.initial_key_imin = EXTRA_LARGE_NW_INITIAL_KEY_TRICKLE_IMIN_SECS;
-    cfg->sec_prot.initial_key_imax = EXTRA_LARGE_NW_INITIAL_KEY_TRICKLE_IMAX_SECS;
+    cfg->sec_prot.initial_key_retry_min = EXTRA_LARGE_NW_INITIAL_KEY_RETRY_MIN_SECS;
+    cfg->sec_prot.initial_key_retry_max = EXTRA_LARGE_NW_INITIAL_KEY_RETRY_MAX_SECS;
+    cfg->sec_prot.initial_key_retry_max_limit = EXTRA_LARGE_NW_INITIAL_KEY_RETRY_MAX_LIMIT_SECS;
     cfg->sec_prot.initial_key_retry_cnt = EXTRA_LARGE_NW_INITIAL_KEY_RETRY_COUNT;
 
     // Multicast timing configuration
@@ -637,10 +637,10 @@ static void ws_cfg_network_size_config_set_certificate(ws_cfg_nw_size_t *cfg)
     cfg->sec_prot.sec_prot_trickle_timer_exp = SEC_PROT_TIMER_EXPIRATIONS;
     cfg->sec_prot.sec_prot_retry_timeout = SEC_PROT_RETRY_TIMEOUT_SMALL;
 
-    cfg->sec_prot.initial_key_retry_delay = DEFAULT_INITIAL_KEY_RETRY_TIMER;
-    cfg->sec_prot.initial_key_imin = SMALL_NW_INITIAL_KEY_TRICKLE_IMIN_SECS;
-    cfg->sec_prot.initial_key_imax = SMALL_NW_INITIAL_KEY_TRICKLE_IMAX_SECS;
-    cfg->sec_prot.initial_key_retry_cnt = DEFAULT_INITIAL_KEY_RETRY_COUNT;
+    cfg->sec_prot.initial_key_retry_min = SMALL_NW_INITIAL_KEY_RETRY_MIN_SECS;
+    cfg->sec_prot.initial_key_retry_max = SMALL_NW_INITIAL_KEY_RETRY_MAX_SECS;
+    cfg->sec_prot.initial_key_retry_max_limit = SMALL_NW_INITIAL_KEY_RETRY_MAX_LIMIT_SECS;
+    cfg->sec_prot.initial_key_retry_cnt = SMALL_NW_INITIAL_KEY_RETRY_COUNT;
 
     // Multicast timing configuration for certification uses the LARGE values as it is the one mentioned ins specification
     cfg->mpl.mpl_trickle_imin = MPL_XLARGE_IMIN;
@@ -1241,10 +1241,10 @@ static int8_t ws_cfg_sec_prot_default_set(ws_sec_prot_cfg_t *cfg)
     cfg->sec_prot_retry_timeout = SEC_PROT_RETRY_TIMEOUT_SMALL;
     cfg->max_simult_sec_neg_tx_queue_min = MAX_SIMULTANEOUS_SECURITY_NEGOTIATIONS_TX_QUEUE_MIN;
     cfg->max_simult_sec_neg_tx_queue_max = MAX_SIMULTANEOUS_SECURITY_NEGOTIATIONS_TX_QUEUE_MAX;
-    cfg->initial_key_retry_delay = DEFAULT_INITIAL_KEY_RETRY_TIMER;
-    cfg->initial_key_imin = MEDIUM_NW_INITIAL_KEY_TRICKLE_IMIN_SECS;
-    cfg->initial_key_imax = MEDIUM_NW_INITIAL_KEY_TRICKLE_IMAX_SECS;
-    cfg->initial_key_retry_cnt = DEFAULT_INITIAL_KEY_RETRY_COUNT;
+    cfg->initial_key_retry_min = MEDIUM_NW_INITIAL_KEY_RETRY_MIN_SECS;
+    cfg->initial_key_retry_max = MEDIUM_NW_INITIAL_KEY_RETRY_MAX_SECS;
+    cfg->initial_key_retry_max_limit = MEDIUM_NW_INITIAL_KEY_RETRY_MAX_LIMIT_SECS;
+    cfg->initial_key_retry_cnt = MEDIUM_NW_INITIAL_KEY_RETRY_COUNT;
 
     return CFG_SETTINGS_OK;
 }
@@ -1268,10 +1268,10 @@ int8_t ws_cfg_sec_prot_validate(ws_sec_prot_cfg_t *cfg, ws_sec_prot_cfg_t *new_c
             cfg->sec_prot_retry_timeout != new_cfg->sec_prot_retry_timeout ||
             cfg->max_simult_sec_neg_tx_queue_min != new_cfg->max_simult_sec_neg_tx_queue_min ||
             cfg->max_simult_sec_neg_tx_queue_max != new_cfg->max_simult_sec_neg_tx_queue_max ||
-            cfg->initial_key_retry_delay != new_cfg->initial_key_retry_delay ||
-            cfg->initial_key_imin != new_cfg->initial_key_retry_delay ||
-            cfg->initial_key_imax != new_cfg->initial_key_retry_delay ||
-            cfg->initial_key_retry_cnt != new_cfg->initial_key_retry_delay) {
+            cfg->initial_key_retry_min != new_cfg->initial_key_retry_min ||
+            cfg->initial_key_retry_max != new_cfg->initial_key_retry_max ||
+            cfg->initial_key_retry_max_limit != new_cfg->initial_key_retry_max_limit ||
+            cfg->initial_key_retry_cnt != new_cfg->initial_key_retry_cnt) {
 
         return CFG_SETTINGS_CHANGED;
     }
diff --git a/source/6LoWPAN/ws/ws_cfg_settings.h b/source/6LoWPAN/ws/ws_cfg_settings.h
index 6fcfeec2b5c..827b45aeff6 100644
--- a/source/6LoWPAN/ws/ws_cfg_settings.h
+++ b/source/6LoWPAN/ws/ws_cfg_settings.h
@@ -117,10 +117,10 @@ typedef struct ws_sec_prot_cfg_s {
     uint8_t sec_prot_trickle_timer_exp;       /**< Security protocol trickle timer expirations; default 2 */
     uint16_t max_simult_sec_neg_tx_queue_min; /**< PAE authenticator max simultaneous security negotiations TX queue minimum */
     uint16_t max_simult_sec_neg_tx_queue_max; /**< PAE authenticator max simultaneous security negotiations TX queue maximum */
-    uint16_t initial_key_retry_delay;         /**< Delay before starting initial key trickle; seconds; default 120 */
-    uint16_t initial_key_imin;                /**< Initial key trickle Imin; seconds; default 360 */
-    uint16_t initial_key_imax;                /**< Initial key trickle Imax; seconds; default 720 */
-    uint8_t initial_key_retry_cnt;            /**< Number of initial key retries; default 2 */
+    uint16_t initial_key_retry_min;           /**< Initial EAPOL-Key retry exponential backoff min; seconds; default 180 */
+    uint16_t initial_key_retry_max;           /**< Initial EAPOL-Key retry exponential backoff max; seconds; default 420 */
+    uint16_t initial_key_retry_max_limit;     /**< Initial EAPOL-Key retry exponential backoff max limit; seconds; default 720 */
+    uint8_t initial_key_retry_cnt;            /**< Number of initial key retries; default 4 */
 } ws_sec_prot_cfg_t;
 
 /**
diff --git a/source/6LoWPAN/ws/ws_config.h b/source/6LoWPAN/ws/ws_config.h
index c65ab94570b..71044f21007 100644
--- a/source/6LoWPAN/ws/ws_config.h
+++ b/source/6LoWPAN/ws/ws_config.h
@@ -274,32 +274,51 @@ extern uint8_t DEVICE_MIN_SENS;
 
 /*
  *  Security protocol initial EAPOL-key parameters
+ *
+ * Retry time is randomized between minimum and maximum retry time: rand(min,max).
+ * For each subsequent retry the maximum retry time is doubled until the maximum
+ * limit is reached.
  */
 
-// How long the wait is before the first initial EAPOL-key retry
-#define DEFAULT_INITIAL_KEY_RETRY_TIMER                120
-#define NONE_INITIAL_KEY_RETRY_TIMER                   0
-
-// Small network Default trickle values for sending of initial EAPOL-key
-#define SMALL_NW_INITIAL_KEY_TRICKLE_IMIN_SECS         360   /* 6 to 8.3 minutes */
-#define SMALL_NW_INITIAL_KEY_TRICKLE_IMAX_SECS         500
-
-// Small network Default trickle values for sending of initial EAPOL-key
-#define MEDIUM_NW_INITIAL_KEY_TRICKLE_IMIN_SECS        360   /* 6 to 12 minutes */
-#define MEDIUM_NW_INITIAL_KEY_TRICKLE_IMAX_SECS        720
-
-// Large network trickle values for sending of initial EAPOL-key
-#define LARGE_NW_INITIAL_KEY_TRICKLE_IMIN_SECS         600   /* 10 to 20 minutes */
-#define LARGE_NW_INITIAL_KEY_TRICKLE_IMAX_SECS         1200
-#define LARGE_NW_INITIAL_KEY_RETRY_COUNT               3
-
-// Very slow network values for sending of initial EAPOL-key
-#define EXTRA_LARGE_NW_INITIAL_KEY_TRICKLE_IMIN_SECS   600   /* 10 to 20 minutes */
-#define EXTRA_LARGE_NW_INITIAL_KEY_TRICKLE_IMAX_SECS   1200
-#define EXTRA_LARGE_NW_INITIAL_KEY_RETRY_COUNT         4
-
-// How many times sending of initial EAPOL-key is retried
-#define DEFAULT_INITIAL_KEY_RETRY_COUNT                2
+/* Small network initial EAPOL-key retry exponential backoff parameters
+ *     1st backoff 3 to 7 minutes, max 7 minutes, retries 2
+ *     Minimum time for sequence is 3 + 3 = 6 minutes
+ *     Maximum time for sequence is 7 + 7 = 14 minutes
+ */
+#define SMALL_NW_INITIAL_KEY_RETRY_MIN_SECS               180     // 3
+#define SMALL_NW_INITIAL_KEY_RETRY_MAX_SECS               420     // 7
+#define SMALL_NW_INITIAL_KEY_RETRY_MAX_LIMIT_SECS         420     // 7
+#define SMALL_NW_INITIAL_KEY_RETRY_COUNT                  2
+
+/* Medium network initial EAPOL-key retry exponential backoff parameters
+ *     1st backoff 3 to 7 minutes, max 12 minutes, retries 4
+ *     Minimum time for sequence is 3 + 3 + 3 + 3 = 12 minutes
+ *     Maximum time for sequence is 7 + 12 + 12 + 12 = 43 minutes
+ */
+#define MEDIUM_NW_INITIAL_KEY_RETRY_MIN_SECS              180     // 3
+#define MEDIUM_NW_INITIAL_KEY_RETRY_MAX_SECS              420     // 7
+#define MEDIUM_NW_INITIAL_KEY_RETRY_MAX_LIMIT_SECS        720     // 12
+#define MEDIUM_NW_INITIAL_KEY_RETRY_COUNT                 4
+
+/* Large network initial EAPOL-key retry exponential backoff parameters
+ *     1st backoff 5 to 10 minutes, max 15 minutes, retries 4
+ *     Minimum time for sequence is 5 + 5 + 5 + 5 = 20 minutes
+ *     Maximum time for sequence is 10 + 15 + 15 + 15 = 55 minutes
+ */
+#define LARGE_NW_INITIAL_KEY_RETRY_MIN_SECS               300     // 5
+#define LARGE_NW_INITIAL_KEY_RETRY_MAX_SECS               600     // 10
+#define LARGE_NW_INITIAL_KEY_RETRY_MAX_LIMIT_SECS         900     // 15
+#define LARGE_NW_INITIAL_KEY_RETRY_COUNT                  4
+
+/* Extra large network initial EAPOL-key retry exponential backoff parameters
+ *     1st backoff 5 to 10 minutes, max 20 minutes, retries 4
+ *     Minimum time for sequence is 5 + 5 + 5 + 5 = 20 minutes
+ *     Maximum time for sequence is 10 + 20 + 20 + 20 = 70 minutes
+ */
+#define EXTRA_LARGE_NW_INITIAL_KEY_RETRY_MIN_SECS         300     // 5
+#define EXTRA_LARGE_NW_INITIAL_KEY_RETRY_MAX_SECS         600     // 10
+#define EXTRA_LARGE_NW_INITIAL_KEY_RETRY_MAX_LIMIT_SECS   1200    // 20
+#define EXTRA_LARGE_NW_INITIAL_KEY_RETRY_COUNT            4
 
 /*
  *  RADIUS client retry timer defaults
diff --git a/source/6LoWPAN/ws/ws_pae_controller.c b/source/6LoWPAN/ws/ws_pae_controller.c
index 3d1a6f81f4e..f57934fcade 100644
--- a/source/6LoWPAN/ws/ws_pae_controller.c
+++ b/source/6LoWPAN/ws/ws_pae_controller.c
@@ -721,11 +721,9 @@ int8_t ws_pae_controller_configure(protocol_interface_info_entry_t *interface_pt
         controller->sec_cfg.prot_cfg.sec_prot_trickle_params.k = 0;
         controller->sec_cfg.prot_cfg.sec_prot_trickle_params.TimerExpirations = sec_prot_cfg->sec_prot_trickle_timer_exp;
         controller->sec_cfg.prot_cfg.sec_prot_retry_timeout = sec_prot_cfg->sec_prot_retry_timeout * 10;
-        controller->sec_cfg.prot_cfg.initial_key_retry_delay = sec_prot_cfg->initial_key_retry_delay;
-        controller->sec_cfg.prot_cfg.initial_key_trickle_params.Imin = sec_prot_cfg->initial_key_imin;
-        controller->sec_cfg.prot_cfg.initial_key_trickle_params.Imax = sec_prot_cfg->initial_key_imax;
-        controller->sec_cfg.prot_cfg.initial_key_trickle_params.k = 0;
-        controller->sec_cfg.prot_cfg.initial_key_trickle_params.TimerExpirations = 2;
+        controller->sec_cfg.prot_cfg.initial_key_retry_min = sec_prot_cfg->initial_key_retry_min;
+        controller->sec_cfg.prot_cfg.initial_key_retry_max = sec_prot_cfg->initial_key_retry_max;
+        controller->sec_cfg.prot_cfg.initial_key_retry_max_limit = sec_prot_cfg->initial_key_retry_max_limit;
         controller->sec_cfg.prot_cfg.initial_key_retry_cnt = sec_prot_cfg->initial_key_retry_cnt;
     }
 
diff --git a/source/6LoWPAN/ws/ws_pae_supp.c b/source/6LoWPAN/ws/ws_pae_supp.c
index ea72ed6ddd4..f3753a54920 100644
--- a/source/6LoWPAN/ws/ws_pae_supp.c
+++ b/source/6LoWPAN/ws/ws_pae_supp.c
@@ -78,8 +78,8 @@
 #define STORED_KEYS_MAXIMUM_USE_COUNT          1
 
 // Delay for sending the initial EAPOL-Key
-#define INITIAL_KEY_TIMER_MIN                  3
-#define INITIAL_KEY_TIMER_MAX                  30
+#define INITIAL_KEY_TIMER_MIN                  1
+#define INITIAL_KEY_TIMER_MAX                  3
 
 typedef struct {
     ns_list_link_t link;                                   /**< Link */
@@ -94,16 +94,17 @@ typedef struct {
     supp_entry_t entry;                                    /**< Supplicant data */
     kmp_addr_t target_addr;                                /**< EAPOL target (parent) address */
     uint16_t initial_key_timer;                            /**< Timer to trigger initial EAPOL-Key */
-    uint16_t initial_key_retry_timer;                      /**< Timer to trigger initial EAPOL-Key 1st retry */
-    trickle_t auth_trickle_timer;                          /**< Trickle timer for re-sending initial EAPOL-key or for GTK mismatch */
-    trickle_params_t auth_trickle_params;                  /**< Trickle parameters for initial EAPOL-key or for GTK mismatch */
+    trickle_t gtk_req_trickle_timer;                       /**< Trickle timer for re-sending initial EAPOL-key on GTK mismatch */
+    trickle_params_t gtk_req_trickle_params;               /**< Trickle parameters for initial EAPOL-key on GTK mismatch */
     uint8_t new_br_eui_64[8];                              /**< Border router EUI-64 indicated by bootstrap after bootstrap start */
     uint8_t comp_br_eui_64[8];                             /**< Border router EUI-64 indicated by bootstrap after bootstrap completed */
     sec_prot_keys_nw_info_t *sec_keys_nw_info;             /**< Security keys network information */
     sec_cfg_t *sec_cfg;                                    /**< Security configuration */
     uint8_t nw_keys_used_cnt;                              /**< How many times bootstrap has been tried with current keys */
+    uint16_t initial_key_retry_max_value;                  /**< Initial EAPOL-Key retry exponential backoff max value */
+    uint16_t initial_key_retry_timer;                      /**< Initial EAPOL-Key retry exponential backoff timer */
     uint8_t initial_key_retry_cnt;                         /**< initial EAPOL-Key retry counter */
-    bool auth_trickle_running : 1;                         /**< Initial EAPOL-Key Trickle timer running */
+    bool gtk_update_trickle_running : 1;                   /**< GTK update Initial EAPOL-Key Trickle timer running */
     bool auth_requested : 1;                               /**< Authentication has been requested by the bootstrap */
     bool timer_running : 1;                                /**< Timer is running */
     bool new_br_eui_64_set : 1;                            /**< Border router address has been set after bootstrap start */
@@ -117,9 +118,9 @@ typedef struct {
 #define KEY_UPDATE_RETRY_COUNT             3
 #define LIFETIME_MISMATCH_RETRY_COUNT      1   /* No retries */
 
-// Trickle timer on how long to wait response after last retry before failing authentication
-#define LAST_INTERVAL_TRICKLE_IMIN_SECS    240   /* 4 minutes */
-#define LAST_INTERVAL_TRICKLE_IMAX_SECS    240
+// Timer on how long to wait response after last retry before failing authentication
+#define LAST_INTERVAL_MIN_SECS             120  /* 2 minutes */
+#define LAST_INTERVAL_MAX_SECS             240  /* 4 minutes */
 
 static void ws_pae_supp_free(pae_supp_t *pae_supp);
 static void ws_pae_supp_authenticate_response(pae_supp_t *pae_supp, auth_result_e result);
@@ -131,8 +132,6 @@ static int8_t ws_pae_supp_nvm_keys_write(pae_supp_t *pae_supp);
 static pae_supp_t *ws_pae_supp_get(protocol_interface_info_entry_t *interface_ptr);
 static int8_t ws_pae_supp_event_send(kmp_service_t *service, void *data);
 static void ws_pae_supp_tasklet_handler(arm_event_s *event);
-static void ws_pae_supp_initial_trickle_timer_start(pae_supp_t *pae_supp);
-static void ws_pae_supp_initial_last_interval_trickle_timer_start(pae_supp_t *pae_supp);
 static void ws_pae_supp_initial_key_update_trickle_timer_start(pae_supp_t *pae_supp, uint8_t timer_expirations);
 static bool ws_pae_supp_authentication_ongoing(pae_supp_t *pae_supp);
 static int8_t ws_pae_supp_timer_if_start(kmp_service_t *service, kmp_api_t *kmp);
@@ -220,7 +219,7 @@ int8_t ws_pae_supp_authenticate(protocol_interface_info_entry_t *interface_ptr,
 
     pae_supp->auth_requested = true;
 
-    // Randomizes the sending of initial EAPOL-Key messsage
+    // Randomizes the sending of initial EAPOL-Key message
     pae_supp->initial_key_timer = randLIB_get_random_in_range(INITIAL_KEY_TIMER_MIN, INITIAL_KEY_TIMER_MAX);
 
     // Starts supplicant timer
@@ -322,7 +321,7 @@ int8_t ws_pae_supp_gtk_hash_update(protocol_interface_info_entry_t *interface_pt
 
         /* Mismatch, initiate EAPOL (if authentication not already ongoing or if not on
            wait time for the authenticator to answer) */
-        if (!pae_supp->auth_trickle_running || pae_supp->initial_key_retry_cnt == 0) {
+        if (!pae_supp->gtk_update_trickle_running || pae_supp->initial_key_retry_cnt == 0) {
             uint8_t timer_expirations = KEY_UPDATE_RETRY_COUNT;
             // For GTK lifetime mismatch send only once
             if (mismatch == GTK_LIFETIME_MISMATCH) {
@@ -334,7 +333,7 @@ int8_t ws_pae_supp_gtk_hash_update(protocol_interface_info_entry_t *interface_pt
             // Starts supplicant timer
             ws_pae_supp_timer_start(pae_supp);
 
-            tr_info("GTK update start imin: %i, imax: %i, max mismatch: %i, tr time: %i", pae_supp->sec_cfg->timer_cfg.gtk_request_imin, pae_supp->sec_cfg->timer_cfg.gtk_request_imax, pae_supp->sec_cfg->timer_cfg.gtk_max_mismatch, pae_supp->auth_trickle_timer.t);
+            tr_info("GTK update start imin: %i, imax: %i, max mismatch: %i, tr time: %i", pae_supp->sec_cfg->timer_cfg.gtk_request_imin, pae_supp->sec_cfg->timer_cfg.gtk_request_imax, pae_supp->sec_cfg->timer_cfg.gtk_max_mismatch, pae_supp->gtk_req_trickle_timer.t);
         }
     }
 
@@ -426,7 +425,7 @@ static int8_t ws_pae_supp_nvm_keys_read(pae_supp_t *pae_supp)
 
 static void ws_pae_supp_authenticate_response(pae_supp_t *pae_supp, auth_result_e result)
 {
-    pae_supp->auth_trickle_running = false;
+    pae_supp->initial_key_retry_timer = 0;
     if (pae_supp->auth_requested && pae_supp->auth_completed) {
         pae_supp->auth_requested = false;
         pae_supp->auth_completed(pae_supp->interface_ptr, result, pae_supp->target_addr.eui_64);
@@ -576,18 +575,19 @@ int8_t ws_pae_supp_init(protocol_interface_info_entry_t *interface_ptr, const se
     pae_supp->nw_key_index_set = NULL;
     pae_supp->gtk_hash_ptr_get = NULL;
     pae_supp->initial_key_timer = 0;
-    pae_supp->initial_key_retry_timer = 0;
     pae_supp->nw_keys_used_cnt = 0;
-    pae_supp->initial_key_retry_cnt = DEFAULT_INITIAL_KEY_RETRY_COUNT;
+    pae_supp->initial_key_retry_cnt = MEDIUM_NW_INITIAL_KEY_RETRY_COUNT;
     pae_supp->sec_keys_nw_info = sec_keys_nw_info;
     pae_supp->sec_cfg = sec_cfg;
-    pae_supp->auth_trickle_running = false;
+    pae_supp->gtk_update_trickle_running = false;
     pae_supp->auth_requested = false;
     pae_supp->timer_running = false;
     pae_supp->new_br_eui_64_set = false;
     pae_supp->new_br_eui_64_fresh = false;
     pae_supp->comp_br_eui_64_set = false;
     pae_supp->entry_address_active = false;
+    pae_supp->initial_key_retry_max_value = 0;
+    pae_supp->initial_key_retry_timer = 0;
 
     ws_pae_lib_supp_init(&pae_supp->entry);
 
@@ -787,7 +787,7 @@ void ws_pae_supp_fast_timer(uint16_t ticks)
 static bool ws_pae_supp_authentication_ongoing(pae_supp_t *pae_supp)
 {
     /* When either bootstrap initial authentication or re-authentication is ongoing */
-    if (pae_supp->initial_key_timer || pae_supp->auth_trickle_running ||
+    if (pae_supp->initial_key_timer || pae_supp->initial_key_retry_timer || pae_supp->gtk_update_trickle_running ||
             ws_pae_lib_supp_timer_is_running(&pae_supp->entry)) {
         return true;
     }
@@ -799,67 +799,79 @@ void ws_pae_supp_slow_timer(uint16_t seconds)
 {
     ns_list_foreach(pae_supp_t, pae_supp, &pae_supp_list) {
 
-        // Checks whether initial EAPOL-Key message needs to be re-send or new GTK request to be sent
-        if (pae_supp->auth_trickle_running) {
-            if (pae_supp->initial_key_retry_timer > 0) {
-                if (pae_supp->initial_key_retry_timer > seconds) {
-                    pae_supp->initial_key_retry_timer -= seconds;
-                } else {
-                    pae_supp->initial_key_retry_timer = 0;
-                    tr_info("initial key retry timer expired");
+        bool key_expired = false;
+
+        if (pae_supp->initial_key_retry_timer > seconds) {
+            pae_supp->initial_key_retry_timer -= seconds;
+        } else if (pae_supp->initial_key_retry_timer != 0) {
+            pae_supp->initial_key_retry_timer = 0;
+            key_expired = true;
+        }
+
+        if (pae_supp->gtk_update_trickle_running) {
+            if (trickle_timer(&pae_supp->gtk_req_trickle_timer, &pae_supp->gtk_req_trickle_params, seconds)) {
+                key_expired = true;
+            }
+        }
+
+        if (key_expired) {
+            if (pae_supp->initial_key_retry_cnt > 0) {
+                // On initial EAPOL-key TX failure, check for other parents
+                if (pae_supp->auth_requested && pae_supp->tx_failure_on_initial_key) {
+                    // Returns same target if no other valid targets found
+                    const uint8_t *next_target = pae_supp->auth_next_target(pae_supp->interface_ptr, kmp_address_eui_64_get(&pae_supp->target_addr), &pae_supp->sec_keys_nw_info->key_pan_id);
+                    kmp_address_eui_64_set(&pae_supp->target_addr, next_target);
+                    ws_pae_supp_address_set(pae_supp, &pae_supp->target_addr);
                 }
-            } else {
-                // Checks if trickle timer expires
-                if (trickle_timer(&pae_supp->auth_trickle_timer, &pae_supp->auth_trickle_params, seconds)) {
-                    if (pae_supp->initial_key_retry_cnt > 0) {
-                        // On initial EAPOL-key TX failure, check for other parents
-                        if (pae_supp->auth_requested && pae_supp->tx_failure_on_initial_key) {
-                            // Returns same target if no other valid targets found
-                            const uint8_t *next_target = pae_supp->auth_next_target(pae_supp->interface_ptr, kmp_address_eui_64_get(&pae_supp->target_addr), &pae_supp->sec_keys_nw_info->key_pan_id);
-                            kmp_address_eui_64_set(&pae_supp->target_addr, next_target);
-                            ws_pae_supp_address_set(pae_supp, &pae_supp->target_addr);
-                        }
-                        pae_supp->tx_failure_on_initial_key = false;
-                        // Sends initial EAPOL-key
-                        if (ws_pae_supp_initial_key_send(pae_supp) < 0) {
-                            tr_info("EAPOL-Key send failed");
-                        }
-                    }
+                pae_supp->tx_failure_on_initial_key = false;
+                // Sends initial EAPOL-key
+                if (ws_pae_supp_initial_key_send(pae_supp) < 0) {
+                    tr_info("EAPOL-Key send failed");
+                }
+            }
 
-                    /* Wait time for the authenticator to answer the last re-transmit expires;
-                       fails authentication */
-                    if (pae_supp->initial_key_retry_cnt == 0) {
-                        bool retry = false;
-                        // If making key update and GTKs do not match to GTK hash
-                        if (!pae_supp->auth_requested && ws_pae_supp_gtk_hash_mismatch_check(pae_supp) < 0) {
-                            tr_info("GTKs do not match to GTK hash");
-                            retry = true;
-                        }
-                        auth_result_e result = AUTH_RESULT_ERR_UNSPEC;
-                        if (pae_supp->tx_failure_on_initial_key) {
-                            result = AUTH_RESULT_ERR_TX_ERR;
-                            pae_supp->tx_failure_on_initial_key = false;
-                        }
-                        ws_pae_supp_authenticate_response(pae_supp, result);
-                        if (retry) {
-                            // Start trickle timer to try re-authentication
-                            ws_pae_supp_initial_key_update_trickle_timer_start(pae_supp, KEY_UPDATE_RETRY_COUNT);
-                        }
-                    } else {
-                        if (pae_supp->initial_key_retry_cnt > 0) {
-                            pae_supp->initial_key_retry_cnt--;
-                        }
-                        if (pae_supp->initial_key_retry_cnt == 0) {
-                            // Starts wait time for the authenticator to answer
-                            tr_info("Initial EAPOL-Key wait for last re-transmit answer");
-                            ws_pae_supp_initial_last_interval_trickle_timer_start(pae_supp);
-                        }
-                    }
+            /* Wait time for the authenticator to answer the last re-transmit expires;
+               fails authentication */
+            if (pae_supp->initial_key_retry_cnt == 0) {
+                bool retry = false;
+                // If making key update and GTKs do not match to GTK hash
+                if (!pae_supp->auth_requested && ws_pae_supp_gtk_hash_mismatch_check(pae_supp) < 0) {
+                    tr_info("GTKs do not match to GTK hash");
+                    retry = true;
+                }
+                auth_result_e result = AUTH_RESULT_ERR_UNSPEC;
+                if (pae_supp->tx_failure_on_initial_key) {
+                    result = AUTH_RESULT_ERR_TX_ERR;
+                    pae_supp->tx_failure_on_initial_key = false;
                 }
+                ws_pae_supp_authenticate_response(pae_supp, result);
+                if (retry) {
+                    // Start trickle timer to try re-authentication
+                    ws_pae_supp_initial_key_update_trickle_timer_start(pae_supp, KEY_UPDATE_RETRY_COUNT);
+                }
+            } else {
+                if (pae_supp->initial_key_retry_cnt > 1) {
+                    pae_supp->initial_key_retry_cnt--;
 
-                // Sanity check, should be running until authentication failure
-                if (!trickle_running(&pae_supp->auth_trickle_timer, &pae_supp->auth_trickle_params)) {
-                    ws_pae_supp_authenticate_response(pae_supp, AUTH_RESULT_ERR_UNSPEC);
+                    pae_supp->initial_key_retry_max_value *= 2;
+                    if (pae_supp->initial_key_retry_max_value > pae_supp->sec_cfg->prot_cfg.initial_key_retry_max_limit) {
+                        pae_supp->initial_key_retry_max_value = pae_supp->sec_cfg->prot_cfg.initial_key_retry_max_limit;
+                    }
+                    pae_supp->initial_key_retry_timer = randLIB_get_random_in_range(
+                                                            pae_supp->sec_cfg->prot_cfg.initial_key_retry_min,
+                                                            pae_supp->initial_key_retry_max_value);
+
+                    tr_info("Initial EAPOL-Key retry timer %i seconds (range [%i,%i] seconds)",
+                            pae_supp->initial_key_retry_timer,
+                            pae_supp->sec_cfg->prot_cfg.initial_key_retry_min,
+                            pae_supp->initial_key_retry_max_value);
+                } else if (pae_supp->initial_key_retry_cnt > 0) {
+                    pae_supp->initial_key_retry_cnt = 0;
+                    // Starts wait time for the authenticator to answer
+                    pae_supp->initial_key_retry_timer = randLIB_get_random_in_range(
+                                                            LAST_INTERVAL_MIN_SECS, LAST_INTERVAL_MAX_SECS);
+                    tr_info("Initial EAPOL-Key wait for last re-transmit answer %i seconds (range [120,240] seconds)",
+                            pae_supp->initial_key_retry_timer);
                 }
             }
         }
@@ -879,71 +891,37 @@ void ws_pae_supp_slow_timer(uint16_t seconds)
             } else {
                 pae_supp->initial_key_timer = 0;
                 pae_supp->tx_failure_on_initial_key = false;
+                pae_supp->initial_key_retry_cnt = pae_supp->sec_cfg->prot_cfg.initial_key_retry_cnt;
                 // Sends initial EAPOL-Key message
                 if (ws_pae_supp_initial_key_send(pae_supp) < 0) {
                     tr_info("EAPOL-Key send failed");
                 }
-                // Start trickle timer
-                ws_pae_supp_initial_trickle_timer_start(pae_supp);
+                // Starts initial EAPOL-key retry exponential backoff timer
+                pae_supp->initial_key_retry_max_value = pae_supp->sec_cfg->prot_cfg.initial_key_retry_max;
+                pae_supp->initial_key_retry_timer = randLIB_get_random_in_range(
+                                                        pae_supp->sec_cfg->prot_cfg.initial_key_retry_min,
+                                                        pae_supp->initial_key_retry_max_value);
+
+                tr_info("Initial EAPOL-Key retry timer %i seconds (range [%i,%i] seconds)",
+                        pae_supp->initial_key_retry_timer,
+                        pae_supp->sec_cfg->prot_cfg.initial_key_retry_min,
+                        pae_supp->initial_key_retry_max_value);
             }
         }
     }
 }
 
-static void ws_pae_supp_initial_trickle_timer_start(pae_supp_t *pae_supp)
-{
-    /* Starts trickle for initial EAPOL-key. Default sequence has fixed delay of 2 minutes,
-     * one re-transmit interval, last re-transmit interval transmit time and a wait time
-     * for the authenticator to answer the last re-transmit.
-     *
-     * Interval I [6,12] minutes. Sequence:
-     *
-     * fixed 2 minutes delay + I + last I transmit time t + wait for answer [2,4] minutes
-     *
-     * There are two retries. Minimum time that sequence takes before authentication failure
-     * is 16 minutes and maximum is 30 minutes.
-     *
-     *
-     * Extremely slow network
-     *
-     * Starts trickle for initial EAPOL-key, Interval I [10,60] minutes. Sequence:
-     * I + last I transmit time t + wait for answer [2,4] minutes
-     * There are two retries. Minimum time that sequence takes before authentication failure
-     * is 22 minutes and maximum is 124 minutes.
-     */
-    pae_supp->auth_trickle_params = pae_supp->sec_cfg->prot_cfg.initial_key_trickle_params;
-    pae_supp->initial_key_retry_timer = pae_supp->sec_cfg->prot_cfg.initial_key_retry_delay;
-
-    trickle_start(&pae_supp->auth_trickle_timer, &pae_supp->auth_trickle_params);
-    tr_info("Initial EAPOL-Key trickle I: [%i,%i] %i, t: %i", pae_supp->auth_trickle_params.Imin, pae_supp->auth_trickle_params.Imax, pae_supp->auth_trickle_timer.I, pae_supp->auth_trickle_timer.t);
-    pae_supp->auth_trickle_running = true;
-    pae_supp->initial_key_retry_cnt = pae_supp->sec_cfg->prot_cfg.initial_key_retry_cnt;
-}
-
-static void ws_pae_supp_initial_last_interval_trickle_timer_start(pae_supp_t *pae_supp)
-{
-    // Starts trickle last to wait response after last retry before failing authentication
-    pae_supp->auth_trickle_params.Imin = LAST_INTERVAL_TRICKLE_IMIN_SECS;
-    pae_supp->auth_trickle_params.Imax = LAST_INTERVAL_TRICKLE_IMAX_SECS;
-    pae_supp->auth_trickle_params.k = 0;
-    pae_supp->auth_trickle_params.TimerExpirations = 1;
-    // Set I to [iMin,iMax] (4 to 4 minutes) -> t is [I/2 - I] (2 minutes to 4 minutes)
-    trickle_start(&pae_supp->auth_trickle_timer, &pae_supp->auth_trickle_params);
-    tr_info("Initial EAPOL-Key trickle I: [%i,%i] %i, t: %i", pae_supp->auth_trickle_params.Imin, pae_supp->auth_trickle_params.Imax, pae_supp->auth_trickle_timer.I, pae_supp->auth_trickle_timer.t);
-}
-
 static void ws_pae_supp_initial_key_update_trickle_timer_start(pae_supp_t *pae_supp, uint8_t timer_expirations)
 {
     // Starts trickle for the key update
-    pae_supp->auth_trickle_params.Imin = pae_supp->sec_cfg->timer_cfg.gtk_request_imin;
-    pae_supp->auth_trickle_params.Imax = pae_supp->sec_cfg->timer_cfg.gtk_request_imax;
-    pae_supp->auth_trickle_params.k = 0;
-    pae_supp->auth_trickle_params.TimerExpirations = timer_expirations;
-
-    trickle_start(&pae_supp->auth_trickle_timer, &pae_supp->auth_trickle_params);
-    tr_info("Initial EAPOL-Key trickle I: [%i,%i] %i, t: %i", pae_supp->auth_trickle_params.Imin, pae_supp->auth_trickle_params.Imax, pae_supp->auth_trickle_timer.I, pae_supp->auth_trickle_timer.t);
-    pae_supp->initial_key_retry_timer = NONE_INITIAL_KEY_RETRY_TIMER; // 0 seconds
-    pae_supp->auth_trickle_running = true;
+    pae_supp->gtk_req_trickle_params.Imin = pae_supp->sec_cfg->timer_cfg.gtk_request_imin;
+    pae_supp->gtk_req_trickle_params.Imax = pae_supp->sec_cfg->timer_cfg.gtk_request_imax;
+    pae_supp->gtk_req_trickle_params.k = 0;
+    pae_supp->gtk_req_trickle_params.TimerExpirations = timer_expirations;
+
+    trickle_start(&pae_supp->gtk_req_trickle_timer, &pae_supp->gtk_req_trickle_params);
+    tr_info("Initial EAPOL-Key trickle I: [%i,%i] %i, t: %i", pae_supp->gtk_req_trickle_params.Imin, pae_supp->gtk_req_trickle_params.Imax, pae_supp->gtk_req_trickle_timer.I, pae_supp->gtk_req_trickle_timer.t);
+    pae_supp->gtk_update_trickle_running = true;
     pae_supp->initial_key_retry_cnt = timer_expirations;
 }
 
@@ -1216,7 +1194,8 @@ static void ws_pae_supp_kmp_api_create_indication(kmp_api_t *kmp, kmp_type_e typ
     }
 
     // Incoming KMP protocol has started, no longer runs trickle timer for re-sending EAPOL-key message
-    pae_supp->auth_trickle_running = false;
+    pae_supp->gtk_update_trickle_running = false;
+    pae_supp->initial_key_retry_timer = 0;
 
     // For now, accept every KMP-CREATE.indication
     kmp_api_create_response(kmp, KMP_RESULT_OK);
diff --git a/source/Security/protocols/sec_prot_cfg.h b/source/Security/protocols/sec_prot_cfg.h
index d5fd1d218f3..adc4217281f 100644
--- a/source/Security/protocols/sec_prot_cfg.h
+++ b/source/Security/protocols/sec_prot_cfg.h
@@ -23,8 +23,9 @@
 typedef struct sec_prot_cfg_s {
     trickle_params_t sec_prot_trickle_params;
     uint16_t sec_prot_retry_timeout;
-    uint16_t initial_key_retry_delay;
-    trickle_params_t initial_key_trickle_params;
+    uint16_t initial_key_retry_min;
+    uint16_t initial_key_retry_max;
+    uint16_t initial_key_retry_max_limit;
     uint8_t initial_key_retry_cnt;
     uint8_t max_ongoing_auth_constant;
     uint16_t max_ongoing_auth_size_scaler;
diff --git a/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.c b/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.c
index fd55216c00e..22f73bdf58f 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.c
+++ b/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.c
@@ -149,10 +149,10 @@ static const ws_cfg_t ws_cfg_defaults_medium = {
     .sec_prot.sec_prot_trickle_timer_exp = 2,      // network size affects
     .sec_prot.max_simult_sec_neg_tx_queue_min = 64,
     .sec_prot.max_simult_sec_neg_tx_queue_max = 192,
-    .sec_prot.initial_key_retry_delay = 120,       // network size affects
-    .sec_prot.initial_key_imin = 360,              // network size affects
-    .sec_prot.initial_key_imax = 720,              // network size affects
-    .sec_prot.initial_key_retry_cnt = 2,           // network size affects
+    .sec_prot.initial_key_retry_min = 180,         // network size affects
+    .sec_prot.initial_key_retry_max = 420,         // network size affects
+    .sec_prot.initial_key_retry_max_limit = 720,   // network size affects
+    .sec_prot.initial_key_retry_cnt = 4,           // network size affects
 };
 
 // small network size
@@ -222,9 +222,9 @@ static const ws_cfg_t ws_cfg_defaults_small = {
     .sec_prot.sec_prot_trickle_timer_exp = 2,      // network size affects
     .sec_prot.max_simult_sec_neg_tx_queue_min = 64,
     .sec_prot.max_simult_sec_neg_tx_queue_max = 192,
-    .sec_prot.initial_key_retry_delay = 120,       // network size affects
-    .sec_prot.initial_key_imin = 360,              // network size affects
-    .sec_prot.initial_key_imax = 500,              // network size affects
+    .sec_prot.initial_key_retry_min = 180,         // network size affects
+    .sec_prot.initial_key_retry_max = 420,         // network size affects
+    .sec_prot.initial_key_retry_max_limit = 420,   // network size affects
     .sec_prot.initial_key_retry_cnt = 2,           // network size affects
 };
 
@@ -295,10 +295,10 @@ static const ws_cfg_t ws_cfg_defaults_large = {
     .sec_prot.sec_prot_trickle_timer_exp = 2,       // network size affects
     .sec_prot.max_simult_sec_neg_tx_queue_min = 64,
     .sec_prot.max_simult_sec_neg_tx_queue_max = 192,
-    .sec_prot.initial_key_retry_delay = 0,          // network size affects
-    .sec_prot.initial_key_imin = 600,               // network size affects
-    .sec_prot.initial_key_imax = 1200,              // network size affects
-    .sec_prot.initial_key_retry_cnt = 3,            // network size affects
+    .sec_prot.initial_key_retry_min = 300,          // network size affects
+    .sec_prot.initial_key_retry_max = 600,          // network size affects
+    .sec_prot.initial_key_retry_max_limit = 900,    // network size affects
+    .sec_prot.initial_key_retry_cnt = 4,            // network size affects
 };
 
 // large network size
@@ -368,9 +368,9 @@ static const ws_cfg_t ws_cfg_defaults_xlarge = {
     .sec_prot.sec_prot_trickle_timer_exp = 2,       // network size affects
     .sec_prot.max_simult_sec_neg_tx_queue_min = 64,
     .sec_prot.max_simult_sec_neg_tx_queue_max = 192,
-    .sec_prot.initial_key_retry_delay = 0,          // network size affects
-    .sec_prot.initial_key_imin = 600,               // network size affects
-    .sec_prot.initial_key_imax = 1200,              // network size affects
+    .sec_prot.initial_key_retry_min = 300,          // network size affects
+    .sec_prot.initial_key_retry_max = 600,          // network size affects
+    .sec_prot.initial_key_retry_max_limit = 1200,   // network size affects
     .sec_prot.initial_key_retry_cnt = 4,            // network size affects
 };
 
@@ -441,9 +441,9 @@ static const ws_cfg_t ws_cfg_defaults_certification = {
     .sec_prot.sec_prot_trickle_timer_exp = 2,      // network size affects
     .sec_prot.max_simult_sec_neg_tx_queue_min = 64,
     .sec_prot.max_simult_sec_neg_tx_queue_max = 192,
-    .sec_prot.initial_key_retry_delay = 120,       // network size affects
-    .sec_prot.initial_key_imin = 360,              // network size affects
-    .sec_prot.initial_key_imax = 500,              // network size affects
+    .sec_prot.initial_key_retry_min = 180,         // network size affects
+    .sec_prot.initial_key_retry_max = 420,         // network size affects
+    .sec_prot.initial_key_retry_max_limit = 420,   // network size affects
     .sec_prot.initial_key_retry_cnt = 2,           // network size affects
 };
 

From 6040d703c85e4a6ce21c4e1e98d554ac03482fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=20Lepp=C3=A4nen?= <mika.leppanen@arm.com>
Date: Mon, 14 Jun 2021 12:37:16 +0300
Subject: [PATCH 37/43] Updated change log

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a98efc8697..489eaf7301a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 ### Changes
 * Statistics for MAC data request latencies. Separated to adaptation layer and MAC queueing delays.
+* Changed initial EAPOL-key retries from trickle to exponential backup.
 
 ### Bug fixes
 * Added ignoring of retry messages from RADIUS server when waiting EAP-TLS

From 928723a33e8632b430cdc7004c0389e85e3ed0a5 Mon Sep 17 00:00:00 2001
From: Jarkko Paso <jarkko.paso@arm.com>
Date: Tue, 15 Jun 2021 10:11:28 +0300
Subject: [PATCH 38/43] FHSS WS: Initialize broadcast channel count when
 enabling FHSS (#2642)

---
 source/Service_Libs/fhss/fhss_ws.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/source/Service_Libs/fhss/fhss_ws.c b/source/Service_Libs/fhss/fhss_ws.c
index e0a2eff2557..090520570bf 100644
--- a/source/Service_Libs/fhss/fhss_ws.c
+++ b/source/Service_Libs/fhss/fhss_ws.c
@@ -130,10 +130,10 @@ fhss_structure_t *fhss_ws_enable(fhss_api_t *fhss_api, const fhss_ws_configurati
         tr_err("Invalid FHSS enable configuration");
         return NULL;
     }
-    int channel_count = channel_list_count_channels(fhss_configuration->channel_mask);
+    int bc_channel_count = channel_list_count_channels(fhss_configuration->channel_mask);
     int uc_channel_count = channel_list_count_channels(fhss_configuration->unicast_channel_mask);
 
-    if (channel_count <= 0) {
+    if (bc_channel_count <= 0) {
         // There must be at least one configured channel in channel list
         return NULL;
     }
@@ -147,7 +147,7 @@ fhss_structure_t *fhss_ws_enable(fhss_api_t *fhss_api, const fhss_ws_configurati
         return NULL;
     }
     memset(fhss_struct->ws, 0, sizeof(fhss_ws_t));
-    if (fhss_ws_manage_channel_table_allocation(fhss_struct, channel_count)) {
+    if (fhss_ws_manage_channel_table_allocation(fhss_struct, uc_channel_count > bc_channel_count ? uc_channel_count : bc_channel_count)) {
         ns_dyn_mem_free(fhss_struct->ws);
         fhss_free_instance(fhss_api);
         tr_error("Failed to allocate channel tables");
@@ -161,10 +161,12 @@ fhss_structure_t *fhss_ws_enable(fhss_api_t *fhss_api, const fhss_ws_configurati
         for (uint8_t i = 0; i < 8; i++) {
             fhss_struct->ws->fhss_configuration.unicast_channel_mask[i] = fhss_configuration->channel_mask[i];
         }
-        uc_channel_count = channel_count;
+        uc_channel_count = bc_channel_count;
     }
-    fhss_struct->number_of_channels = channel_count;
+
+    fhss_struct->number_of_channels = fhss_configuration->channel_mask_size;
     fhss_struct->number_of_uc_channels = uc_channel_count;
+    fhss_struct->number_of_bc_channels = bc_channel_count;
     fhss_struct->optimal_packet_length = OPTIMAL_PACKET_LENGTH;
     fhss_ws_set_hop_count(fhss_struct, 0xff);
     fhss_struct->rx_channel = fhss_configuration->unicast_fixed_channel;

From eb26726020ceefe044cfc0a861e04649f2d9afaa Mon Sep 17 00:00:00 2001
From: Juha Heiskanen <juha.heiskanen@arm.com>
Date: Mon, 14 Jun 2021 18:29:33 +0300
Subject: [PATCH 39/43] High Priority timestamp compare overflow support fix.

---
 source/6LoWPAN/adaptation_interface.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/source/6LoWPAN/adaptation_interface.c b/source/6LoWPAN/adaptation_interface.c
index 73c5c08c599..4423636e030 100644
--- a/source/6LoWPAN/adaptation_interface.c
+++ b/source/6LoWPAN/adaptation_interface.c
@@ -1186,17 +1186,9 @@ static bool lowpan_buffer_tx_allowed(fragmenter_interface_t *interface_ptr, buff
     return true;
 }
 
-static uint32_t lowpan_adaptation_time_stamp_diff(uint32_t compare_stamp)
-{
-    if (protocol_core_monotonic_time < compare_stamp) {
-        return compare_stamp - protocol_core_monotonic_time;
-    }
-    return protocol_core_monotonic_time - compare_stamp;
-}
-
 static bool lowpan_adaptation_high_priority_state_exit(fragmenter_interface_t *interface_ptr)
 {
-    if (!interface_ptr->last_rx_high_priority || lowpan_adaptation_time_stamp_diff(interface_ptr->last_rx_high_priority) < LOWPAN_HIGH_PRIORITY_STATE_LENGTH) {
+    if (!interface_ptr->last_rx_high_priority || ((protocol_core_monotonic_time - interface_ptr->last_rx_high_priority) < LOWPAN_HIGH_PRIORITY_STATE_LENGTH)) {
         return false;
     }
 

From 02bc33a2429a92b97949a755dee90756787d0cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=20Lepp=C3=A4nen?= <mika.leppanen@arm.com>
Date: Mon, 14 Jun 2021 14:42:41 +0300
Subject: [PATCH 40/43] Adjusted security protocol (EAP-TLS,4WH,2WH) retry
 timers

Trickle timer is now reset (sets inconsistent heard) when security
protocol retry timer is started. Adjusted also retry timer values
and retry count.
After GTK hash mismatch and GTK update start, if security protocol
fails on supplicant, initial EAPOL-key sending is restarted.
---
 source/6LoWPAN/ws/ws_cfg_settings.c           |  2 +-
 source/6LoWPAN/ws/ws_config.h                 | 12 ++++----
 source/6LoWPAN/ws/ws_pae_supp.c               | 13 +++++++++
 source/Security/protocols/sec_prot_lib.c      |  2 ++
 .../ws_cfg_settings/test_ws_cfg_settings.c    | 28 +++++++++----------
 5 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/source/6LoWPAN/ws/ws_cfg_settings.c b/source/6LoWPAN/ws/ws_cfg_settings.c
index 74ae9dd51d1..d01601da20c 100644
--- a/source/6LoWPAN/ws/ws_cfg_settings.c
+++ b/source/6LoWPAN/ws/ws_cfg_settings.c
@@ -1237,7 +1237,7 @@ static int8_t ws_cfg_sec_prot_default_set(ws_sec_prot_cfg_t *cfg)
 {
     cfg->sec_prot_trickle_imin = SEC_PROT_SMALL_IMIN;
     cfg->sec_prot_trickle_imax = SEC_PROT_SMALL_IMAX;
-    cfg->sec_prot_trickle_timer_exp = 2;
+    cfg->sec_prot_trickle_timer_exp = SEC_PROT_TIMER_EXPIRATIONS;
     cfg->sec_prot_retry_timeout = SEC_PROT_RETRY_TIMEOUT_SMALL;
     cfg->max_simult_sec_neg_tx_queue_min = MAX_SIMULTANEOUS_SECURITY_NEGOTIATIONS_TX_QUEUE_MIN;
     cfg->max_simult_sec_neg_tx_queue_max = MAX_SIMULTANEOUS_SECURITY_NEGOTIATIONS_TX_QUEUE_MAX;
diff --git a/source/6LoWPAN/ws/ws_config.h b/source/6LoWPAN/ws/ws_config.h
index 71044f21007..49723f009b4 100644
--- a/source/6LoWPAN/ws/ws_config.h
+++ b/source/6LoWPAN/ws/ws_config.h
@@ -242,17 +242,19 @@ extern uint8_t DEVICE_MIN_SENS;
 #define WISUN_1_0_ERRATA_FIX
 
 /*
- *  Security protocol message retry configuration parameters
+ * Security protocol message retry configuration parameters
+ *
+ * Trickle is reset on start (inconsistent heard is set)
  */
-#define SEC_PROT_SMALL_IMIN 30              // Retries done in 30 seconds
-#define SEC_PROT_SMALL_IMAX 90              // Largest value 90 seconds
-#define SEC_PROT_RETRY_TIMEOUT_SMALL 330    // Retry timeout for small network additional 30 seconds for authenticator delay
+#define SEC_PROT_SMALL_IMIN 60              // Retries done in 60 seconds
+#define SEC_PROT_SMALL_IMAX 120             // Largest value 120 seconds
+#define SEC_PROT_RETRY_TIMEOUT_SMALL 450    // Retry timeout for small network additional 30 seconds for authenticator delay
 
 #define SEC_PROT_LARGE_IMIN 60              // Retries done in 60 seconds
 #define SEC_PROT_LARGE_IMAX 240             // Largest value 240 seconds
 #define SEC_PROT_RETRY_TIMEOUT_LARGE 750    // Retry timeout for large network additional 30 seconds for authenticator delay
 
-#define SEC_PROT_TIMER_EXPIRATIONS 2        // Number of retries
+#define SEC_PROT_TIMER_EXPIRATIONS 4        // Number of retries
 
 // Maximum number of simultaneous security negotiations
 #define MAX_SIMULTANEOUS_SECURITY_NEGOTIATIONS_TX_QUEUE_MIN   64
diff --git a/source/6LoWPAN/ws/ws_pae_supp.c b/source/6LoWPAN/ws/ws_pae_supp.c
index f3753a54920..6aab0d9cae4 100644
--- a/source/6LoWPAN/ws/ws_pae_supp.c
+++ b/source/6LoWPAN/ws/ws_pae_supp.c
@@ -1237,6 +1237,19 @@ static bool ws_pae_supp_kmp_api_finished_indication(kmp_api_t *kmp, kmp_result_e
             // Continues with trickle but selects different parent
             pae_supp->tx_failure_on_initial_key = true;
         }
+
+    } else if ((type == IEEE_802_1X_MKA || type == IEEE_802_11_4WH || type == IEEE_802_11_GKH) && result != KMP_RESULT_OK) {
+
+        if (!pae_supp->auth_requested && ws_pae_supp_gtk_hash_mismatch_check(pae_supp) < 0) {
+            // Start trickle timer
+            ws_pae_supp_initial_key_update_trickle_timer_start(pae_supp, KEY_UPDATE_RETRY_COUNT);
+
+            // Starts supplicant timer
+            ws_pae_supp_timer_start(pae_supp);
+
+            tr_info("GTK update re-start imin: %i, imax: %i, max mismatch: %i, tr time: %i", pae_supp->sec_cfg->timer_cfg.gtk_request_imin, pae_supp->sec_cfg->timer_cfg.gtk_request_imax, pae_supp->sec_cfg->timer_cfg.gtk_max_mismatch, pae_supp->gtk_req_trickle_timer.t);
+        }
+
     }
 
     return false;
diff --git a/source/Security/protocols/sec_prot_lib.c b/source/Security/protocols/sec_prot_lib.c
index fc812572a84..7789020660c 100644
--- a/source/Security/protocols/sec_prot_lib.c
+++ b/source/Security/protocols/sec_prot_lib.c
@@ -88,6 +88,8 @@ void sec_prot_timer_timeout_handle(sec_prot_t *prot, sec_prot_common_t *data, co
 void sec_prot_timer_trickle_start(sec_prot_common_t *data, const trickle_params_t *trickle_params)
 {
     trickle_start(&data->trickle_timer, trickle_params);
+    trickle_inconsistent_heard(&data->trickle_timer, trickle_params);
+    tr_info("Security prot trickle start, I: %i, t: %i", data->trickle_timer.I, data->trickle_timer.t);
     data->trickle_running = true;
 }
 
diff --git a/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.c b/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.c
index 22f73bdf58f..3c2095d823e 100644
--- a/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.c
+++ b/test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.c
@@ -143,10 +143,10 @@ static const ws_cfg_t ws_cfg_defaults_medium = {
     .sec_timer.gtk_max_mismatch = 64,
     .sec_timer.gtk_new_install_req = 80,
 
-    .sec_prot.sec_prot_retry_timeout = 330,        // network size affects
-    .sec_prot.sec_prot_trickle_imin = 30,          // network size affects
-    .sec_prot.sec_prot_trickle_imax = 90,          // network size affects
-    .sec_prot.sec_prot_trickle_timer_exp = 2,      // network size affects
+    .sec_prot.sec_prot_retry_timeout = 450,        // network size affects
+    .sec_prot.sec_prot_trickle_imin = 60,          // network size affects
+    .sec_prot.sec_prot_trickle_imax = 120,         // network size affects
+    .sec_prot.sec_prot_trickle_timer_exp = 4,      // network size affects
     .sec_prot.max_simult_sec_neg_tx_queue_min = 64,
     .sec_prot.max_simult_sec_neg_tx_queue_max = 192,
     .sec_prot.initial_key_retry_min = 180,         // network size affects
@@ -216,10 +216,10 @@ static const ws_cfg_t ws_cfg_defaults_small = {
     .sec_timer.gtk_max_mismatch = 64,
     .sec_timer.gtk_new_install_req = 80,
 
-    .sec_prot.sec_prot_retry_timeout = 330,        // network size affects
-    .sec_prot.sec_prot_trickle_imin = 30,          // network size affects
-    .sec_prot.sec_prot_trickle_imax = 90,          // network size affects
-    .sec_prot.sec_prot_trickle_timer_exp = 2,      // network size affects
+    .sec_prot.sec_prot_retry_timeout = 450,        // network size affects
+    .sec_prot.sec_prot_trickle_imin = 60,          // network size affects
+    .sec_prot.sec_prot_trickle_imax = 120,         // network size affects
+    .sec_prot.sec_prot_trickle_timer_exp = 4,      // network size affects
     .sec_prot.max_simult_sec_neg_tx_queue_min = 64,
     .sec_prot.max_simult_sec_neg_tx_queue_max = 192,
     .sec_prot.initial_key_retry_min = 180,         // network size affects
@@ -292,7 +292,7 @@ static const ws_cfg_t ws_cfg_defaults_large = {
     .sec_prot.sec_prot_retry_timeout = 750,         // network size affects
     .sec_prot.sec_prot_trickle_imin = 60,           // network size affects
     .sec_prot.sec_prot_trickle_imax = 240,          // network size affects
-    .sec_prot.sec_prot_trickle_timer_exp = 2,       // network size affects
+    .sec_prot.sec_prot_trickle_timer_exp = 4,       // network size affects
     .sec_prot.max_simult_sec_neg_tx_queue_min = 64,
     .sec_prot.max_simult_sec_neg_tx_queue_max = 192,
     .sec_prot.initial_key_retry_min = 300,          // network size affects
@@ -365,7 +365,7 @@ static const ws_cfg_t ws_cfg_defaults_xlarge = {
     .sec_prot.sec_prot_retry_timeout = 750,         // network size affects
     .sec_prot.sec_prot_trickle_imin = 60,           // network size affects
     .sec_prot.sec_prot_trickle_imax = 240,          // network size affects
-    .sec_prot.sec_prot_trickle_timer_exp = 2,       // network size affects
+    .sec_prot.sec_prot_trickle_timer_exp = 4,       // network size affects
     .sec_prot.max_simult_sec_neg_tx_queue_min = 64,
     .sec_prot.max_simult_sec_neg_tx_queue_max = 192,
     .sec_prot.initial_key_retry_min = 300,          // network size affects
@@ -435,10 +435,10 @@ static const ws_cfg_t ws_cfg_defaults_certification = {
     .sec_timer.gtk_max_mismatch = 64,
     .sec_timer.gtk_new_install_req = 80,
 
-    .sec_prot.sec_prot_retry_timeout = 330,        // network size affects
-    .sec_prot.sec_prot_trickle_imin = 30,          // network size affects
-    .sec_prot.sec_prot_trickle_imax = 90,          // network size affects
-    .sec_prot.sec_prot_trickle_timer_exp = 2,      // network size affects
+    .sec_prot.sec_prot_retry_timeout = 450,        // network size affects
+    .sec_prot.sec_prot_trickle_imin = 60,          // network size affects
+    .sec_prot.sec_prot_trickle_imax = 120,         // network size affects
+    .sec_prot.sec_prot_trickle_timer_exp = 4,      // network size affects
     .sec_prot.max_simult_sec_neg_tx_queue_min = 64,
     .sec_prot.max_simult_sec_neg_tx_queue_max = 192,
     .sec_prot.initial_key_retry_min = 180,         // network size affects

From 3b3010a79b79df3c4195b70bd7cd9120fbfba96c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=20Lepp=C3=A4nen?= <mika.leppanen@arm.com>
Date: Tue, 15 Jun 2021 12:05:30 +0300
Subject: [PATCH 41/43] Adjusted stagger random to [min,min+max] and for small
 nw set the stagger value to 10 seconds

Adjusted stagger random from [min,max] to [min,min+max] and for small networks
set the stagger value to 10 seconds.
---
 CHANGELOG.md                                         | 1 +
 source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 489eaf7301a..90c4645e0bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 ### Changes
 * Statistics for MAC data request latencies. Separated to adaptation layer and MAC queueing delays.
 * Changed initial EAPOL-key retries from trickle to exponential backup.
+* Adjusted stagger random from [min,max] to [min,min+max] and for small networks set the stagger value to 10 seconds.
 
 ### Bug fixes
 * Added ignoring of retry messages from RADIUS server when waiting EAP-TLS
diff --git a/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c b/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c
index 83bca13189b..3069e00a56c 100644
--- a/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c
+++ b/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c
@@ -870,7 +870,12 @@ bool protocol_6lowpan_stagger_estimate_get(int8_t interface_id, uint32_t data_am
         datarate = STAGGER_DATARATE_FOR_APPL(datarate);
     }
 
-    stagger_value = 1 + ((data_amount * 1024 * 8 * network_size) / datarate);
+    // For small networks sets 10 seconds stagger
+    if (network_size <= 100 && ws_info(cur_interface)) {
+        stagger_value = 10;
+    } else {
+        stagger_value = 1 + ((data_amount * 1024 * 8 * network_size) / datarate);
+    }
     /**
      * Example:
      * Maximum stagger value to send 1kB to 100 device network using data rate of 50kbs:
@@ -882,7 +887,7 @@ bool protocol_6lowpan_stagger_estimate_get(int8_t interface_id, uint32_t data_am
     if (stagger_value > 0xFFFF) {
         *stagger_max = 0xFFFF;
     } else {
-        *stagger_max = (uint16_t)stagger_value;
+        *stagger_max = (uint16_t)stagger_value + *stagger_min;
     }
 
     // Randomize stagger value

From 95c506a276b6d1230bb1824beb5adba7955cd3e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=20Lepp=C3=A4nen?= <mika.leppanen@arm.com>
Date: Wed, 16 Jun 2021 14:42:07 +0300
Subject: [PATCH 42/43] Frame counters for nw keys are now stored to NVM only
 after send key is set (#2641)

* Frame counters for nw keys are now stored to NVM only after send key is set

This way if the device resets right after startup, frame counters are not
incremented to NVM, which could lead to frame counter are exhaustion.
---
 CHANGELOG.md                              |  1 +
 source/6LoWPAN/ws/ws_pae_controller.c     | 46 +++++++++++------------
 source/Security/protocols/sec_prot_keys.h |  1 +
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90c4645e0bf..5e3fc9c7fd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * Statistics for MAC data request latencies. Separated to adaptation layer and MAC queueing delays.
 * Changed initial EAPOL-key retries from trickle to exponential backup.
 * Adjusted stagger random from [min,max] to [min,min+max] and for small networks set the stagger value to 10 seconds.
+* Frame counter values for network keys are now stored to NVM only after network key for sending is set.
 
 ### Bug fixes
 * Added ignoring of retry messages from RADIUS server when waiting EAP-TLS
diff --git a/source/6LoWPAN/ws/ws_pae_controller.c b/source/6LoWPAN/ws/ws_pae_controller.c
index f57934fcade..805cb07d8bc 100644
--- a/source/6LoWPAN/ws/ws_pae_controller.c
+++ b/source/6LoWPAN/ws/ws_pae_controller.c
@@ -122,7 +122,6 @@ static bool ws_pae_controller_auth_congestion_get(protocol_interface_info_entry_
 #endif
 static pae_controller_t *ws_pae_controller_get(protocol_interface_info_entry_t *interface_ptr);
 static void ws_pae_controller_frame_counter_timer(uint16_t seconds, pae_controller_t *entry);
-static void ws_pae_controller_frame_counter_timer_trigger(uint16_t seconds, pae_controller_t *entry);
 static void ws_pae_controller_frame_counter_store(pae_controller_t *entry, bool use_threshold);
 static void ws_pae_controller_nvm_frame_counter_write(frame_cnt_nvm_tlv_t *tlv_entry);
 static int8_t ws_pae_controller_nvm_frame_counter_read(uint32_t *restart_cnt, uint64_t *stored_time, uint16_t *pan_version, frame_counters_t *counters);
@@ -516,10 +515,6 @@ static int8_t ws_pae_controller_nw_key_check_and_insert(protocol_interface_info_
                     controller->nw_frame_counter_set(controller->interface_ptr, curr_frame_counter, i);
                 }
             }
-            /* Trigger storing of frame counters; there is 5 seconds delay to give time for the
-               other keys to be inserted, so that frame counters for several keys are updated on
-               a same time. */
-            ws_pae_controller_frame_counter_timer_trigger(FRAME_COUNTER_STORE_TRIGGER, controller);
         }
     }
 
@@ -614,6 +609,8 @@ static void ws_pae_controller_frame_counter_store_and_nw_keys_remove(protocol_in
 
     tr_info("NW keys remove");
 
+    controller->gtk_index = -1;
+
     nw_key_t *nw_key = controller->nw_key;
     for (uint8_t i = 0; i < GTK_NUM; i++) {
         // Deletes the key if it is set
@@ -637,9 +634,12 @@ static void ws_pae_controller_nw_key_index_check_and_set(protocol_interface_info
     }
 
     if (controller->nw_send_key_index_set) {
+        controller->gtk_index = index;
+        /* Checks if frame counters needs to be stored for the new GTK that is taken into
+           use; this is the last check that stored counters are in sync before activating key */
+        ws_pae_controller_frame_counter_store(controller, true);
         tr_info("NW send key index set: %i", index + 1);
         controller->nw_send_key_index_set(interface_ptr, index);
-        controller->gtk_index = index;
     }
 
     // Do not update PAN version for initial key index set
@@ -661,13 +661,14 @@ static void ws_pae_controller_active_nw_key_set(protocol_interface_info_entry_t
     }
 
     if (controller->nw_send_key_index_set) {
+        controller->gtk_index = index;
         /* Checks if frame counters needs to be stored for the new GTK that is taken into
            use; this is the last check that stored counters are in sync before activating key */
         ws_pae_controller_frame_counter_store(controller, true);
         // Activates key on MAC
         controller->nw_send_key_index_set(controller->interface_ptr, index);
         tr_info("NW send key index set: %i", index + 1);
-        controller->gtk_index = index;
+
     }
 }
 
@@ -801,7 +802,6 @@ static int8_t ws_pae_controller_frame_counter_read(pae_controller_t *controller)
         // Increments PAN version to ensure that it is fresh
         controller->sec_keys_nw_info.pan_version += PAN_VERSION_STORAGE_READ_INCREMENT;
 
-        bool updated = false;
         // Checks frame counters
         for (uint8_t index = 0; index < GTK_NUM; index++) {
             if (controller->frame_counters.counter[index].set) {
@@ -817,15 +817,8 @@ static int8_t ws_pae_controller_frame_counter_read(pae_controller_t *controller)
                     controller->frame_counters.counter[index].frame_counter;
 
                 tr_info("Read frame counter: index %i value %"PRIu32"", index, controller->frame_counters.counter[index].frame_counter);
-
-                updated = true;
             }
         }
-        if (updated) {
-            // Writes incremented frame counters
-            ws_pae_nvm_store_frame_counter_tlv_create((frame_cnt_nvm_tlv_t *) &controller->pae_nvm_buffer, controller->restart_cnt, controller->sec_keys_nw_info.pan_version, &controller->frame_counters);
-            ws_pae_controller_nvm_frame_counter_write((frame_cnt_nvm_tlv_t *) &controller->pae_nvm_buffer);
-        }
     }
 
     return ret_value;
@@ -836,6 +829,7 @@ static void ws_pae_controller_frame_counter_reset(frame_counters_t *frame_counte
     for (uint8_t index = 0; index < GTK_NUM; index++) {
         ws_pae_controller_frame_counter_index_reset(frame_counters, index);
     }
+    frame_counters->active_gtk_index = -1;
 }
 
 static void ws_pae_controller_frame_counter_index_reset(frame_counters_t *frame_counters, uint8_t index)
@@ -1712,13 +1706,6 @@ static void ws_pae_controller_frame_counter_timer(uint16_t seconds, pae_controll
     }
 }
 
-static void ws_pae_controller_frame_counter_timer_trigger(uint16_t seconds, pae_controller_t *entry)
-{
-    if (entry->frame_cnt_store_timer > seconds) {
-        entry->frame_cnt_store_timer = seconds;
-    }
-}
-
 static void ws_pae_controller_frame_counter_store(pae_controller_t *entry, bool use_threshold)
 {
     bool update_needed = false;
@@ -1731,7 +1718,7 @@ static void ws_pae_controller_frame_counter_store(pae_controller_t *entry, bool
          *       frame counters will be still valid.
          */
         if (entry->nw_key[i].installed) {
-            // Reads frame counter for the key
+            // Reads MAC frame counter for the key
             uint32_t curr_frame_counter;
             entry->nw_frame_counter_read(entry->interface_ptr, &curr_frame_counter, i);
 
@@ -1752,13 +1739,22 @@ static void ws_pae_controller_frame_counter_store(pae_controller_t *entry, bool
                     tr_debug("Stored updated frame counter: index %i value %"PRIu32"", i, frame_counter);
                 }
             } else {
-                // For new or modified network keys, stores the frame counter value
+                // New or modified network key
                 entry->frame_counters.counter[i].set = true;
                 memcpy(entry->frame_counters.counter[i].gtk, entry->nw_key[i].gtk, GTK_LEN);
                 entry->frame_counters.counter[i].frame_counter = curr_frame_counter;
                 entry->frame_counters.counter[i].stored_frame_counter = curr_frame_counter;
+                tr_debug("Pending to store new frame counter: index %i value %"PRIu32"", i, curr_frame_counter);
+            }
+
+            /* If currently active key is changed or active key is set for the first time,
+               stores the frame counter value */
+            if (entry->gtk_index == i && entry->frame_counters.active_gtk_index != i) {
+                entry->frame_counters.active_gtk_index = entry->gtk_index;
                 update_needed = true;
-                tr_debug("Stored new frame counter: index %i value %"PRIu32"", i, curr_frame_counter);
+                // Updates MAC frame counter for the key
+                entry->nw_frame_counter_set(entry->interface_ptr, entry->frame_counters.counter[i].frame_counter, i);
+                tr_debug("Stored frame counters, active key set: index %i value %"PRIu32"", i, entry->frame_counters.counter[i].frame_counter);
             }
         }
     }
diff --git a/source/Security/protocols/sec_prot_keys.h b/source/Security/protocols/sec_prot_keys.h
index bd114d5c8ae..6215bdc759f 100644
--- a/source/Security/protocols/sec_prot_keys.h
+++ b/source/Security/protocols/sec_prot_keys.h
@@ -114,6 +114,7 @@ typedef struct {
 
 typedef struct {
     frame_counter_t counter[GTK_NUM];                 /**< Frame counter for each GTK key */
+    int8_t active_gtk_index;                          /**< Active GTK index */
 } frame_counters_t;
 
 // Authenticator supplicant security key data

From 2b8d2e13568d34c247a312f80abc9d499ab81847 Mon Sep 17 00:00:00 2001
From: Jarkko Paso <jarkko.paso@arm.com>
Date: Fri, 18 Jun 2021 12:15:14 +0300
Subject: [PATCH 43/43] Do not reset radio when MAC data request timeouts
 (#2647)

---
 source/MAC/IEEE802_15_4/mac_mcps_sap.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/source/MAC/IEEE802_15_4/mac_mcps_sap.c b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
index 782bee98b04..6e952174f45 100644
--- a/source/MAC/IEEE802_15_4/mac_mcps_sap.c
+++ b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
@@ -1458,12 +1458,6 @@ static void mac_common_data_confirmation_handle(protocol_interface_rf_mac_setup_
         } else if (m_event == MAC_TX_DONE_PENDING) {
             buf->status = MLME_SUCCESS;
         } else if (m_event == MAC_TX_TIMEOUT) {
-            /* Make MAC Soft Reset */;
-            tr_debug("Driver TO event");
-            //Disable allways
-            mac_mlme_mac_radio_disabled(rf_mac_setup);
-            //Enable Radio
-            mac_mlme_mac_radio_enable(rf_mac_setup);
             buf->status = MLME_TRANSACTION_EXPIRED;
         } else if (m_event == MAC_UNKNOWN_DESTINATION) {
             buf->status = MLME_UNAVAILABLE_KEY;