diff --git a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackEthernetPhy.h b/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackEthernetPhy.h
index d2552cfa6e..7a8ea31f7a 100644
--- a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackEthernetPhy.h
+++ b/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackEthernetPhy.h
@@ -1,5 +1,18 @@
 /*
- * Copyright (c) 2016 ARM Limited. All rights reserved.
+ * Copyright (c) 2016, 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 NANOSTACK_ETHERNET_PHY_H_
diff --git a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackInterface.cpp b/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackInterface.cpp
index 0f93b1f62d..739871c540 100644
--- a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackInterface.cpp
+++ b/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackInterface.cpp
@@ -1,5 +1,6 @@
-/* Nanostack implementation of NetworkSocketAPI
- * Copyright (c) 2016 ARM Limited
+/*
+ * Copyright (c) 2016-2017, 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.
@@ -14,6 +15,8 @@
  * limitations under the License.
  */
 
+/* Nanostack implementation of NetworkSocketAPI */
+
 #include "mbed.h"
 #include "rtos.h"
 #include "NanostackInterface.h"
diff --git a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackInterface.h b/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackInterface.h
index 8c5b611267..453efa14ae 100644
--- a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackInterface.h
+++ b/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackInterface.h
@@ -1,15 +1,16 @@
 /*
- * Copyright (c) 2016 ARM Limited. All rights reserved.
+ * Copyright (c) 2016-2017, 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.
+ *
+ * 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
+ *     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.
+ * 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/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackLockGuard.h b/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackLockGuard.h
index 5bfd9409f2..ec1a249a14 100644
--- a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackLockGuard.h
+++ b/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackLockGuard.h
@@ -1,15 +1,16 @@
 /*
- * Copyright (c) 2017 ARM Limited. All rights reserved.
+ * Copyright (c) 2017, 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.
+ *
+ * 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
+ *     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.
+ * 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/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackPhy.h b/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackPhy.h
index a4a57ec7a7..0a136e6bca 100644
--- a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackPhy.h
+++ b/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackPhy.h
@@ -1,5 +1,18 @@
 /*
- * Copyright (c) 2016 ARM Limited. All rights reserved.
+ * Copyright (c) 2016, 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 NANOSTACK_PHY_H_
diff --git a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackRfPhy.h b/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackRfPhy.h
index 02bd7b1ace..ac65de92b5 100644
--- a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackRfPhy.h
+++ b/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackRfPhy.h
@@ -1,5 +1,18 @@
 /*
- * Copyright (c) 2016 ARM Limited. All rights reserved.
+ * Copyright (c) 2016-2017, 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 NANOSTACK_RF_PHY_H_