diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/build.properties b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/build.properties
index c1a948890c8ef190ad519c0758f937c131b23b03..95b0d20bd7df3adbfa1d9d2ef8841b014ca3f244 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/build.properties
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/build.properties
@@ -1,4 +1,5 @@
-#  Copyright (c) 2016 CentraleSupélec & EDFG.
+#
+#  Copyright (c) 2018 CentraleSup�lec & EDF.
 #  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
@@ -7,10 +8,14 @@
 #  This file is part of the RiseClipse tool
 #  
 #  Contributors:
-#      Computer Science Department, CentraleSupélec : initial implementation
+#      Computer Science Department, CentraleSup�lec
+#      EDF R&D
 #  Contacts:
-#      Dominique.Marcadet@centralesupelec.fr
-# 
+#      dominique.marcadet@centralesupelec.fr
+#      aurelie.dehouck-neveu@edf.fr
+#  Web site:
+#      http://wdi.supelec.fr/software/RiseClipse/
+#
 
 bin.includes = .,\
                icons/,\
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.properties b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.properties
index 91485e006b71b10d20de9349d43ff245340a82b3..cadd563a7a46c777cc66e56b54e8f543adca5020 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.properties
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.properties
@@ -1,4 +1,5 @@
-#  Copyright (c) 2016 CentraleSupélec & EDF.
+#
+#  Copyright (c) 2018 CentraleSup�lec & EDF.
 #  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
@@ -7,13 +8,17 @@
 #  This file is part of the RiseClipse tool
 #  
 #  Contributors:
-#      Computer Science Department, CentraleSupélec : initial implementation
+#      Computer Science Department, CentraleSup�lec
+#      EDF R&D
 #  Contacts:
-#      Dominique.Marcadet@centralesupelec.fr
-# 
+#      dominique.marcadet@centralesupelec.fr
+#      aurelie.dehouck-neveu@edf.fr
+#  Web site:
+#      http://wdi.supelec.fr/software/RiseClipse/
+#
 
 pluginName = RiseClipse CIM Header Edit Support
-providerName = CentraleSupélec & EDF
+providerName = CentraleSup�lec & EDF
 
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.xml b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.xml
index 0c539f4dfa868c91f5bcc1898be2f3db488b2cca..4c1911ff8ac9d27dd910d21ded8a41f45c767e87 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.xml
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.xml
@@ -2,20 +2,24 @@
 <?eclipse version="3.0"?>
 
 <!--
-
-  Copyright (c) 2016 CentraleSupélec & EDF.
-  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
- 
-  This file is part of the RiseClipse tool
-  
-  Contributors:
-      Computer Science Department, CentraleSupélec : initial implementation
-  Contacts:
-      Dominique.Marcadet@centralesupelec.fr
- 
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
+ *  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
+ * 
+ *  This file is part of the RiseClipse tool
+ *  
+ *  Contributors:
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
+ *  Contacts:
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
+ */ 
 -->
 
 <plugin>
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/DifferenceModelItemProvider.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/DifferenceModelItemProvider.java
index 442729a831c97e0773294706635fb5bea9054fa7..44bbc097842fbea5c3a2d094fbb9e574333ee4ae 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/DifferenceModelItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/DifferenceModelItemProvider.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.provider;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/FullModelItemProvider.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/FullModelItemProvider.java
index 3fc055ce5f27e220f74018efa5a5381d4c69ab12..97245c92515d14d6ebcd793a19e09d117478fab4 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/FullModelItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/FullModelItemProvider.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.provider;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/HeaderModelEditPlugin.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/HeaderModelEditPlugin.java
index 66f8612a0c2f37dcd9808f5df2c5ab7edf6ec875..f0b4693a6006627a4dab598bb59a4491872b96e0 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/HeaderModelEditPlugin.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/HeaderModelEditPlugin.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.provider;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelDescriptionItemProviderAdapterFactory.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelDescriptionItemProviderAdapterFactory.java
index 3d12e19680a40570383537ba9116b4ba4fb3c99f..bdd5dd12abb16e40bb4f36dba33fe2c3caf246ab 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelDescriptionItemProviderAdapterFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelDescriptionItemProviderAdapterFactory.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.provider;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelItemProvider.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelItemProvider.java
index 0b19b37f909302baf606927e2c6d465836827e61..8877a9147b5e195502654d81e57553980a171df6 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelItemProvider.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.provider;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/build.properties b/fr.centralesupelec.edf.riseclipse.cim.headerModel/build.properties
index ae647949f33a1d50656d82375254d598f12e972d..5a59773a7bf46395b02bebb96d4ac9c112e4d403 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/build.properties
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/build.properties
@@ -1,4 +1,5 @@
-#  Copyright (c) 2016 CentraleSupélec & EDFG.
+#
+#  Copyright (c) 2018 CentraleSup�lec & EDF.
 #  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
