diff --git a/apache-2.0.txt b/apache-2.0.txt
index 0e4cf3ee99..a2fecaf5f8 100644
--- a/apache-2.0.txt
+++ b/apache-2.0.txt
@@ -53,4 +53,4 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
 
-END OF TERMS AND CONDITIONS
\ No newline at end of file
+END OF TERMS AND CONDITIONS
diff --git a/coap-service/coap_service_api.h b/coap-service/coap_service_api.h
old mode 100755
new mode 100644
index aa8a4fcf15..83560cfaee
--- a/coap-service/coap_service_api.h
+++ b/coap-service/coap_service_api.h
@@ -1,5 +1,19 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015-2016 ARM Limited. All Rights Reserved.
+ *
+ * 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 COAP_SERVICE_API_H_
diff --git a/source/coap_connection_handler.c b/source/coap_connection_handler.c
index d7229d4887..6eb5f35dce 100644
--- a/source/coap_connection_handler.c
+++ b/source/coap_connection_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015-2016 ARM Limited. All Rights Reserved.
  */
 
 #include <string.h>
diff --git a/source/coap_message_handler.c b/source/coap_message_handler.c
index 0f9d976310..c629821145 100644
--- a/source/coap_message_handler.c
+++ b/source/coap_message_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015-2016 ARM Limited. All Rights Reserved.
  */
 
 #include <string.h>
diff --git a/source/coap_security_handler.c b/source/coap_security_handler.c
index 032b367d81..f23110eae7 100644
--- a/source/coap_security_handler.c
+++ b/source/coap_security_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015-2016 ARM Limited. All Rights Reserved.
  */
 
 #include <string.h>
diff --git a/source/coap_service_api.c b/source/coap_service_api.c
index 1c341783bc..4b1394b2a4 100644
--- a/source/coap_service_api.c
+++ b/source/coap_service_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015-2016 ARM Limited. All Rights Reserved.
  */
 
 
diff --git a/source/include/coap_connection_handler.h b/source/include/coap_connection_handler.h
index 0bb7b9aafb..8d01f46eef 100644
--- a/source/include/coap_connection_handler.h
+++ b/source/include/coap_connection_handler.h
@@ -1,5 +1,19 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
+ * 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 __COAP_CONNECTION_HANDLER_H__
diff --git a/source/include/coap_message_handler.h b/source/include/coap_message_handler.h
index f5633d261f..05ac03fbd9 100644
--- a/source/include/coap_message_handler.h
+++ b/source/include/coap_message_handler.h
@@ -1,5 +1,19 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015-2016 ARM Limited. All Rights Reserved.
+ *
+ * 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 __COAP_MESSAGE_HANDLER_H__
diff --git a/source/include/coap_security_handler.h b/source/include/coap_security_handler.h
index 865d96bf63..2b8ae49fc7 100644
--- a/source/include/coap_security_handler.h
+++ b/source/include/coap_security_handler.h
@@ -1,5 +1,19 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015-2016 ARM Limited. All Rights Reserved.
+ *
+ * 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 __COAP_SECURITY_HANDLER_H__
 #define __COAP_SECURITY_HANDLER_H__
diff --git a/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c b/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c
index 6819cebecd..35c2090c23 100644
--- a/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c
+++ b/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM. All rights reserved.
+ * Copyright (c) 2015-2016 ARM Limited. All Rights Reserved.
  */
 #include "test_coap_connection_handler.h"
 #include <string.h>
diff --git a/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.h b/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.h
index 7398a2e276..f13725af58 100644
--- a/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.h
+++ b/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.h
@@ -1,5 +1,19 @@
 /*
- * Copyright (c) 2015 ARM. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
+ * 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 TEST_COAP_CONNECTION_HANDLER_H
 #define TEST_COAP_CONNECTION_HANDLER_H
diff --git a/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c b/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c
index 827fdc7b60..9210150458 100644
--- a/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c
+++ b/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
  */
 #include "test_coap_message_handler.h"
 #include <string.h>
