diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 5ac698c5f4055e170c1aa88e180f02cc0ba8077f..70a29327f86c4c0fc2e7f10a5d324039a87c4223 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -5,9 +5,9 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
+ * @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- * $Id: OneM2M_Functions.ttcn 229 2017-03-16 08:00:30Z reinaortega $
+ * $Id: OneM2M_Functions.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
diff --git a/LibOneM2M/OneM2M_Pics.ttcn b/LibOneM2M/OneM2M_Pics.ttcn
index 925348efd49431ebad1beb27eec89785751d6b43..defde0847977b7c182f9bad50d4aa56bc808a90e 100644
--- a/LibOneM2M/OneM2M_Pics.ttcn
+++ b/LibOneM2M/OneM2M_Pics.ttcn
@@ -5,9 +5,9 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
+ * @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pics.ttcn $
- * $Id: OneM2M_Pics.ttcn 145 2016-10-24 14:37:40Z reinaortega $
+ * $Id: OneM2M_Pics.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index cb0e60b576719227cdabfb63855086a27fb1475f..651db7e3ebb021814fbc81a7057c81fe257d29a6 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -5,9 +5,9 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
+ * @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
- * $Id: OneM2M_Pixits.ttcn 202 2016-12-15 15:08:33Z reinaortega $
+ * $Id: OneM2M_Pixits.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index edeaeaa9c6382aeae907009ef91eef7fa5a96ed9..b350b798a045efe9e638c381c5cd52b8f71f0c99 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -5,9 +5,9 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
+ * @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- * $Id: OneM2M_Templates.ttcn 229 2017-03-16 08:00:30Z reinaortega $
+ * $Id: OneM2M_Templates.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index b2419b63bf7e903dbe7b946ad7756ef38e0bf20e..cfd14808641a01dec793b025812aa0e58893119b 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -5,9 +5,9 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
+ * @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $
- * $Id: OneM2M_TestSystem.ttcn 225 2017-03-08 15:36:54Z reinaortega $
+ * $Id: OneM2M_TestSystem.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @desc Test System module for oneM2M
*
*/
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 0e95e27abcd7743b9ee59c8afc4e4dce535a5431..063afb490ba6876be05f98fd906209ae9033398c 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -5,9 +5,9 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI, KETI, EGM
+ * @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
- * $Id: OneM2M_Types.ttcn 229 2017-03-16 08:00:30Z reinaortega $
+ * $Id: OneM2M_Types.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @desc OneM2M data types module
*
*/
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index 5ddeccfa3ea48ec3aa6c0a8add873ea703be7382..82ca03f0087e050388d9b4110eb7f5e899a359d9 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -5,9 +5,9 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
+ * @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
- * $Id: OneM2M_TypesAndValues.ttcn 225 2017-03-08 15:36:54Z reinaortega $
+ * $Id: OneM2M_TypesAndValues.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @desc Module containing types and values for oneM2M
*
*/
diff --git a/LibOneM2M/UsefulTtcn3Types.ttcn b/LibOneM2M/UsefulTtcn3Types.ttcn
index 8301238811b9d76dd65c638b8fd836f4707d1f27..a6d625ed71eb5b9b5875c5ea9985458df7740af2 100644
--- a/LibOneM2M/UsefulTtcn3Types.ttcn
+++ b/LibOneM2M/UsefulTtcn3Types.ttcn
@@ -1,23 +1,16 @@
-/*******************************************************************************
-* Copyright (c) 2000-2016 Ericsson Telecom AB
-*
-* XSD to TTCN-3 Translator version: CRL 113 200/5 R4D
-*
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-*******************************************************************************/
-//
-// File: UsefulTtcn3Types.ttcn
-// Description:
-// References:
-// Rev:
-// Prodnr:
-// Updated:
-// Contact: http://ttcn.ericsson.se
-//
-////////////////////////////////////////////////////////////////////////////////
+/**
+ * Copyright Notification
+ * No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
+ * The copyright and the foregoing restriction extend to reproduction in all media.
+ * © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
+ * All rights reserved.
+ *
+ * @author oneM2M
+ * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/UsefulTtcn3Types.ttcn $
+ * $Id: UsefulTtcn3Types.ttcn 234 2017-03-20 16:37:29Z reinaortega $
+ * @desc Useful types
+ *
+ */
module UsefulTtcn3Types {
diff --git a/LibOneM2M/XSD.ttcn b/LibOneM2M/XSD.ttcn
index c01daa7a0809e7890c74d1be5171973b20dab0d2..01c56a620cbe4969377b5f74e6e7a8ad1b9031af 100644
--- a/LibOneM2M/XSD.ttcn
+++ b/LibOneM2M/XSD.ttcn
@@ -5,10 +5,10 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
+ * @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/XSD.ttcn $
- * $Id: XSD.ttcn 102 2016-08-30 09:28:49Z reinaortega $
- * @desc Test System module for oneM2M
+ * $Id: XSD.ttcn 234 2017-03-20 16:37:29Z reinaortega $
+ * @desc XSD Aux
*
*/
module XSD {
diff --git a/OneM2M_TestControl.ttcn b/OneM2M_TestControl.ttcn
index 8f84e1dc81d07b2244b18c51b88698740abed8e6..bce95c4c369656c2edac0677ffde5b4ea552598d 100644
--- a/OneM2M_TestControl.ttcn
+++ b/OneM2M_TestControl.ttcn
@@ -5,9 +5,9 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
+ * @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_TestControl.ttcn $
- * $Id: OneM2M_TestControl.ttcn 225 2017-03-08 15:36:54Z reinaortega $
+ * $Id: OneM2M_TestControl.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @desc Test control module for oneM2M
*
*/
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 1d88ad8b6dc82609534280359c2648eab8506cf5..d2ec66a70acb675ff44922fa858a00493b3d7c52 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -5,9 +5,9 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
- * @author ETSI
+ * @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- * $Id: OneM2M_Testcases.ttcn 229 2017-03-16 08:00:30Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/