@@ -7,10 +8,14 @@
 #  This file is part of the RiseClipse tool
 #  
 #  Contributors:
-#      Computer Science Department, CentraleSupélec : initial implementation
+#      Computer Science Department, CentraleSup�lec
+#      EDF R&D
 #  Contacts:
-#      Dominique.Marcadet@centralesupelec.fr
-# 
+#      dominique.marcadet@centralesupelec.fr
+#      aurelie.dehouck-neveu@edf.fr
+#  Web site:
+#      http://wdi.supelec.fr/software/RiseClipse/
+#
 
 bin.includes = .,\
                model/,\
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/model/headerModel.genmodel b/fr.centralesupelec.edf.riseclipse.cim.headerModel/model/headerModel.genmodel
index 5c213580eaf710f5cc7a32bfb648f2a9541fad5e..ff94f88fa17df04523b8f53d7c590ba1d7864721 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/model/headerModel.genmodel
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/model/headerModel.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2016 CentraleSupélec &amp; EDF.&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License v1.0&#xA; which accompanies this distribution, and is available at&#xA; http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA; This file is part of the RiseClipse tool&#xA; &#xA; Contributors:&#xA;     Computer Science Department, CentraleSupélec : initial implementation&#xA; Contacts:&#xA;     Dominique.Marcadet@centralesupelec.fr&#xD;&#xA;"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2018 CentraleSupélec &amp; EDF.&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License v1.0&#xA; which accompanies this distribution, and is available at&#xA; http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA; This file is part of the RiseClipse tool&#xA; &#xA; Contributors:&#xA;     Computer Science Department, CentraleSupélec&#xA;     EDF R&amp;D&#xA; Contacts:&#xA;     dominique.marcadet@centralesupelec.fr&#xA;     aurelie.dehouck-neveu@edf.fr&#xA; Web site:&#xA;     http://wdi.supelec.fr/software/RiseClipse/&#xA;"
     modelDirectory="/fr.centralesupelec.edf.riseclipse.cim.headerModel/src" modelPluginID="fr.centralesupelec.edf.riseclipse.cim.headerModel"
     modelName="HeaderModel" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0"
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.properties b/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.properties
index 7d9f246d8a45662fed6f14fb652c8620b40fee29..c5f5a353fab2aa4c412abcb063e96cf9f1fcfdb3 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.properties
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.properties
@@ -1,4 +1,5 @@
-#  Copyright (c) 2016 CentraleSupélec & EDF.
+#
+#  Copyright (c) 2018 CentraleSup�lec & EDF.
 #  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
@@ -7,10 +8,14 @@
 #  This file is part of the RiseClipse tool
 #  
 #  Contributors:
-#      Computer Science Department, CentraleSupélec : initial implementation
+#      Computer Science Department, CentraleSup�lec
+#      EDF R&D
 #  Contacts:
-#      Dominique.Marcadet@centralesupelec.fr
-# 
+#      dominique.marcadet@centralesupelec.fr
+#      aurelie.dehouck-neveu@edf.fr
+#  Web site:
+#      http://wdi.supelec.fr/software/RiseClipse/
+#
 
 pluginName = RiseClipse CIM Header Metamodel