diff --git a/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.h b/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.h
index 2b850a0afa..93a18f1ccd 100644
--- a/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.h
+++ b/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.h
@@ -1,5 +1,19 @@
 /*
- * Copyright (c) 2015 ARM. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
+ * 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 TEST_COAP_MESSAGE_HANDLER_H
 #define TEST_COAP_MESSAGE_HANDLER_H
diff --git a/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c b/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c
index 1036ee626f..b3ac5a495e 100644
--- a/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c
+++ b/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM. All rights reserved.
+ * Copyright (c) 2015-2016 ARM Limited. All Rights Reserved.
  */
 #include "test_coap_security_handler.h"
 #include "coap_security_handler.h"
diff --git a/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.h b/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.h
index d0a4e45380..1b06bed343 100644
--- a/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.h
+++ b/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.h
@@ -1,5 +1,19 @@
 /*
- * Copyright (c) 2015 ARM. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
+ * 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 TEST_COAP_SECURITY_HANDLER_H
 #define TEST_COAP_SECURITY_HANDLER_H
diff --git a/test/coap-service/unittest/coap_service_api/test_coap_service_api.c b/test/coap-service/unittest/coap_service_api/test_coap_service_api.c
index a9130a37a4..7c91ec085d 100644
--- a/test/coap-service/unittest/coap_service_api/test_coap_service_api.c
+++ b/test/coap-service/unittest/coap_service_api/test_coap_service_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
  */
 #include "test_coap_service_api.h"
 #include <string.h>
diff --git a/test/coap-service/unittest/coap_service_api/test_coap_service_api.h b/test/coap-service/unittest/coap_service_api/test_coap_service_api.h
index 2897c9a89b..94916476c3 100644
--- a/test/coap-service/unittest/coap_service_api/test_coap_service_api.h
+++ b/test/coap-service/unittest/coap_service_api/test_coap_service_api.h
@@ -1,5 +1,19 @@
 /*
- * Copyright (c) 2015 ARM. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
+ * 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 TEST_COAP_SERVICE_API_H
 #define TEST_COAP_SERVICE_API_H
diff --git a/test/coap-service/unittest/stub/coap_connection_handler_stub.c b/test/coap-service/unittest/stub/coap_connection_handler_stub.c
index 7390587ad8..43e72d49e4 100644
--- a/test/coap-service/unittest/stub/coap_connection_handler_stub.c
+++ b/test/coap-service/unittest/stub/coap_connection_handler_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
  */
 
 #include <string.h>
diff --git a/test/coap-service/unittest/stub/coap_connection_handler_stub.h b/test/coap-service/unittest/stub/coap_connection_handler_stub.h
index 1211f2d52e..61caf71744 100644
--- a/test/coap-service/unittest/stub/coap_connection_handler_stub.h
+++ b/test/coap-service/unittest/stub/coap_connection_handler_stub.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
+ * 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 __COAP_CONNECTION_HANDLER_STUB_H__
 #define __COAP_CONNECTION_HANDLER_STUB_H__
 
diff --git a/test/coap-service/unittest/stub/coap_message_handler_stub.c b/test/coap-service/unittest/stub/coap_message_handler_stub.c
index 6a33ca3570..a79a267996 100644
--- a/test/coap-service/unittest/stub/coap_message_handler_stub.c
+++ b/test/coap-service/unittest/stub/coap_message_handler_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015-2016 ARM Limited. All Rights Reserved.
  */
 
 #include "coap_message_handler_stub.h"
diff --git a/test/coap-service/unittest/stub/coap_message_handler_stub.h b/test/coap-service/unittest/stub/coap_message_handler_stub.h
index 6e0b74fd55..c8c37d142c 100644
--- a/test/coap-service/unittest/stub/coap_message_handler_stub.h
+++ b/test/coap-service/unittest/stub/coap_message_handler_stub.h
@@ -1,5 +1,19 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
+ * 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 __COAP_MESSAGE_HANDLER_STUB_H__
 #define __COAP_MESSAGE_HANDLER_STUB_H__