-providerName = CentraleSupélec & EDF
+providerName = CentraleSup�lec & EDF
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.xml b/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.xml
index c99c39ea67f5cac433262a5f1e2b210d40bf522a..7d7e893d505e4814d15516cb4a913fe505d99d90 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.xml
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.xml
@@ -2,19 +2,24 @@
 <?eclipse version="3.0"?>
 
 <!--
-  Copyright (c) 2016 CentraleSupélec & EDF.
-  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
- 
-  This file is part of the RiseClipse tool
-  
-  Contributors:
-      Computer Science Department, CentraleSupélec : initial implementation
-  Contacts:
-      Dominique.Marcadet@centralesupelec.fr
- 
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
+ *  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
+ * 
+ *  This file is part of the RiseClipse tool
+ *  
+ *  Contributors:
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
+ *  Contacts:
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
+ */ 
 -->
 
 <plugin>
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/DifferenceModel.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/DifferenceModel.java
index 96e02dd6c0a6f2e7d615d8eec954e2dbedc290eb..16544102e42cbc49c7ad48a850819008054c8fe9 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/DifferenceModel.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/DifferenceModel.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/FullModel.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/FullModel.java
index 6cbb1d662acc604eefabfa87c7bb6403e1ba3786..a76a1419ef467addda9ea3020d7844ea0262c5fa 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/FullModel.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/FullModel.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/Model.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/Model.java
index 6f0a6a075921d2a01c63e4d599b99a8eeaaac9a9..1de4ad4b7ef698cc641d7242e47b34d3018517f2 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/Model.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/Model.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionFactory.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionFactory.java
index e9b625703d87adb9c4d0db7292d164b65175d93f..28da70e2f56eef990adaee51f26dced533f70be5 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionFactory.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionPackage.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionPackage.java
index b9f35cb40d566b8e34da139e4629934f21861eaf..287786a46a5731a0431a21878d5970edc9516f7b 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionPackage.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionPackage.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/DifferenceModelImpl.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/DifferenceModelImpl.java
index 3863fa77182debe9fe5e6c9c8c1e2a10915df08e..932eb4657486990cb612e222bf71aa736e632916 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/DifferenceModelImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/DifferenceModelImpl.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.impl;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/FullModelImpl.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/FullModelImpl.java
index 448b76cd73dcb90e3324f48bde6cb13402bfec66..c416be2c925a091d4c85c128cf32fb2eab8f6d8f 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/FullModelImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/FullModelImpl.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.impl;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionFactoryImpl.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionFactoryImpl.java
index f7503878f1110bd9fc24ddc0089514a7683ab2a8..8dbf10966a243d5ff24e92f645b449dff899af5c 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionFactoryImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionFactoryImpl.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.impl;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionPackageImpl.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionPackageImpl.java
index 598512b6d27d336ff0ed5382966299ff7ac9c30b..30b64c31f35e9f5cae3f27904c117e0a0ff73c1c 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionPackageImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionPackageImpl.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.impl;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelImpl.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelImpl.java
index 1ae9679946bdae09e38309c0c55c41e122aa63ef..ae2590e09f321e1e757e00034775381c27952b48 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelImpl.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.impl;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionAdapterFactory.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionAdapterFactory.java
index 803cc6f0e930e376b62aa455b60a4c06d2095d25..b43b4992de45ed1474fa5ea5c13835e2f1f4c8f4 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionAdapterFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionAdapterFactory.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.util;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionSwitch.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionSwitch.java
index d0b7a2523882e00a93d9dd5020f2691c55915c00..f6579eb4bd1d4e665a9decf3aa086739a3068b3c 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionSwitch.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionSwitch.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.util;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/build.properties b/fr.centralesupelec.edf.riseclipse.cim.util/build.properties
index 34d2e4d2dad529ceaeb953bfcdb63c51d69ffed2..6e7bc5ecad6083b9e0708f67c78d9ea08890ffed 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/build.properties
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/build.properties
@@ -1,3 +1,21 @@
+#
+#  Copyright (c) 2018 CentraleSup�lec & EDF.
+#  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
+# 
+#  This file is part of the RiseClipse tool
+#  
+#  Contributors:
+#      Computer Science Department, CentraleSup�lec
+#      EDF R&D
+#  Contacts:
+#      dominique.marcadet@centralesupelec.fr
+#      aurelie.dehouck-neveu@edf.fr
+#  Web site:
+#      http://wdi.supelec.fr/software/RiseClipse/
+#
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/plugin.properties b/fr.centralesupelec.edf.riseclipse.cim.util/plugin.properties
index 01a9ffed2a14eac9ef6e59a0c524ef83c17a9683..9414d09cf759eb8acabeab9af8eaf31a12535f05 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/plugin.properties
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/plugin.properties
@@ -1,5 +1,5 @@
-# 
-#  Copyright (c) 2016 CentraleSupélec & EDF.
+#
+#  Copyright (c) 2018 CentraleSup�lec & EDF.
 #  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
@@ -8,10 +8,14 @@
 #  This file is part of the RiseClipse tool
 #  
 #  Contributors:
-#      Computer Science Department, CentraleSupélec : initial implementation
+#      Computer Science Department, CentraleSup�lec
+#      EDF R&D
 #  Contacts:
-#      Dominique.Marcadet@centralesupelec.fr
-# 
+#      dominique.marcadet@centralesupelec.fr
+#      aurelie.dehouck-neveu@edf.fr
+#  Web site:
+#      http://wdi.supelec.fr/software/RiseClipse/
+#
 
 pluginName = RiseClipse CIM Utilities
-providerName = CentraleSupélec & EDF
+providerName = CentraleSup�lec & EDF
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimConstants.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimConstants.java
index d979fb6642fed7366b8ecd8d298b30e5f8e37596..18c8320784090fefd95a31550f407ae366dd3b30 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimConstants.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimConstants.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceFactoryImpl.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceFactoryImpl.java
index 8bef1a6aee53daa15a390b3bf82ca475884fb327..6926dd90b98b6bbd138bab7122711c6bfce51c40 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceFactoryImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceFactoryImpl.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceHandler.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceHandler.java
index f3bbe505902dfe64f61082451120eb704dd44520..21c3abc112f6c9a2b2bfc1817572224aa235fb37 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceHandler.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceHandler.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceImpl.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceImpl.java
index 53efee111598129914882f66f13800b8b924d59d..38a2f24f370760c077aab3f83269e3c79f8fd64e 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimResourceImpl.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHandler.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHandler.java
index 3b09c3116fda26087a4a637bdd43363194c85e7b..a58bf1b059790813a11e04bd87859eb89b3d451e 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHandler.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHandler.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHelperImpl.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHelperImpl.java
index 7d2994deb707e42105641bfab5bde6b7f9ac66ba..d48df960f9fc27e7d95c2d794238881558f4b90a 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHelperImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLHelperImpl.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLLoadImpl.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLLoadImpl.java
index b3bbbdef6fc76cbd636729a1c485b09c1ccdfede..2e25405a9cdd9661adadbc60557ba10d41e8818f 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLLoadImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLLoadImpl.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLSaveImpl.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLSaveImpl.java
index 3c39c639cf912f621fcbbab39291b480a05d3ac0..c73914f19a9f8b0c91306d79dab3bd4c927f3c15 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLSaveImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/CimXMLSaveImpl.java
@@ -1,5 +1,5 @@
-/**
- *  Copyright (c) 2016 CentraleSupélec & EDF.
+/*
+ *  Copyright (c) 2018 CentraleSupélec & EDF.
  *  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
@@ -8,9 +8,13 @@
  *  This file is part of the RiseClipse tool
  *  
  *  Contributors:
- *      Computer Science Department, CentraleSupélec : initial implementation
+ *      Computer Science Department, CentraleSupélec
+ *      EDF R&D
  *  Contacts:
- *      Dominique.Marcadet@centralesupelec.fr
+ *      dominique.marcadet@centralesupelec.fr
+ *      aurelie.dehouck-neveu@edf.fr
+ *  Web site:
+ *      http://wdi.supelec.fr/software/RiseClipse/
  */
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;