diff --git a/test/coap-service/unittest/stub/coap_security_handler_stub.c b/test/coap-service/unittest/stub/coap_security_handler_stub.c
index 517fffdd98..1b87ef23c4 100644
--- a/test/coap-service/unittest/stub/coap_security_handler_stub.c
+++ b/test/coap-service/unittest/stub/coap_security_handler_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015-2016 ARM Limited. All Rights Reserved.
  */
 
 #include <string.h>
diff --git a/test/coap-service/unittest/stub/coap_security_handler_stub.h b/test/coap-service/unittest/stub/coap_security_handler_stub.h
index f31a1bf42e..2316ffff7d 100644
--- a/test/coap-service/unittest/stub/coap_security_handler_stub.h
+++ b/test/coap-service/unittest/stub/coap_security_handler_stub.h
@@ -1,5 +1,19 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015-2016 ARM Limited. All Rights Reserved.
+ *
+ * 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 __COAP_SECURITY_HANDLER_STUB_H__
 #define __COAP_SECURITY_HANDLER_STUB_H__
diff --git a/test/coap-service/unittest/stub/coap_service_api_stub.c b/test/coap-service/unittest/stub/coap_service_api_stub.c
index 4131668323..3624937022 100644
--- a/test/coap-service/unittest/stub/coap_service_api_stub.c
+++ b/test/coap-service/unittest/stub/coap_service_api_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015-2016 ARM Limited. All Rights Reserved.
  */
 
 
diff --git a/test/coap-service/unittest/stub/eventOS_event_stub.c b/test/coap-service/unittest/stub/eventOS_event_stub.c
index e70337ebe2..b050d35078 100644
--- a/test/coap-service/unittest/stub/eventOS_event_stub.c
+++ b/test/coap-service/unittest/stub/eventOS_event_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
  */
 
 #include <string.h>
diff --git a/test/coap-service/unittest/stub/eventOS_event_stub.h b/test/coap-service/unittest/stub/eventOS_event_stub.h
index 603fda58af..fb2a9fc83f 100644
--- a/test/coap-service/unittest/stub/eventOS_event_stub.h
+++ b/test/coap-service/unittest/stub/eventOS_event_stub.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
+ * 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 __EVENTOS_EVENT_STUB_H__
 #define __EVENTOS_EVENT_STUB_H__
 
diff --git a/test/coap-service/unittest/stub/mbedtls_stub.c b/test/coap-service/unittest/stub/mbedtls_stub.c
index ab5afa27ba..806df9a6ba 100644
--- a/test/coap-service/unittest/stub/mbedtls_stub.c
+++ b/test/coap-service/unittest/stub/mbedtls_stub.c
@@ -1,17 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
- * 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) 2015 ARM Limited. All Rights Reserved.
  */
 
 #include "mbedtls_stub.h"
diff --git a/test/coap-service/unittest/stub/mbedtls_stub.h b/test/coap-service/unittest/stub/mbedtls_stub.h
index a0afdd3dda..0c28668131 100644
--- a/test/coap-service/unittest/stub/mbedtls_stub.h
+++ b/test/coap-service/unittest/stub/mbedtls_stub.h
@@ -1,14 +1,16 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
  * SPDX-License-Identifier: Apache-2.0
- * Licensed under the Apache License, Version 2.0 (the License); you may
+ *
+ * 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
+ * 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/coap-service/unittest/stub/ns_list_stub.c b/test/coap-service/unittest/stub/ns_list_stub.c
index 2283f0f909..2d5e650d96 100644
--- a/test/coap-service/unittest/stub/ns_list_stub.c
+++ b/test/coap-service/unittest/stub/ns_list_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
  */
 
 #define NS_LIST_FN extern
diff --git a/test/coap-service/unittest/stub/ns_timer_stub.c b/test/coap-service/unittest/stub/ns_timer_stub.c
index 40ba9fd692..f543d941b0 100644
--- a/test/coap-service/unittest/stub/ns_timer_stub.c
+++ b/test/coap-service/unittest/stub/ns_timer_stub.c
@@ -1,17 +1,5 @@
 /*
- * Copyright (c) 2014-2015 ARM Limited. All rights reserved.
- * 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) 2014-2015 ARM Limited. All Rights Reserved.
  */
 #include "ns_types.h"
 #include "ns_list.h"
diff --git a/test/coap-service/unittest/stub/ns_timer_stub.h b/test/coap-service/unittest/stub/ns_timer_stub.h
index 5f970d793a..5db49ded5b 100644
--- a/test/coap-service/unittest/stub/ns_timer_stub.h
+++ b/test/coap-service/unittest/stub/ns_timer_stub.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
+ * 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_TIMER_STUB_H__
 #define __NS_TIMER_STUB_H__
 
diff --git a/test/coap-service/unittest/stub/ns_trace.c b/test/coap-service/unittest/stub/ns_trace.c
index 7e0737f8e9..e9aa39dfbe 100644
--- a/test/coap-service/unittest/stub/ns_trace.c
+++ b/test/coap-service/unittest/stub/ns_trace.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2013-2015 ARM Limited. All Rights Reserved.
  */
 #include "config.h"
 #include "ns_types.h"
diff --git a/test/coap-service/unittest/stub/ns_trace_stub.c b/test/coap-service/unittest/stub/ns_trace_stub.c
index 1c45fd401e..8fa73e0aa0 100644
--- a/test/coap-service/unittest/stub/ns_trace_stub.c
+++ b/test/coap-service/unittest/stub/ns_trace_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2014-2015 ARM Limited. All Rights Reserved.
  */
 #include <stdio.h>
 #include <string.h>
diff --git a/test/coap-service/unittest/stub/nsdynmemLIB_stub.c b/test/coap-service/unittest/stub/nsdynmemLIB_stub.c
index 092c798bcb..429c7e2337 100644
--- a/test/coap-service/unittest/stub/nsdynmemLIB_stub.c
+++ b/test/coap-service/unittest/stub/nsdynmemLIB_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2014-2015 ARM Limited. All Rights Reserved.
  */
 #include "nsdynmemLIB_stub.h"
 #include <stdint.h>
diff --git a/test/coap-service/unittest/stub/nsdynmemLIB_stub.h b/test/coap-service/unittest/stub/nsdynmemLIB_stub.h
index d0838b038e..46e5fc0e43 100644
--- a/test/coap-service/unittest/stub/nsdynmemLIB_stub.h
+++ b/test/coap-service/unittest/stub/nsdynmemLIB_stub.h
@@ -1,5 +1,19 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
+ * 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 __NSDYNMEMLIB_STUB_H__
 #define __NSDYNMEMLIB_STUB_H__
diff --git a/test/coap-service/unittest/stub/randLIB_stub.c b/test/coap-service/unittest/stub/randLIB_stub.c
index 5d9f15ff25..2b4ae0acab 100644
--- a/test/coap-service/unittest/stub/randLIB_stub.c
+++ b/test/coap-service/unittest/stub/randLIB_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2014-2015 ARM Limited. All Rights Reserved.
  */
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/coap-service/unittest/stub/sn_coap_builder_stub.c b/test/coap-service/unittest/stub/sn_coap_builder_stub.c
index 38e5288283..1d30a79cbc 100644
--- a/test/coap-service/unittest/stub/sn_coap_builder_stub.c
+++ b/test/coap-service/unittest/stub/sn_coap_builder_stub.c
@@ -1,17 +1,5 @@
 /*
- * Copyright (c) 2011-2015 ARM Limited. All rights reserved.
- * 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) 2011-2015 ARM Limited. All Rights Reserved.
  */
 
 /**
diff --git a/test/coap-service/unittest/stub/sn_coap_builder_stub.h b/test/coap-service/unittest/stub/sn_coap_builder_stub.h
index 6ca30584d2..7ddc9c1944 100644
--- a/test/coap-service/unittest/stub/sn_coap_builder_stub.h
+++ b/test/coap-service/unittest/stub/sn_coap_builder_stub.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
+ * 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 __SN_COAP_BUILDER_STUB_H__
 #define __SN_COAP_BUILDER_STUB_H__
diff --git a/test/coap-service/unittest/stub/sn_coap_parser_stub.c b/test/coap-service/unittest/stub/sn_coap_parser_stub.c
index 6d9e73383b..327b74998e 100644
--- a/test/coap-service/unittest/stub/sn_coap_parser_stub.c
+++ b/test/coap-service/unittest/stub/sn_coap_parser_stub.c
@@ -1,17 +1,5 @@
 /*
- * Copyright (c) 2011-2015 ARM Limited. All rights reserved.
- * 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) 2011-2015 ARM Limited. All Rights Reserved.
  */
 
 /**
diff --git a/test/coap-service/unittest/stub/sn_coap_parser_stub.h b/test/coap-service/unittest/stub/sn_coap_parser_stub.h
index eb6f13b162..72be957164 100644
--- a/test/coap-service/unittest/stub/sn_coap_parser_stub.h
+++ b/test/coap-service/unittest/stub/sn_coap_parser_stub.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
+ * 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 __SN_COAP_PARSER_STUB_H__
 #define __SN_COAP_PARSER_STUB_H__
diff --git a/test/coap-service/unittest/stub/sn_coap_protocol_stub.c b/test/coap-service/unittest/stub/sn_coap_protocol_stub.c
index ee5bac8f63..f72a233a43 100644
--- a/test/coap-service/unittest/stub/sn_coap_protocol_stub.c
+++ b/test/coap-service/unittest/stub/sn_coap_protocol_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015 ARM. All rights reserved.
+ * Copyright (c) 2011-2015 ARM Limited. All Rights Reserved.
  */
 
 
diff --git a/test/coap-service/unittest/stub/sn_coap_protocol_stub.h b/test/coap-service/unittest/stub/sn_coap_protocol_stub.h
index 73f10d6987..0f8a67260d 100644
--- a/test/coap-service/unittest/stub/sn_coap_protocol_stub.h
+++ b/test/coap-service/unittest/stub/sn_coap_protocol_stub.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
+ * 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 __SN_COAP_PROTOCOL_STUB_H__
 #define __SN_COAP_PROTOCOL_STUB_H__
diff --git a/test/coap-service/unittest/stub/socket_api_stub.c b/test/coap-service/unittest/stub/socket_api_stub.c
index 62304deb1b..685f27d77f 100644
--- a/test/coap-service/unittest/stub/socket_api_stub.c
+++ b/test/coap-service/unittest/stub/socket_api_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
  */
 #include "socket_api.h"
 #include "socket_api_stub.h"
diff --git a/test/coap-service/unittest/stub/socket_api_stub.h b/test/coap-service/unittest/stub/socket_api_stub.h
index 195d5eb86f..bc7dacf4a1 100644
--- a/test/coap-service/unittest/stub/socket_api_stub.h
+++ b/test/coap-service/unittest/stub/socket_api_stub.h
@@ -1,5 +1,19 @@
 /*
- * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2015 ARM Limited. All Rights Reserved.
+ *
+ * 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 __SOCKET_API_STUB_H__
 #define __SOCKET_API_STUB_H__
diff --git a/test/coap-service/unittest/stub/system_timer_stub.c b/test/coap-service/unittest/stub/system_timer_stub.c
index e3bccd921b..7de1ab64f9 100644
--- a/test/coap-service/unittest/stub/system_timer_stub.c
+++ b/test/coap-service/unittest/stub/system_timer_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015 ARM Limited. All rights reserved.
+ * Copyright (c) 2014-2015 ARM Limited. All Rights Reserved.
  */
 #include "ns_types.h"
 #include "timer_sys.h"